[Aplaws-commit] r1117 - in trunk/ccm-ldn-navigation: . src/com/arsdigita/london/navigation/ui/portlet

[<ap...@vh...>]

Author: apevec
Date: 2006-04-24 03:34:37 +0200 (Mon, 24 Apr 2006)
New Revision: 1117

Modified:
   trunk/ccm-ldn-navigation/application.xml
   trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java
   trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
   trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
Log:
simplify extension of Object Type selection widgets


Modified: trunk/ccm-ldn-navigation/application.xml
===================================================================
--- trunk/ccm-ldn-navigation/application.xml	2006-04-22 18:49:16 UTC (rev 1116)
+++ trunk/ccm-ldn-navigation/application.xml	2006-04-24 01:34:37 UTC (rev 1117)
@@ -3,7 +3,7 @@
   name="ccm-ldn-navigation"
   prettyName="Navigation"
   version="6.3.0"
-  release="5"
+  release="6"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>

Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java	2006-04-22 18:49:16 UTC (rev 1116)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java	2006-04-24 01:34:37 UTC (rev 1117)
@@ -96,28 +96,16 @@
         ItemListPortlet myportlet = (ItemListPortlet)portlet;
         myportlet.setVersion((String)m_version.getValue(state));
     }
-
-    protected Widget buildBaseObjectTypeWidget(ParameterModel param) {
-        SingleSelect widget = new SingleSelect(param);
-        try {
-            widget.addPrintListener(new ItemTypePrintListener(true));
-        } catch (TooManyListenersException ex) {
-            throw new UncheckedWrapperException("this cannot happen", ex);
-        }
-        return widget;
+    
+    protected PrintListener getBaseObjectTypes() {
+        return new ItemTypePrintListener(true);
     }
 
-    protected Widget buildRestrictedObjectTypeWidget(ParameterModel param) {
-        SingleSelect widget = new SingleSelect(param);
-        try {
-            widget.addPrintListener(new ItemTypePrintListener(false));
-        } catch (TooManyListenersException ex) {
-            throw new UncheckedWrapperException("this cannot happen", ex);
-        }
-        return widget;
+    protected PrintListener getRestrictedObjectTypes() {
+        return new ItemTypePrintListener(false);
     }
 
-    private class ItemTypePrintListener implements PrintListener {
+    public static class ItemTypePrintListener implements PrintListener {
 
         private boolean m_all;
 

Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java	2006-04-22 18:49:16 UTC (rev 1116)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java	2006-04-24 01:34:37 UTC (rev 1117)
@@ -149,20 +149,28 @@
         add( m_properties );
     }
 
-    protected Widget buildBaseObjectTypeWidget(ParameterModel param) {
+    protected PrintListener getBaseObjectTypes() {
+        return new ObjectTypePrintListener();
+    }
+    
+    private Widget buildBaseObjectTypeWidget(ParameterModel param) {
         SingleSelect widget = new SingleSelect(param);
         try {
-            widget.addPrintListener(new ObjectTypePrintListener());
+            widget.addPrintListener(getBaseObjectTypes());
         } catch (TooManyListenersException ex) {
             throw new UncheckedWrapperException("this cannot happen", ex);
         }
         return widget;
     }
 
-    protected Widget buildRestrictedObjectTypeWidget(ParameterModel param) {
+    protected PrintListener getRestrictedObjectTypes() {
+        return new ObjectTypePrintListener();
+    }
+    
+    private Widget buildRestrictedObjectTypeWidget(ParameterModel param) {
         SingleSelect widget = new SingleSelect(param);
         try {
-            widget.addPrintListener(new ObjectTypePrintListener());
+            widget.addPrintListener(getRestrictedObjectTypes());
         } catch (TooManyListenersException ex) {
             throw new UncheckedWrapperException("this cannot happen", ex);
         }

Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java	2006-04-22 18:49:16 UTC (rev 1116)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java	2006-04-24 01:34:37 UTC (rev 1117)
@@ -18,10 +18,17 @@
 
 package com.arsdigita.london.navigation.ui.portlet;
 
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Date;
+
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.xml.Element;
 import com.arsdigita.bebop.portal.AbstractPortletRenderer;
 import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.StringUtils;
 
 import com.arsdigita.london.navigation.DataCollectionRenderer;
@@ -63,8 +70,18 @@
 
         DataCollection objects = m_portlet.getDataCollection();
 
-        Element content = renderer.generateXML(objects, 1);
-        
+        Element content = renderer.generateXML(objects, getPageNumber());
         parent.addContent(content);
+
+        generateFooter(parent);
     }
+    
+    protected int getPageNumber() {
+        return 1;
+    }
+    
+    protected void generateFooter(Element parent) {
+        // override to generate additional XML output
+    }
+
 }