portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r881375 - in /portals/jetspeed-2/portal/trunk/components: jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
Date Tue, 17 Nov 2009 16:57:53 GMT
Author: woonsan
Date: Tue Nov 17 16:57:52 2009
New Revision: 881375

URL: http://svn.apache.org/viewvc?rev=881375&view=rev
Log:
JS2-1083: Fixing a problem that category portlet was not shown.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java?rev=881375&r1=881374&r2=881375&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/ui/Jetui.java
Tue Nov 17 16:57:52 2009
@@ -150,7 +150,7 @@
            if (!pair.getKey().equals("header.dojo.library.include"))
            {
                HeadElement headElement = pair.getValue();
-               result.append(HeadElementUtils.toHtmlString(headElement));
+               result.append(HeadElementUtils.toHtmlString(headElement)).append('\n');
            }
        }
        return result.toString();

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?rev=881375&r1=881374&r2=881375&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
Tue Nov 17 16:57:52 2009
@@ -33,6 +33,7 @@
 import org.apache.jetspeed.container.PortletWindowID;
 import org.apache.jetspeed.factory.PortletInstance;
 import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.portlet.HeadElement;
 import org.apache.jetspeed.request.RequestContext;
@@ -298,14 +299,18 @@
         {
             PortletContent portletContent = fragment.getPortletContent();
             
-            if (portletContent.isComplete())
+            if (portletContent.isComplete() || !Fragment.PORTLET.equals(fragment.getType()))
             {
                 // org.apache.commons.collections.list.TreeList is well-optimized for
                 // fast insertions at any index in the list.
                 // Refer to description in the javadoc for details.
                 headElements = new TreeList();
                 HeadElementsUtils.aggregateHeadElements(headElements, fragment);
-                HeadElementsUtils.mergeHeadElementsByHint(headElements);
+                
+                if (!headElements.isEmpty())
+                {
+                    HeadElementsUtils.mergeHeadElementsByHint(headElements);
+                }
             }
         }
         



---------------------------------------------------------------------
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