portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r471076 - /portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
Date Sat, 04 Nov 2006 00:27:08 GMT
Author: smilek
Date: Fri Nov  3 16:27:08 2006
New Revision: 471076

URL: http://svn.apache.org/viewvc?view=rev&rev=471076
Log:
added two include() methods for using PortletHeaderResponse.include mechanism; revived call
to include if HeaderPage init-parameter is defined

Modified:
    portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java

Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java?view=diff&rev=471076&r1=471075&r2=471076
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
(original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
Fri Nov  3 16:27:08 2006
@@ -148,15 +148,14 @@
         headerResource.dojoEnable();
         includeHeaderContent( headerResource );
         
-        /*if ( this.headerPage != null )
+        if ( this.headerPage != null )
         {
-                include( request, response, this.headerPage, headerInfoText );
-        }*/
+            include( request, response, this.headerPage );
+        }
     }
     
     protected void includeHeaderContent( HeaderResource headerResource )
     {
-        // do nothing - intended for derived classes
         if ( this.dojoRequiresCoreList != null )
         {
             headerResource.dojoAddCoreLibraryRequires( this.dojoRequiresCoreList );
@@ -171,6 +170,12 @@
     {
         response.include(request, response, headerPagePath);
         headerText.append(response.getContent());
+    }
+    
+    public void include(PortletHeaderRequest request, PortletHeaderResponse response, String
headerPagePath) throws PortletException
+    {
+        response.include(request, response, headerPagePath);
+        response.getHeaderResource().addHeaderInfo(response.getContent());
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message