[richfaces-svn-commits] JBoss Rich Faces SVN: r4741 - in branches/3.1.x/ui/listShuttle/src/main: java/org/richfaces/renderkit and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-12-11 15:17:08 -0500 (Tue, 11 Dec 2007)
New Revision: 4741

Modified:
   branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
   branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
   branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
columnClasses/rowClasses handling added

Modified: branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/config/component/listShuttle.xml	2007-12-11 20:17:08 UTC (rev 4741)
@@ -304,5 +304,15 @@
 	            If "true", dragging between lists realized by click 
 	        </description>
 	    </property>
+	    
+	    <property>
+	    	<name>rowClasses</name>
+	    	<classname>java.lang.String</classname>
+	    </property>
+
+	    <property>
+	    	<name>columnClasses</name>
+	    	<classname>java.lang.String</classname>
+	    </property>
 	</component>
 </components>

Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java	2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java	2007-12-11 20:17:08 UTC (rev 4741)
@@ -9,11 +9,9 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.faces.component.UIColumn;
 import javax.faces.component.UIComponent;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
@@ -130,21 +128,17 @@
 					cellClassName.append("rich-shuttle-target-cell");
 				}
 
+				String rowClass = holder.getRowClass();
+				if (rowClass != null) {
+					rowClassName.append(' ');
+					rowClassName.append(rowClass);
+				}
+
 				ComponentVariables variables = ComponentsVariableResolver.getVariables(this, table);
 				SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME);
 				ItemState itemState = getItemState(context, table, variables);
 				
 				boolean active = itemState.isActive();
-//				if (active) {
-//					if (source) {
-//						rowClassName.append(" rich-shuttle-source-row-active");
-//						cellClassName.append(" rich-shuttle-source-cell-active");
-//					} else {
-//						rowClassName.append(" rich-shuttle-target-row-active");
-//						cellClassName.append(" rich-shuttle-target-cell-active");
-//					}
-//				}
-				
 				boolean selected = itemState.isSelected();
 				selectionState.addState(selected);
 				if (selected) {
@@ -159,25 +153,28 @@
 				
 				writer.writeAttribute("class", rowClassName.toString(), null);
 
+				int colCounter = 0;
 				boolean columnRendered = false;
 
-				List children = table.getChildren();
-				for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+				for (Iterator iterator = table.columns(); iterator.hasNext();) {
 					UIComponent component = (UIComponent) iterator.next();
 
-					if (component instanceof UIColumn && component.isRendered()) {
-						UIColumn column = (UIColumn) component;
-
+					if (component.isRendered()) {
 						writer.startElement(HTML.td_ELEM, table);
 
-						writer.writeAttribute("class", cellClassName.toString(), null);
+						String columnClass = holder.getColumnClass(colCounter);
+						if (columnClass != null) {
+							writer.writeAttribute("class", cellClassName.toString().concat(" " + columnClass), null);
+						} else {
+							writer.writeAttribute("class", cellClassName.toString(), null);
+						}
 
 						writer.startElement(HTML.IMG_ELEMENT, table);
 						writer.writeAttribute(HTML.src_ATTRIBUTE, getResource("/org/richfaces/renderkit/html/images/spacer.gif").getUri(context, null), null);
 						writer.writeAttribute(HTML.style_ATTRIBUTE, "width:1px;height:1px;", null);
 						writer.endElement(HTML.IMG_ELEMENT);
 						
-						renderChildren(context, column);
+						renderChildren(context, component);
 
 						if (!columnRendered) {
 							writer.startElement(HTML.INPUT_ELEM, table);
@@ -208,6 +205,8 @@
 
 						writer.endElement(HTML.td_ELEM);
 					}
+
+					colCounter++;
 				}
 
 				writer.endElement(HTML.TR_ELEMENT);

Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js	2007-12-11 20:16:58 UTC (rev 4740)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js	2007-12-11 20:17:08 UTC (rev 4741)
@@ -10,14 +10,12 @@
 	ROW : {
 		ACTIVE   : "rich-shuttle-source-row-active",
 		SELECTED : "rich-shuttle-source-row-selected",
-		ACTIVE_SELECTED : "rich-shuttle-source-row-selected rich-shuttle-source-row-active",
 		DISABLED : "rich-shuttle-source-row-disabled",
 		NORMAL   : "rich-shuttle-source-row"
 	},
 	CELL : {
 		ACTIVE   : "rich-shuttle-source-cell-active",
 		SELECTED : "rich-shuttle-source-cell-selected",
-		ACTIVE_SELECTED : "rich-shuttle-source-cell-selected rich-shuttle-source-cell-active",
 		DISABLED : "rich-shuttle-source-cell-disabled",
 		NORMAL   : "rich-shuttle-source-cell",
 		BEGIN:	" rich-shuttle-source-cell-first",
@@ -30,14 +28,12 @@
 	ROW : {
 		ACTIVE   : "rich-shuttle-target-row-active",
 		SELECTED : "rich-shuttle-target-row-selected",
-		ACTIVE_SELECTED : "rich-shuttle-target-row-selected rich-shuttle-target-row-active",
 		DISABLED : "rich-shuttle-target-row-disabled",
 		NORMAL   : "rich-shuttle-target-row"
 	},
 	CELL : {
 		ACTIVE   : "rich-shuttle-target-cell-active",
 		SELECTED : "rich-shuttle-target-cell-selected",
-		ACTIVE_SELECTED : "rich-shuttle-target-cell-selected rich-shuttle-target-cell-active",
 		DISABLED : "rich-shuttle-target-cell-disabled",
 		NORMAL   : "rich-shuttle-target-cell",
 		BEGIN:	" rich-shuttle-target-cell-first",