You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/01/10 12:19:25 UTC

svn commit: r124788 - /lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java /lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java

Author: andreas
Date: Mon Jan 10 03:19:23 2005
New Revision: 124788

URL: http://svn.apache.org/viewcvs?view=rev&rev=124788
Log:
refactored Create usecases
Modified:
   lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
   lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=124788&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java&r1=124787&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java&r2=124788
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java	(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Create.java	Mon Jan 10 03:19:23 2005
@@ -58,16 +58,7 @@
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
      */
     protected void doCheckExecutionConditions() throws Exception {
-        String documentId = getParameterAsString(DOCUMENT_ID);
         String navigationTitle = getParameterAsString(DublinCore.ELEMENT_TITLE);
-
-        if (documentId.equals("")) {
-            addErrorMessage("The document ID is required.");
-        }
-
-        if (documentId.matches("[^a-zA-Z0-9\\-]+")) {
-            addErrorMessage("The document ID is not valid.");
-        }
 
         if (navigationTitle.equals("")) {
             addErrorMessage("The navigation title is required.");

Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java?view=diff&rev=124788&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java&r1=124787&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java&r2=124788
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java	(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/CreateDocument.java	Mon Jan 10 03:19:23 2005
@@ -50,6 +50,24 @@
     }
     
     /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+     */
+    protected void doCheckExecutionConditions() throws Exception {
+        
+        String documentId = getParameterAsString(DOCUMENT_ID);
+
+        if (documentId.equals("")) {
+            addErrorMessage("The document ID is required.");
+        }
+
+        if (documentId.matches("[^a-zA-Z0-9\\-]+")) {
+            addErrorMessage("The document ID is not valid.");
+        }
+
+        super.doCheckExecutionConditions();
+    }
+    
+    /**
      * @see org.apache.lenya.cms.site.usecases.Create#createDocument()
      */
     protected Document createDocument() throws Exception {

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org