svn commit: r564537 - in /lenya/trunk/src/modules-core: sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java

Author: andreas
Date: Fri Aug 10 03:16:09 2007
New Revision: 564537

URL: http://svn.apache.org/viewvc?view=rev&rev=564537
Log:
Added method AbstractUsecase.prepareView() and use it in ForceCheckIn usecase.

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java?view=diff&rev=564537&r1=564536&r2=564537
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/ForceCheckIn.java Fri Aug 10 03:16:09 2007
@@ -50,16 +50,17 @@
             String[] params = { DublinCoreHelper.getTitle(doc) };
             addErrorMessage("not-checked-out", params);
         }
+    }
 
+    protected void prepareView() throws Exception {
+        Node node = getSourceDocument().getRepositoryNode();
+        String userId = node.getCheckoutUserId();
+        String[] params = { userId };
+        if (isLoggedIn(userId)) {
+            addInfoMessage("user-logged-in", params);
+        }
         else {
-            String userId = node.getCheckoutUserId();
-            String[] params = { userId };
-            if (isLoggedIn(userId)) {
-                addInfoMessage("user-logged-in", params);
-            }
-            else {
-                addInfoMessage("user-not-logged-in", params);
-            }
+            addInfoMessage("user-not-logged-in", params);
         }
     }
 

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&rev=564537&r1=564536&r2=564537
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Fri Aug 10 03:16:09 2007
@@ -627,7 +627,20 @@
      * @see org.apache.lenya.cms.usecase.Usecase#getView()
      */
     public UsecaseView getView() {
+        try {
+            prepareView();
+        } catch (Exception e) {
+            getLogger().error("View preparation for usecase [" + getName() + "] failed: ", e);
+            addErrorMessage(e.getMessage());
+        }
         return this.view;
+    }
+
+    /**
+     * Override this method to prepare the view (add information messages etc.).
+     * @throws Exception If an error occurs.
+     */
+    protected void prepareView() throws Exception {
     }
 
     protected static final String ELEMENT_PARAMETER = "parameter";