Author: nbelaevski Date: 2007-11-28 22:45:55 -0500 (Wed, 28 Nov 2007) New Revision: 4339 Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js Log: latest changes for orderingList Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-28 20:36:58 UTC (rev 4338) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingComponentRendererBase.java 2007-11-29 03:45:55 UTC (rev 4339) @@ -135,6 +135,53 @@ } } + protected static final class SelectionState { + + private boolean firstSelected = false; + private boolean firstSelectedLatch = false; + + private boolean selectedLatch = false; + + private boolean itemsExist = false; + + private boolean lastSelected = false; + + public SelectionState() { + super(); + } + + public void addState(boolean selected) { + itemsExist = true; + + if (!firstSelectedLatch) { + firstSelected = selected; + firstSelectedLatch = true; + } + + if (selected) { + selectedLatch = true; + } + + lastSelected = selected; + } + + public boolean isFirstSelected() { + return firstSelected; + } + + public boolean isSelected() { + return selectedLatch; + } + + public boolean isItemExist() { + return itemsExist; + } + + public boolean isLastSelected() { + return lastSelected; + } + } + private final String bundleName; public OrderingComponentRendererBase(String bundleName) { Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java =================================================================== --- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-28 20:36:58 UTC (rev 4338) +++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/renderkit/OrderingListRendererBase.java 2007-11-29 03:45:55 UTC (rev 4339) @@ -45,7 +45,7 @@ public void encodeBegin(FacesContext context, UIComponent component) throws IOException { ComponentVariables variables = ComponentsVariableResolver.getVariables(this, component); - variables.setVariable(SELECTION_STATE_VAR_NAME, new OrderingListSelectionState()); + variables.setVariable(SELECTION_STATE_VAR_NAME, new SelectionState()); super.encodeBegin(context, component); } @@ -59,7 +59,7 @@ int divider = HELPERS.length / 2; ComponentVariables variables = ComponentsVariableResolver.getVariables(this, orderingList); - OrderingListSelectionState selectionState = (OrderingListSelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME); + SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME); for (int i = 0; i < HELPERS.length; i++) { boolean boundarySelection = i < divider ? selectionState.isFirstSelected() : selectionState.isLastSelected(); @@ -76,41 +76,6 @@ } } - private static final class OrderingListSelectionState { - - private boolean firstSelected = false; - private boolean firstSelectedLatch = false; - - private boolean selectedLatch = false; - - private boolean lastSelected = false; - - public void addState(boolean selected) { - if (!firstSelectedLatch) { - firstSelected = selected; - firstSelectedLatch = true; - } - - if (selected) { - selectedLatch = true; - } - - lastSelected = selected; - } - - public boolean isFirstSelected() { - return firstSelected; - } - - public boolean isSelected() { - return selectedLatch; - } - - public boolean isLastSelected() { - return lastSelected; - } - }; - public void encodeOneRow(FacesContext context, TableHolder holder) throws IOException { ResponseWriter writer = context.getResponseWriter(); @@ -137,7 +102,7 @@ cellClassName.append(" rich-ordering-list-cell-selected"); } - OrderingListSelectionState selectionState = (OrderingListSelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME); + SelectionState selectionState = (SelectionState) variables.getVariable(SELECTION_STATE_VAR_NAME); selectionState.addState(selected); writer.writeAttribute("class", rowClassName.toString(), null); @@ -164,26 +129,6 @@ writer.endElement(HTML.TR_ELEMENT); } - /*public void encodeChildren(FacesContext context, UIComponent component) throws IOException { - ResponseWriter writer = context.getResponseWriter(); - String clientId = component.getClientId(context); - - writer.startElement(HTML.TR_ELEMENT, component); - writer.startElement(HTML.td_ELEM, component); - encodeCaption(context, (UIOrderingList) component); - writer.endElement(HTML.td_ELEM); - writer.endElement(HTML.TR_ELEMENT); - - writer.startElement(HTML.TR_ELEMENT, component); - writer.startElement(HTML.td_ELEM, component); - writer.startElement(HTML.DIV_ELEM, component); - writer.writeAttribute(HTML.id_ATTRIBUTE, clientId.concat("headerBox"), null); - writer.writeAttribute(HTML.class_ATTRIBUTE, "ol_list", null); - - - encodeRows(context, component); - }*/ - public void doDecode(FacesContext context, UIComponent component) { UIOrderingList orderingList = (UIOrderingList) component; Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-28 20:36:58 UTC (rev 4338) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-11-29 03:45:55 UTC (rev 4339) @@ -151,13 +151,14 @@ white-space: nowrap; } -.rich-ordering-list-cell-selected, rich-ordering-list-cell-selected * { +.rich-ordering-list-cell-selected { padding : 2px; white-space: nowrap; } -.rich-ordering-list-cell-active, .rich-ordering-list-cell-active * { - +.rich-ordering-list-cell-active { + padding : 2px; + white-space: nowrap; } .rich-ordering-list-ds { @@ -268,10 +269,18 @@ <u:style name="font-size" skin="generalSizeFont" /> </u:selector> - <u:selector name=".rich-ordering-list-cell-active, .rich-ordering-list-cell-active *"> + <u:selector name=".rich-ordering-list-cell-active *"> <u:style name="font-size" skin="generalSizeFont" /> <u:style name="font-family" skin="generalFamilyFont" /> </u:selector> + + <u:selector name=".rich-ordering-list-cell-active"> + <u:style name="border-top" value="1px dotted gray" /> + <u:style name="border-bottom" value="1px dotted gray" /> + + <u:style name="font-size" skin="generalSizeFont" /> + <u:style name="font-family" skin="generalFamilyFont" /> + </u:selector> <u:selector name=".rich-ordering-control-disabled"> <u:style name="border-color" skin="panelBorderColor" /> @@ -301,13 +310,12 @@ </u:selector> <u:selector name=".rich-ordering-list-row-active"> - <u:style name="font-weight" skin="headerWeightFont" /> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" /> </u:style> <u:style name="background-color" skin="headerGradientColor" /> </u:selector> - + <u:selector name=".rich-ordering-list-row-selected"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.gradientimages.OrderingListSelectGradient" /> Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js =================================================================== --- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-11-28 20:36:58 UTC (rev 4338) +++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/SelectItem.js 2007-11-29 03:45:55 UTC (rev 4339) @@ -52,7 +52,8 @@ for (var i = 0; i < cells.length; i++) { var cell = cells[i]; if (i == (cells.length - 1)) { - Element.setStyle(cell, {'border': '0px'}); + //TODO nick - testing + //Element.setStyle(cell, {'border': '0px'}); } Richfaces.SelectItems.doChangeNode(cell, classNameCell); }