[Yanel-commits] rev 25734 - in public/yanel/trunk/src: core/java/org/wyona/yanel/core webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2007-07-03 15:43:51 +0200 (Tue, 03 Jul 2007)
New Revision: 25734

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/StateOfView.java
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
area renamed

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/StateOfView.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/StateOfView.java	2007-07-03 13:40:43 UTC (rev 25733)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/StateOfView.java	2007-07-03 13:43:51 UTC (rev 25734)
@@ -19,7 +19,7 @@
 /**
  *
  */
-public class Area {
+public class StateOfView {
 
     public static final String AUTHORING = "authoring";
     

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2007-07-03 13:40:43 UTC (rev 25733)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2007-07-03 13:43:51 UTC (rev 25734)
@@ -31,7 +31,7 @@
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamSource;
 
-import org.wyona.yanel.core.Area;
+import org.wyona.yanel.core.StateOfView;
 import org.wyona.yanel.core.Environment;
 import org.wyona.yanel.core.Path;
 import org.wyona.yanel.core.Resource;
@@ -426,7 +426,7 @@
                             String revisionName = request.getParameter("yanel.resource.revision");
                             if (ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2") && revisionName != null) {
                                 view = ((VersionableV2) res).getView(viewId, revisionName);
-                            } else if (ResourceAttributeHelper.hasAttributeImplemented(res, "Workflowable", "1") && environment.getStateOfView().equals(Area.LIVE)) {
+                            } else if (ResourceAttributeHelper.hasAttributeImplemented(res, "Workflowable", "1") && environment.getStateOfView().equals(StateOfView.LIVE)) {
                                 WorkflowableV1 workflowable = (WorkflowableV1)res;
                                 if (workflowable.isLive()) {
                                     view = workflowable.getLiveView(viewId);
@@ -813,7 +813,7 @@
             }
             Realm realm = map.getRealm(request.getServletPath());
             // TODO: implement detection of state of view
-            String stateOfView = Area.AUTHORING;
+            String stateOfView = StateOfView.AUTHORING;
             //String area = map.getStateOfView(request.getServletPath());
             //log.debug("url: " + request.getServletPath());
             //log.debug("state of view: " + stateOfView);