You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/03/18 15:11:33 UTC

svn commit: r755601 - in /portals/pluto/trunk: pluto-container-api/src/main/java/org/apache/pluto/container/ pluto-container/src/main/java/org/apache/pluto/container/impl/ pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/

Author: ate
Date: Wed Mar 18 14:11:33 2009
New Revision: 755601

URL: http://svn.apache.org/viewvc?rev=755601&view=rev
Log:
Simplifying the PortletURLProvider:
differentiating toURL() and toURL(absolute) is only needed on the portal (implementation) side, not in the container.  

Modified:
    portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
    portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java

Modified: portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java?rev=755601&r1=755600&r2=755601&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java (original)
+++ portals/pluto/trunk/pluto-container-api/src/main/java/org/apache/pluto/container/PortletURLProvider.java Wed Mar 18 14:11:33 2009
@@ -68,12 +68,7 @@
     String getResourceID();
     void setResourceID(String resourceID);
     
-    /**
-     * Returns the URL in string format
-     * @param absolute if true an absolute URL is required, like for embedding as a query parameter value
-     * @return the URL
-     */
-    String toURL(boolean absolute);
+    String toURL();
     
     void write(Writer out, boolean escapeXML) throws IOException;
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java?rev=755601&r1=755600&r2=755601&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletURLImpl.java Wed Mar 18 14:11:33 2009
@@ -371,7 +371,7 @@
     public String toString()
     {
         filterURL();
-        return urlProvider.toURL(false);
+        return urlProvider.toURL();
     }
 
     // PortletURL impl ------------------------------------------------------------    

Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java?rev=755601&r1=755600&r2=755601&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java Wed Mar 18 14:11:33 2009
@@ -187,6 +187,11 @@
     {
         this.resourceID = resourceID;
     }
+    
+    public String toURL()
+    {
+        return toURL(false);
+    }
 
     public String toURL(boolean absolute)
     {