svn commit: r485260 - in /portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer: driver/urlgenerator/ interfaces/urlgenerator/ util/

[dl...@apache.org]

Author: dlouzan
Date: Sun Dec 10 13:11:56 2006
New Revision: 485260

URL: http://svn.apache.org/viewvc?view=rev&rev=485260
Log:
- Formatting
- Modified the way PortletUtils finds the portletWindowId

Modified:
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/urlgenerator/URLRewriterImpl.java
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLGenerator.java
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLTemplateComposer.java
    portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/util/PortletUtils.java

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/urlgenerator/URLRewriterImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/urlgenerator/URLRewriterImpl.java?view=diff&rev=485260&r1=485259&r2=485260
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/urlgenerator/URLRewriterImpl.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/driver/urlgenerator/URLRewriterImpl.java Sun Dec 10 13:11:56 2006
@@ -27,6 +27,7 @@
 import org.apache.wsrp4j.commons.util.Constants;
 import org.apache.wsrp4j.commons.util.Utility;
 
+
 /**
  * This class implements the URLRewriter-interface providing a method
  * to rewrite urls (Consumer URL Rewriting).
@@ -49,8 +50,7 @@
         return instance;
     }
     
-    private URLRewriterImpl() {
-    }
+    private URLRewriterImpl() {}
     
     /**
      * Sets the url generator. This is required to enable url rewriting.
@@ -72,7 +72,7 @@
     }
     
     /**
-     * Parses markup and performs URL rewriting.
+     * Parses markup and performs URL rewriting using URLGenerator
      *
      * Principle:
      * - Iterate over markup-string once and copy processed markup to result
@@ -85,12 +85,9 @@
      * Incomplete rewrite-pairs (e.g. a rewrite-begin-token not followed by a
      * rewrite-end-token) are considered as 'normal' markup.
      *
-     * @param markup           String representing the markup to be processed.
+     * @param markup String representing the markup to be processed.
      *
      * @return String representing the processed markup.
-     */
-    /**
-     * Rewriting: get url from URLGenerator and append it
      */
     private void rewrite(StringBuffer markup, String rewriteURL) {
         String MN = "rewrite";

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLGenerator.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLGenerator.java?view=diff&rev=485260&r1=485259&r2=485260
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLGenerator.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLGenerator.java Sun Dec 10 13:11:56 2006
@@ -27,7 +27,7 @@
 public interface URLGenerator {
 
     /**
-     * Creates a URL pointing to the consumer,triggering a 
+     * Creates a URL pointing to the consumer, triggering a 
      * performBlockingInteraction call.    
      * 
      * @param params A map with all parameters which should be appended

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLTemplateComposer.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLTemplateComposer.java?view=diff&rev=485260&r1=485259&r2=485260
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLTemplateComposer.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/interfaces/urlgenerator/URLTemplateComposer.java Sun Dec 10 13:11:56 2006
@@ -141,4 +141,5 @@
      * @return The namespace prefix of the consumer.
      **/
     String getNamespacePrefix();
+    
 }

Modified: portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/util/PortletUtils.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/util/PortletUtils.java?view=diff&rev=485260&r1=485259&r2=485260
==============================================================================
--- portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/util/PortletUtils.java (original)
+++ portals/wsrp4j/trunk/commons-consumer/src/java/org/apache/wsrp4j/commons/consumer/util/PortletUtils.java Sun Dec 10 13:11:56 2006
@@ -94,8 +94,7 @@
                 id = "" + random;
             }
             String contextPath = request.getContextPath();
-            session.setAttribute(ConsumerConstants.WSRP_PORTLET_WINDOW_ID, 
-                    contextPath + "_" + id);
+            session.setAttribute(ConsumerConstants.WSRP_PORTLET_WINDOW_ID, id);
         }
         return session.getAttribute(ConsumerConstants.WSRP_PORTLET_WINDOW_ID).toString();
     }