svn commit: r158448 - in lenya/trunk/src/java/org/apache/lenya/cms/usecase: AbstractUsecase.java DocumentUsecase.java

Author: andreas
Date: Mon Mar 21 03:06:45 2005
New Revision: 158448

URL: http://svn.apache.org/viewcvs?view=rev&rev=158448
Log:
changed some usecase fields to parameters

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
    lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&r1=158447&r2=158448
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java 
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Mon 
Mar 21 03:06:45 2005
@@ -298,10 +298,10 @@
         return value;
     }
 
-    private String targetUrl = null;
+    private String TARGET_URL = "private.targetUrl";
 
     protected void setTargetURL(String url) {
-        this.targetUrl = url;
+        setParameter(TARGET_URL, url);
     }
 
     /**
@@ -310,10 +310,8 @@
      * @see org.apache.lenya.cms.usecase.Usecase#getTargetURL(boolean)
      */
     public String getTargetURL(boolean success) {
-        String url;
-        if (this.targetUrl != null) {
-            url = this.targetUrl;
-        } else {
+        String url = getParameterAsString(TARGET_URL);
+        if (url == null) {
             url = getSourceURL();
         }
         return url;

Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?view=diff&r1=158447&r2=158448
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java 
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Mon 
Mar 21 03:06:45 2005
@@ -40,7 +40,7 @@
 
     protected static final String DOCUMENT = "document";
     protected static final String TARGET_DOCUMENT = "private.targetDocument";
-    private String completeArea;
+    private String COMPLETE_AREA = "private.completeArea";
 
     /**
      * Ctor.
@@ -73,7 +73,7 @@
             }
 
             URLInformation info = new URLInformation(url);
-            this.completeArea = info.getCompleteArea();
+            setParameter(COMPLETE_AREA, info.getCompleteArea());
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -119,8 +119,8 @@
     public String getTargetURL(boolean success) {
         Document document = getTargetDocument(success);
         String documentUrl = document.getCanonicalDocumentURL();
-        String url = "/" + document.getPublication().getId() + "/" + 
this.completeArea
-                + documentUrl;
+        String area = getParameterAsString(COMPLETE_AREA);
+        String url = "/" + document.getPublication().getId() + "/" + area + 
documentUrl;
         return url;
     }