[Yanel-commits] rev 41271 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2009-02-02 15:59:59 +0100 (Mon, 02 Feb 2009)
New Revision: 41271

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
check rollback within separate method

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	2009-02-02 13:59:29 UTC (rev 41270)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2009-02-02 14:59:59 UTC (rev 41271)
@@ -468,7 +468,7 @@
                         try {
                             String revisionName = request.getParameter(YANEL_RESOURCE_REVN);
                             // NOTE: Check also if usecase is not roll-back, because roll-back is also using the yanel.resource.revision
-                            if (revisionName != null && ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2") && !request.getParameter(YANEL_RESOURCE_USECASE).equals("roll-back")) {
+                            if (revisionName != null && ResourceAttributeHelper.hasAttributeImplemented(res, "Versionable", "2") && !isRollBack(request)) {
                                 view = ((VersionableV2) res).getView(viewId, revisionName);
                             } else if (ResourceAttributeHelper.hasAttributeImplemented(res, "Workflowable", "1") && environment.getStateOfView().equals(StateOfView.LIVE)) {
                                 WorkflowableV1 workflowable = (WorkflowableV1)res;
@@ -2408,4 +2408,15 @@
             return;
         }
     }
+
+    /**
+     * Check if yanel resource usecase is 'roll back" usecase
+     */
+    private boolean isRollBack(HttpServletRequest request) {
+        String yanelResUsecase = request.getParameter(YANEL_RESOURCE_USECASE);
+        if (yanelResUsecase != null) {
+            if (yanelResUsecase.equals("roll-back")) return true;
+        }
+        return false;
+    }
 }