Author: vmolotkov Date: 2007-11-23 08:42:45 -0500 (Fri, 23 Nov 2007) New Revision: 4218 Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js Log: cosmetic changes Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-11-23 12:20:45 UTC (rev 4217) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/config/component/listShuttle.xml 2007-11-23 13:42:45 UTC (rev 4218) @@ -21,6 +21,7 @@ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase </superclass> </tag> + <!-- <taghandler> <classname>org.ajax4jsf.tag.TestHandler</classname> Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-23 12:20:45 UTC (rev 4217) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleRendererBase.java 2007-11-23 13:42:45 UTC (rev 4218) @@ -15,12 +15,18 @@ import org.ajax4jsf.component.UIDataAdaptor; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.UIListShuttle; +import org.richfaces.component.UIOrderingBaseComponent; /** * @author Nick Belaevski * */ public abstract class ListShuttleRendererBase extends OrderingComponentRendererBase { + + public final static String FACET_SOURCE_CAPTION = "sourceCaption"; + + public final static String FACET_TARGET_CAPTION = "targetCaption"; + private static final String MESSAGE_BUNDLE_NAME = OrderingListRendererBase.class.getPackage().getName() + "ListShuttle"; @@ -43,26 +49,26 @@ super(MESSAGE_BUNDLE_NAME); } - public void encodeTLCaption(FacesContext context, UIListShuttle shuttle) { - + public void encodeTLCaption(FacesContext context, UIComponent shuttle) throws IOException { + encodeCaption(context, shuttle, FACET_TARGET_CAPTION, "ol_label ol_out_label rich-ordering-list-caption"); } - public void encodeTLHeader(FacesContext context, UIListShuttle shuttle) { - + public void encodeTLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws IOException { + encodeHeader(context, shuttle, "rich-table-header", "ol_col rich-table-header-cell", "sourceHeaderClass"); } public void encodeTLRows(FacesContext context, UIListShuttle shuttle) throws IOException { encodeRows(context, shuttle, new ListShuttleRendererTableHolder(shuttle, false)); } - public void encodeSLCaption(FacesContext context, UIListShuttle shuttle) { - + public void encodeSLCaption(FacesContext context, UIListShuttle shuttle) throws IOException { + encodeCaption(context, shuttle, FACET_SOURCE_CAPTION, "ol_label ol_out_label rich-ordering-list-caption"); } public void encodeTLControlsFacets(FacesContext context, UIListShuttle shuttle) { } - public void encodeSLHeader(FacesContext context, UIListShuttle shuttle) { - + public void encodeSLHeader(FacesContext context, UIOrderingBaseComponent shuttle) throws IOException { + encodeHeader(context, shuttle, "rich-table-header", "ol_col rich-table-header-cell", "sourceHeaderClass"); } public void encodeSLRows(FacesContext context, UIListShuttle shuttle) throws IOException { Modified: branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js =================================================================== --- branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-11-23 12:20:45 UTC (rev 4217) +++ branches/3.1.x/sandbox/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-11-23 13:42:45 UTC (rev 4218) @@ -90,6 +90,7 @@ this.moveItem(sourceComponent, targetComponent, item); } this.controlListManager(); + this.sourceList.controlListManager(); this.saveState(); } },