[Aplaws-commit] r1009 - contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui

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

Author: apevec
Date: 2005-11-23 23:59:49 +0100 (Wed, 23 Nov 2005)
New Revision: 1009

Modified:
   contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java
Log:
render new multi-valued properties correctly


Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java	2005-11-23 17:39:51 UTC (rev 1008)
+++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationsTable.java	2005-11-23 22:59:49 UTC (rev 1009)
@@ -114,16 +114,16 @@
 			});
 
 		addColumn("topic", Consultation.TOPIC, true, 
-				new DynOptionCellRenderer("topic"));
+				new TopicCellRenderer());
 		
 		addColumn("geo_area", Consultation.GEO_AREA, true, 
-				new DynOptionCellRenderer("geo"));
+				new GeoCellRenderer());
 		
 		addColumn("start_date", Consultation.START_DATE, true,
 				new DateTableCellRenderer());
 		
 		addColumn("type", Consultation.CONSULTATION_TYPE, true, 
-				new DynOptionCellRenderer("type"));
+				new TypeCellRenderer());
 		
 		addColumn("results_feedback", Consultation.FEEDBACK);
 
@@ -212,20 +212,40 @@
     	return (String)state.getValue(m_filter);
     }
     
-    private class DynOptionCellRenderer implements TableCellRenderer {
-    	private String m_optionName;
-    	
-    	public DynOptionCellRenderer(String optionName) {
-    		m_optionName = optionName;
-    	}
+    private class TopicCellRenderer implements TableCellRenderer {
+    	private Label l = new Label();
+    	public Component getComponent(Table table, PageState state,
+				Object value, boolean isSelected, Object key, int row, int column) {
+    		l.setLabel(Consultation.internalGetPrettyTopics((String) value));
+    		return l;
+		}
+    }
 
-		public Component getComponent(Table table, PageState state,
+    private class TypeCellRenderer implements TableCellRenderer {
+    	private Label l = new Label();
+    	public Component getComponent(Table table, PageState state,
 				Object value, boolean isSelected, Object key, int row, int column) {
-			if (value == null)
-				return new Label("");
+    		l.setLabel(Consultation.internalGetPrettyTypes((String) value));
+    		return l;
+		}
+    }
 
-			return new Label(ConsultationUtil.globalize(m_optionName + "Option" + value));
+    private class TargetCellRenderer implements TableCellRenderer {
+    	private Label l = new Label();
+    	public Component getComponent(Table table, PageState state,
+				Object value, boolean isSelected, Object key, int row, int column) {
+    		l.setLabel(Consultation.internalGetPrettyTargets((String) value));
+    		return l;
 		}
     }
 
+    private class GeoCellRenderer implements TableCellRenderer {
+    	private Label l = new Label();
+    	public Component getComponent(Table table, PageState state,
+				Object value, boolean isSelected, Object key, int row, int column) {
+    		l.setLabel(Consultation.internalGetPrettyGeoAreas((String) value));
+    		return l;
+		}
+    }
+
 }