[Aplaws-commit] r148 - ccm-cms/trunk/src/com/arsdigita/cms/portlet ccm-core/trunk/src/com/arsdigita/bebop/portal

[<mb...@re...>]

Author: mbooth
Date: 2004-12-10 13:52:56 +0100 (Fri, 10 Dec 2004)
New Revision: 148

Modified:
   ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java
   ccm-core/trunk/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java
Log:
AbstractPortletRenderer caches too much info. Don't cache the portlet element itself, just its contents.


Modified: ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java	2004-12-09 18:10:06 UTC (rev 147)
+++ ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java	2004-12-10 12:52:56 UTC (rev 148)
@@ -41,13 +41,6 @@
         return BASE_DATA_OBJECT_TYPE;
     }
 
-    public String getTitle() {
-        // I neither know or care why this works, but it does.
-        // Makes bebop:portlet have the correct title attribute
-        // mb...@re... 04/12/2004
-        return "";
-    }
-
     public ContentItem getContentItem() {
         return (ContentItem) DomainObjectFactory.newInstance
             ((DataObject) get(ITEM));

Modified: ccm-core/trunk/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java	2004-12-09 18:10:06 UTC (rev 147)
+++ ccm-core/trunk/src/com/arsdigita/bebop/portal/AbstractPortletRenderer.java	2004-12-10 12:52:56 UTC (rev 148)
@@ -78,7 +78,9 @@
     private Element makeXML(PageState state) {
         Element holder = new Element("holder");
         setDateCached(new Date());
-        super.generateXML(state, holder);
+        
+        generateXMLBody(state, holder);
+        generateChildrenXML(state, holder);
         return holder;
     }
 
@@ -101,8 +103,10 @@
 
         Iterator iter = xml.getChildren().iterator();
 
+        Element wrapper = generateXMLHelper( parent );
+
         while (iter.hasNext()) {
-            parent.newChildElement((Element) iter.next());
+            wrapper.newChildElement((Element) iter.next());
         }
     }