March 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r7188 - trunk/ui/paint2D/src/main/config/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:56 -0400 (Tue, 25 Mar 2008) New Revision: 7188 Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/paint2D/src/main/config/component/paint2D.xml =================================================================== --- trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-03-25 16:17:52 UTC (rev 7187) +++ trunk/ui/paint2D/src/main/config/component/paint2D.xml 2008-03-25 16:17:56 UTC (rev 7188) @@ -111,7 +111,13 @@ and "RTL" (right-to-left) </description> </property> + <property hidden="true"> + <name>converter</name> + <classname>javax.faces.convert.Converter</classname> + <description> + + </description> + </property> - </component> </components>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7187 - trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:52 -0400 (Tue, 25 Mar 2008) New Revision: 7187 Modified: trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java =================================================================== --- trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2008-03-25 16:17:48 UTC (rev 7186) +++ trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2008-03-25 16:17:52 UTC (rev 7187) @@ -45,6 +45,7 @@ import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.HtmlTestUtils; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.SpinnerButtonDown; import org.richfaces.renderkit.html.images.SpinnerButtonGradient; @@ -65,14 +66,13 @@ private UIForm form = null; private UIComponent spinner = null; private UICommand command = null; - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); static { javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("script/SpinnerScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); - javaScripts.add("org/richfaces/renderkit/html/scripts/events.js"); } /** @@ -231,27 +231,18 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List scripts = page.getDocumentElement().getHtmlElementsByTagName( - "script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); - - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) - { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); - } - } + + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } + } + assertTrue("Component script " + javascript + " is not found in the response", found); + } } public void testUpdate() throws Exception {

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7186 - in trunk/framework/impl/src/main/java/org/richfaces: webapp/taglib and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:48 -0400 (Tue, 25 Mar 2008) New Revision: 7186 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2008-03-25 16:17:42 UTC (rev 7185) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/CompositeRenderer.java 2008-03-25 16:17:48 UTC (rev 7186) @@ -43,20 +43,20 @@ * */ public abstract class CompositeRenderer extends AjaxChildrenRenderer { - private List renderers = new ArrayList(); + private List<RendererContributor> renderers = new ArrayList<RendererContributor>(); - private List parameterEncoders = new ArrayList(); + private List<AttributeParametersEncoder> parameterEncoders = new ArrayList<AttributeParametersEncoder>(); private abstract static class Command { - protected final void execute(Iterator renderers, + protected final void execute(Iterator<?> renderers, FacesContext facesContext, UIComponent component, Object argument, - Class clazz) { + Class<?> clazz) { while (renderers.hasNext()) { RendererContributor contributor = (RendererContributor) renderers.next(); - Class acceptableClass = contributor.getAcceptableClass(); + Class<?> acceptableClass = contributor.getAcceptableClass(); if (clazz == null || acceptableClass == null || acceptableClass.isAssignableFrom(clazz)) { execute(contributor, facesContext, component, argument); } @@ -101,7 +101,7 @@ String[] styleDependencies = renderer.getStyleDependencies(); if (styleDependencies != null) { - Set styles = (Set) argument; + Set<String> styles = (Set<String>) argument; for (int i = 0; i < styleDependencies.length; i++) { styles.add(styleDependencies[i]); @@ -119,7 +119,7 @@ String[] scriptDependencies = renderer.getScriptDependencies(); if (scriptDependencies != null) { - Set scripts = (Set) argument; + Set<String> scripts = (Set<String>) argument; for (int i = 0; i < scriptDependencies.length; i++) { scripts.add(scriptDependencies[i]); @@ -137,7 +137,7 @@ String contribution = renderer.getScriptContribution(context, component); if (contribution != null) { - ((List) argument).add(contribution); + ((List<String>) argument).add(contribution); } } @@ -153,7 +153,7 @@ mergeScriptOptions(scriptOptions, context, component, null); } - protected void mergeScriptOptions(ScriptOptions scriptOptions, FacesContext context, UIComponent component, Class acceptableClass) { + protected void mergeScriptOptions(ScriptOptions scriptOptions, FacesContext context, UIComponent component, Class<?> acceptableClass) { MERGE_OPTIONS_COMMAND.execute(renderers.iterator(), context, component, scriptOptions, acceptableClass); } @@ -165,26 +165,26 @@ return getResources(null, MERGE_STYLE_DEPENDENCIES); } - protected InternetResource[] getScripts(Class clazz) { + protected InternetResource[] getScripts(Class<?> clazz) { return getResources(clazz, MERGE_SCRIPT_DEPENDENCIES); } - protected InternetResource[] getStyles(Class clazz) { + protected InternetResource[] getStyles(Class<?> clazz) { return getResources(clazz, MERGE_STYLE_DEPENDENCIES); } - private InternetResource[] getResources(Class acceptableClass, Command command) { - Set scriptsSet = new LinkedHashSet(); + private InternetResource[] getResources(Class<?> acceptableClass, Command command) { + Set<String> scriptsSet = new LinkedHashSet<String>(); command.execute(renderers.iterator(), null, null, scriptsSet, acceptableClass); if (!scriptsSet.isEmpty()) { - Iterator iterator = scriptsSet.iterator(); + Iterator<String> iterator = scriptsSet.iterator(); InternetResource[] result = new InternetResource[scriptsSet.size()]; for (int i = 0; i < result.length; i++) { - result[i] = getResource((String) iterator.next()); + result[i] = getResource(iterator.next()); } return result; @@ -197,13 +197,13 @@ return getScriptContributions(varString, context, component, component.getClass()); } - protected String getScriptContributions(String varString, FacesContext context, UIComponent component, Class acceptableClass) { - List scriptContributions = new ArrayList(); + protected String getScriptContributions(String varString, FacesContext context, UIComponent component, Class<?> acceptableClass) { + List<String> scriptContributions = new ArrayList<String>(); GET_SCRIPT_CONTRIBUTIONS.execute(renderers.iterator(), context, component, scriptContributions, acceptableClass); StringBuffer result = new StringBuffer(); - for (Iterator itr = scriptContributions.iterator(); itr.hasNext(); ) { + for (Iterator<String> itr = scriptContributions.iterator(); itr.hasNext(); ) { result.append(varString); result.append(itr.next()); } @@ -233,8 +233,8 @@ } public void encodeAttributeParameters(FacesContext context, UIComponent component) throws IOException { - for (Iterator iterator = parameterEncoders.iterator(); iterator.hasNext();) { - AttributeParametersEncoder encoder = (AttributeParametersEncoder) iterator.next(); + for (Iterator<AttributeParametersEncoder> iterator = parameterEncoders.iterator(); iterator.hasNext();) { + AttributeParametersEncoder encoder = iterator.next(); encoder.doEncode(context, component); } Modified: trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2008-03-25 16:17:42 UTC (rev 7185) +++ trunk/framework/impl/src/main/java/org/richfaces/webapp/taglib/UIComponentELTagBase.java 2008-03-25 16:17:48 UTC (rev 7186) @@ -78,7 +78,7 @@ data.setRowKeyConverter(conv); } } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); + throw new IllegalArgumentException(Messages.getMessage(Messages.NO_DATA_ADAPTOR, component.getClass().getName())); } } }

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7185 - in trunk/ui/dataFilterSlider/src: test/java/org/richfaces/component and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:42 -0400 (Tue, 25 Mar 2008) New Revision: 7185 Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx =================================================================== --- trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-03-25 16:17:35 UTC (rev 7184) +++ trunk/ui/dataFilterSlider/src/main/templates/dataFilterSlider.jspx 2008-03-25 16:17:42 UTC (rev 7185) @@ -12,7 +12,7 @@ component="org.richfaces.component.UIDataFltrSlider"> <h:styles>css/dataFilterSlider.xcss</h:styles> - <h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts> + <h:scripts>new org.ajax4jsf.javascript.AjaxScript(),new org.ajax4jsf.javascript.PrototypeScript(),scripts/scriptaculous-js-1.6.5/src/slider.js</h:scripts> <f:clientid var="clientId"/> <f:resource name="org.richfaces.renderkit.html.images.SliderArrowImage" var="arrow" /> Modified: trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java =================================================================== --- trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2008-03-25 16:17:35 UTC (rev 7184) +++ trunk/ui/dataFilterSlider/src/test/java/org/richfaces/component/DataFilterSliderComponentTest.java 2008-03-25 16:17:42 UTC (rev 7185) @@ -47,7 +47,7 @@ import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.commons.lang.StringUtils; +import org.ajax4jsf.tests.HtmlTestUtils; import org.richfaces.event.DataFilterSliderAdapter; import org.richfaces.event.DataFilterSliderEvent; import org.richfaces.renderkit.html.images.SliderFieldGradient; @@ -59,7 +59,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlInput; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for simple Component. @@ -69,7 +68,7 @@ private UIForm form = null; private UIComponent dfSlider = null; private UICommand command = null; - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); /** * Create the test case @@ -80,6 +79,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); + //No Ajax javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("scripts/scriptaculous-js-1.6.5/src/slider.js"); } @@ -139,7 +139,10 @@ HtmlElement htmlSliderInput = renderedView.getHtmlElementById(dfSlider.getClientId(facesContext)+"slider_val"); assertTrue(((HtmlInput)htmlSliderInput).getTypeAttribute().equals("text")); assertTrue(htmlSliderInput.getAttributeValue("class").contains("slider-input-field")); - assertTrue(htmlSliderInput.getAttributeValue("onchange").equals("dataFilterSlider.setValue(this.value);")); + + + //FIXME: Its wrong! + assertTrue(htmlSliderInput.getAttributeValue("onchange").equals("dataFilterSlider.valueChanged(event,this.value);")); } public void testImages() throws Exception { @@ -200,25 +203,18 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } + } + assertTrue("Component script " + javascript + " is not found in the response", found); + } - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); - } - } } public void testUpdate() throws Exception {

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7184 - trunk/ui/jQuery/src/test/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:35 -0400 (Tue, 25 Mar 2008) New Revision: 7184 Modified: trunk/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java =================================================================== --- trunk/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2008-03-25 16:17:30 UTC (rev 7183) +++ trunk/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2008-03-25 16:17:35 UTC (rev 7184) @@ -30,6 +30,7 @@ import javax.faces.component.UIForm; import javax.faces.component.html.HtmlForm; +import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; @@ -42,7 +43,7 @@ */ public class JQueryComponentTest extends AbstractAjax4JsfTestCase { private UIForm form = null; - private UIComponent jq = null; + private UIJQuery jq = null; private static Set javaScripts = new HashSet(); @@ -66,8 +67,10 @@ form = new HtmlForm(); facesContext.getViewRoot().getChildren().add(form); - jq = application.createComponent(UIJQuery.COMPONENT_TYPE); + jq = (UIJQuery) application.createComponent(UIJQuery.COMPONENT_TYPE); jq.setId("jq"); + jq.getAttributes().put("query", "form"); + form.getChildren().add(jq); } public void tearDown() throws Exception { @@ -78,9 +81,11 @@ public void testRendcerComponent() throws Exception { HtmlPage renderedView = renderView(); + List scripts = renderedView.getDocumentHtmlElement().getHtmlElementsByTagName(HTML.SCRIPT_ELEM); + assertNotNull(scripts); + assertFalse(scripts.isEmpty()); + //HtmlElement htmlGmap = renderedView.getHtmlElementById(jq.getClientId(facesContext)); - HtmlElement htmlGmap = renderedView.getHtmlElementById(jq.getClientId(facesContext)); - }

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7183 - trunk/ui/menu-components/src/test/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:30 -0400 (Tue, 25 Mar 2008) New Revision: 7183 Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2008-03-25 16:17:22 UTC (rev 7182) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2008-03-25 16:17:30 UTC (rev 7183) @@ -22,11 +22,11 @@ package org.richfaces.component; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import javax.faces.component.UIComponent; +import javax.faces.component.UIComponentBase; import javax.faces.component.UIForm; import javax.faces.component.html.HtmlForm; import javax.faces.component.html.HtmlOutputText; @@ -37,22 +37,33 @@ import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.commons.lang.StringUtils; +import org.ajax4jsf.tests.HtmlTestUtils; import org.richfaces.component.html.HtmlMenuGroup; import org.richfaces.renderkit.html.images.MenuNodeImage; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for MenuGroup Component. */ public class MenuGroupComponentTest extends AbstractAjax4JsfTestCase { - private static Set javaScripts = new HashSet(); + private static class UIMenu extends UIComponentBase implements MenuComponent { + @Override + public String getFamily() { + return null; + } + public String getSubmitMode() { + return null; + } + public void setSubmitMode(String submitMode) { + } + } + private static Set<String> javaScripts = new HashSet<String>(); + static { javaScripts.add("PrototypeScript"); javaScripts.add("AjaxScript"); @@ -79,12 +90,16 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); + UIMenu menu = new UIMenu(); + menu.setId("menu"); + form.getChildren().add(menu); + menuGroup = (HtmlMenuGroup) application .createComponent(HtmlMenuGroup.COMPONENT_TYPE); menuGroup.setId("menuGroup"); menuGroup.setValue("Menu Group"); - form.getChildren().add(menuGroup); + menu.getChildren().add(menuGroup); } public void tearDown() throws Exception { @@ -250,27 +265,17 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - // System.out.println(page.asXml()); - List scripts = page.getDocumentElement().getHtmlElementsByTagName( - "script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); - - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); - } - } + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } + } + assertTrue("Component script " + javascript + " is not found in the response", found); + } } public void testRenderImages() throws Exception { Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2008-03-25 16:17:22 UTC (rev 7182) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2008-03-25 16:17:30 UTC (rev 7183) @@ -22,11 +22,11 @@ package org.richfaces.component; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import javax.faces.component.UIComponent; +import javax.faces.component.UIComponentBase; import javax.faces.component.UIForm; import javax.faces.component.html.HtmlForm; import javax.faces.component.html.HtmlOutputText; @@ -39,22 +39,34 @@ import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.HtmlTestUtils; import org.ajax4jsf.tests.MockViewRoot; -import org.apache.commons.collections.Buffer; -import org.apache.commons.lang.StringUtils; import org.richfaces.component.html.HtmlMenuItem; import org.richfaces.renderkit.html.images.background.MenuItemBackground; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlScript; /** * Unit test for MenuItem Component. */ public class MenuItemComponentTest extends AbstractAjax4JsfTestCase { - private static Set javaScripts = new HashSet(); + + private static class UIMenu extends UIComponentBase implements MenuComponent { + @Override + public String getFamily() { + return null; + } + public String getSubmitMode() { + return null; + } + public void setSubmitMode(String submitMode) { + } + } + + + private static Set<String> javaScripts = new HashSet<String>(); static { javaScripts.add("PrototypeScript"); @@ -66,6 +78,7 @@ private UIMenuItem menuItem; + private UIForm form; /** @@ -85,12 +98,16 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); + UIMenu menu = new UIMenu(); + menu.setId("menu"); + form.getChildren().add(menu); + menuItem = (UIMenuItem) application .createComponent(HtmlMenuItem.COMPONENT_TYPE); menuItem.setId("menuItem"); menuItem.setValue("Menu Item"); - form.getChildren().add(menuItem); + menu.getChildren().add(menuItem); } public void tearDown() throws Exception { @@ -284,27 +301,17 @@ public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - // System.out.println(page.asXml()); - List scripts = page.getDocumentElement().getHtmlElementsByTagName( - "script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); - - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); - } - } + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } + } + assertTrue("Component script " + javascript + " is not found in the response", found); + } } /**

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7182 - trunk/ui/orderingList/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:22 -0400 (Tue, 25 Mar 2008) New Revision: 7182 Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-03-25 16:17:17 UTC (rev 7181) +++ trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2008-03-25 16:17:22 UTC (rev 7182) @@ -80,7 +80,7 @@ private static final long serialVersionUID = 5860506816451180551L; private Map dataMap; - private Collection selection; + private Set selection; private Object activeItem; private boolean _null = false; @@ -153,7 +153,7 @@ private Object value; - private Collection selection; + private Set selection; private boolean selectionSet; private Object activeItem; @@ -170,7 +170,7 @@ value = restoreAttachedState(context, state[0]); - selection = (Collection) restoreAttachedState(context, state[1]); + selection = (Set) restoreAttachedState(context, state[1]); selectionSet = Boolean.TRUE.equals(state[2]); activeItem = restoreAttachedState(context, state[3]); @@ -608,22 +608,22 @@ public abstract String getControlsType(); public abstract void setControlsType(String type); - public Collection getSelection() { + public Set getSelection() { if (valueHolder != null && valueHolder.selection != null) { return valueHolder.selection; } else { ValueBinding vb = getValueBinding("selection"); if (vb != null) { - return (Collection) vb.getValue(FacesContext.getCurrentInstance()); + return (Set) vb.getValue(FacesContext.getCurrentInstance()); } } return null; } - public void setSelection(Collection collection) { + public void setSelection(Set selection) { createValueHolder(); - valueHolder.selection = collection; + valueHolder.selection = selection; valueHolder.selectionSet = true; }

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7181 - trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: maksimkaszynski Date: 2008-03-25 12:17:17 -0400 (Tue, 25 Mar 2008) New Revision: 7181 Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-2726 Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java =================================================================== --- trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2008-03-25 16:10:30 UTC (rev 7180) +++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2008-03-25 16:17:17 UTC (rev 7181) @@ -44,6 +44,7 @@ import org.ajax4jsf.resource.ResourceBuilderImpl; import org.ajax4jsf.resource.image.ImageInfo; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.HtmlTestUtils; import org.apache.commons.lang.StringUtils; import org.richfaces.renderkit.html.images.SliderArrowImage; import org.richfaces.renderkit.html.images.SliderArrowSelectedImage; @@ -65,7 +66,7 @@ private UIForm form = null; private UIComponent slider = null; private UICommand command = null; - private static Set javaScripts = new HashSet(); + private static Set<String> javaScripts = new HashSet<String>(); /** * Create the test case @@ -177,31 +178,22 @@ assertTrue(link.getAttributeValue("href").contains("css/slider.xcss")); } + public void testRenderScript() throws Exception { HtmlPage page = renderView(); assertNotNull(page); //System.out.println(page.asXml()); - List scripts = page.getDocumentElement().getHtmlElementsByTagName( - "script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { - HtmlScript item = (HtmlScript) it.next(); - String srcAttr = item.getSrcAttribute(); - - if (StringUtils.isNotBlank(srcAttr)) { - boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) - { - String src = (String) srcIt.next(); - - found = srcAttr.contains(src); - if (found) { - break; - } - } - - assertTrue(found); - } - } + List<String> scriptSources = HtmlTestUtils.extractScriptSources(page); + for (String javascript : javaScripts) { + boolean found = false; + for (String script : scriptSources) { + if (script.indexOf(javascript) >= 0) { + found = true; + break; + } + } + assertTrue("Component script " + javascript + " is not found in the response", found); + } } public void testImages() throws Exception {

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7180 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-03-25 12:10:30 -0400 (Tue, 25 Mar 2008) New Revision: 7180 Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml Log: http://jira.jboss.com/jira/browse/RF-1690 - description review Modified: trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-03-25 16:09:00 UTC (rev 7179) +++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.xml 2008-03-25 16:10:30 UTC (rev 7180) @@ -21,10 +21,10 @@ <entry>component-type</entry> <entry>org.richfaces.ProgressBar</entry> </row> -  + <entry>org.richfaces.component.html.HtmlProgressBar</entry> + </row> <row> <entry>component-family</entry> <entry>org.richfaces.ProgressBar</entry> @@ -65,14 +65,31 @@ <title>Details of Usage</title> <para> As it was mentioned above, the <emphasis role="bold"><property><rich:progressBar></property> </emphasis> - component displays the status of the ongoing process. The component has a number of key attributes. + component displays the status of the ongoing process. </para> - <para> - The <emphasis><property>"value"</property></emphasis> attribute sets the current value of the process. Status of the process is calculated basing on <emphasis><property> "value"</property></emphasis> attribute. - </para> + <para> + Status of the process is calculated basing on values of the following attributes: + <itemizedlist> + <listitem> + <para> + <emphasis><property>"value"</property></emphasis> attribute sets the current value of the process + </para> + </listitem> + <listitem> + <para> + <emphasis><property>"minValue"</property></emphasis> (default value – "0") sets minimal value for + the <emphasis role="bold"><property><rich:progressBar></property></emphasis> to start rendering + </para> + </listitem> + <listitem> + <para> + <emphasis><property>"minValue"</property></emphasis> (default value – "0") sets maximum value for + the <emphasis role="bold"><property><rich:progressBar></property></emphasis> to finish rendering + </para> + </listitem> + </itemizedlist> + </para> - <para> The <emphasis role="bold"><property><rich:progressBar></property> </emphasis> starts and finishes rendering its state being governed by <emphasis><property>"minValue"</property></emphasis> (default value – "0") - and <emphasis><property>"maxValue"</property></emphasis> (default value is "100") attributes relatively. See the following example.</para> <para> <emphasis role="bold">Example:</emphasis> </para> @@ -80,7 +97,8 @@ <programlisting role="XML"><![CDATA[... <rich:progressBar value="#{bean.incValue}" minValue="50" maxValue="400"/> ...]]> </programlisting> - <para> + +  - <para> - <emphasis role="bold">Example:</emphasis> - </para> - - <programlisting role="XML"><![CDATA[... + <para> + There are two ways to display information on a progress bar: + </para> + <itemizedlist> + <listitem> + <para>Using <emphasis><property> "label"</property></emphasis> attribute</para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... +<rich:progressBar value="#{bean.incValue}" id="progrs" label="bean.incValue1"/> +...]]></programlisting> + </listitem> + + <listitem> + <para>Using <emphasis role="bold"><property><h:outputText /></property></emphasis></para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... <rich:progressBar value="#{bean.incValue1}"> <h:outputText value="#{bean.incValue1}"/> </rich:progressBar> -...]]> </programlisting> - - - - <para> +...]]> </programlisting> + </listitem> + + </itemizedlist> + + +  - - - </para> <para> + The <emphasis><property>"progressVar"</property></emphasis> attribute defines request scoped variable that could be used + for substitution purpose. This variable contains the data taken from <emphasis><property>"value"</property></emphasis> attribute. + Please, study carefully the following example. + </para> + <para> <emphasis role="bold">Example:</emphasis> </para> - <programlisting role="XML"><![CDATA[... <rich:progressBar value="#{bean.incValue1}" enabled="#{bean.enabled1}" id="progrs1" progressVar="progress"> <h:outputText value="{progress}%"/> @@ -137,16 +184,27 @@ ...]]> </programlisting> - <para> - In the shown example - <emphasis><property> "progressVar"</property></emphasis> attribute +  + + <para> + In the shown example <emphasis><property> "progressVar"</property></emphasis> attribute + defines a variable "progress" with the value taken from <emphasis><property>"value"</property></emphasis> + attribute of the <emphasis role="bold"><property><rich:progressBar></property></emphasis> component. + The "progress" variable performs substitution passing the current value of a progress to the + <emphasis><property>"value"</property></emphasis> attribute of the + <emphasis role="bold"><property><h:outputText></property></emphasis>. + This is how the current value of a progress appears on + the label of <emphasis role="bold"><property><rich:progressBar></property></emphasis>. </para> - + +  <para> The <emphasis role="bold"><property><rich:progressBar></property> </emphasis> @@ -173,7 +231,8 @@ <rich:progressBar value="#{bean.incValue1}" minValue="400" maxValue="900"> <h:outputText value="Min value is {minValue}, current value is {value}, max value is {maxValue}"/> </rich:progressBar> - ...]]> </programlisting> +...]]> </programlisting> + <para>This is a result:</para> <figure> <title>Macrosubstitution</title> <mediaobject> @@ -184,15 +243,24 @@ </figure>   - <para> +  + <para> + The <emphasis><property>"parameters"</property></emphasis> + is also a special attribute that defines parameters for substitution in the label. + All you need is to define a value of your own parameter + (e.g parameters="param:'#{bean.incValue1}'") + and you can use it to pass the data. + </para> + + <para> <emphasis role="bold">Example:</emphasis> </para> @@ -206,18 +274,22 @@  - - - - <para> The <emphasis><property>"interval"</property></emphasis>attribute defines the frequency of status polling. Polling is active while the component is operational. </para> + <para> + The <emphasis><property>"interval"</property></emphasis> attribute defines the frequency of status polling. + </para> <para> + Polling is active while the <emphasis><property>"enabled"</property></emphasis> attribute is "true".</para> + <para> <emphasis role="bold">Example:</emphasis> - </para> - + </para> <programlisting role="XML"><![CDATA[... -<rich:progressBar value="#{bean.incValue}" id="progrs" interval="900"/> +<rich:progressBar value="#{bean.incValue}" id="progrs" interval="900" enabled="true"/> ...]]> </programlisting> + <para> + With the help of <emphasis><property>"timeout"</property></emphasis> attribute you can define the waiting time on a particular request. + If a response is not received during this time the request is aborted. + </para> @@ -640,7 +712,7 @@ <para> <emphasis role="bold">Example:</emphasis> </para> - <programlisting role="CSS"><![CDATA[<rich:progressBar value="#{bean.incValue1}" styleClass="myClass"/> + <programlisting role="XML"><![CDATA[<rich:progressBar value="#{bean.incValue1}" styleClass="myClass"/> ]]></programlisting> <para>This is a result:</para>

16 years, 9 months

1
0
0 / 0

JBoss Rich Faces SVN: r7179 - in trunk: samples/listShuttleDemo/src/main/webapp/pages and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2008-03-25 12:09:00 -0400 (Tue, 25 Mar 2008) New Revision: 7179 Modified: trunk/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java trunk/samples/listShuttleDemo/src/main/webapp/pages/index.jsp trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js trunk/ui/pickList/src/main/templates/htmlPickList.jspx Log: RF-2525 listShuttle and pickList also were changed (the same problem) Modified: trunk/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java =================================================================== --- trunk/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/samples/listShuttleDemo/src/main/java/org/richfaces/ListShuttleDemoBean.java 2008-03-25 16:09:00 UTC (rev 7179) @@ -46,13 +46,13 @@ public ListShuttleDemoBean() { super(); - source = new ListShuttleOptionItem[2000]; - for (int i = 0; i < 2000; i++) { + source = new ListShuttleOptionItem[20]; + for (int i = 0; i < 20; i++) { source[i] = new ListShuttleOptionItem("Source Item " + i, new Random().nextInt(40)); } - target = new ListShuttleOptionItem[2000]; - for (int i = 0; i < 2000; i++) { + target = new ListShuttleOptionItem[20]; + for (int i = 0; i < 20; i++) { target[i] = new ListShuttleOptionItem("Target Item " + i, new Random().nextInt(40)); } Modified: trunk/samples/listShuttleDemo/src/main/webapp/pages/index.jsp =================================================================== --- trunk/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/samples/listShuttleDemo/src/main/webapp/pages/index.jsp 2008-03-25 16:09:00 UTC (rev 7179) @@ -105,9 +105,7 @@ <ls:listShuttle onlistchanged="alert(event.type)" id="listShuttle2" var="item" sourceValue="#{listShuttleDemoBean.zebraItems}" - columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1, zebraRow2" - moveControlsVerticalAlign="top" orderControlsVerticalAlign="bottom" - downControlClass="downControlClass"> + columnClasses="zebraCell1, zebraCell2" rowClasses="zebraRow1, zebraRow2" downControlClass="downControlClass"> <rich:column width="10px"> <f:facet name="header"> <h:outputText value="Name" /> Modified: trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js =================================================================== --- trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2008-03-25 16:09:00 UTC (rev 7179) @@ -42,7 +42,7 @@ } Richfaces.ListShuttle.prototype = { - initialize: function(targetList, sourceList, clientId, controlIds, switchByClick, sourceLayoutManager, targetLayoutManager, onlistchanged) { + initialize: function(targetList, sourceList, clientId, controlIds, switchByClick, onlistchanged) { this.containerId = clientId; this["rich:destructor"] = "destroy"; @@ -52,8 +52,8 @@ this.targetList = targetList; this.sourceList = sourceList; - this.targetLayoutManager = targetLayoutManager; - this.sourceLayoutManager = sourceLayoutManager; + this.targetLayoutManager = targetList.layoutManager; + this.sourceLayoutManager = sourceList.layoutManager; if (switchByClick == "true") { this.targetList.shuttleTable.observe("click", function(e) {this.moveItemByClick(window.event||e, this.targetList, this.sourceList)}.bindAsEventListener(this)); Modified: trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx =================================================================== --- trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-03-25 16:09:00 UTC (rev 7179) @@ -186,19 +186,14 @@ var clientId = '#{clientId}'; RichShuttleUtils.execOnLoad( function(){ - var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']]; - var listShuttleCotrolsIdPrefix = [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']]; - - var sourceLayoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); - var targetLayoutManager = new LayoutManager('#{clientId}tlInternal_header_tab', '#{clientId}tlInternal_tab'); - - var listShuttle = new Richfaces.ListShuttle(new Richfaces.ListShuttle.Target('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', cotrolsIdPrefix, '#{clientId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.ListShuttle.Target.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), - new Richfaces.ListShuttle.Source('#{clientId}', '#{clientId}internal_tab', '#{clientId}internal_header_tab', '#{clientId}focusKeeper', undefined, Richfaces.ListShuttle.Source.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), - "#{clientId}", listShuttleCotrolsIdPrefix, "#{switchByClick}", sourceLayoutManager, targetLayoutManager, #{this:getAsEventHandler(context, component, "onlistchanged")}); - var sourceLayoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); - var targetLayoutManager = new LayoutManager('#{clientId}tlInternal_header_tab', '#{clientId}tlInternal_tab'); - sourceLayoutManager.widthSynchronization(); - targetLayoutManager.widthSynchronization(); + new Richfaces.ListShuttle( + new Richfaces.ListShuttle.Target('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', + [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']], + '#{clientId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.ListShuttle.Target.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), + new Richfaces.ListShuttle.Source('#{clientId}', '#{clientId}internal_tab', '#{clientId}internal_header_tab', '#{clientId}focusKeeper', undefined, Richfaces.ListShuttle.Source.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), + "#{clientId}", + [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']], + "#{switchByClick}", #{this:getAsEventHandler(context, component, "onlistchanged")}); }, RichShuttleUtils.Condition.ElementPresent("#{clientId}"), 100 ); Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js =================================================================== --- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-03-25 16:09:00 UTC (rev 7179) @@ -64,6 +64,10 @@ this.sortOrder = Richfaces.ListBase.ASC; this.clckHandler = function(e) {this.onclickHandler(window.event || e)}.bindAsEventListener(this); this.shuttleTable.observe("click", this.clckHandler); + + // + this.layoutManager = new LayoutManager(headerTableId, contentTableId); + this.layoutManager.widthSynchronization(); }, destroy: function() { Modified: trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx =================================================================== --- trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-03-25 16:09:00 UTC (rev 7179) @@ -118,16 +118,14 @@ <script type="text/javascript"> var clientId = '#{cId}'; RichShuttleUtils.execOnLoad(function(){ - var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']]; - var shuttle = new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', + new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', - cotrolsIdPrefix, '#{cId}sortLabel', + [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']], + '#{cId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.OrderingListSelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}); - var layoutManager = new LayoutManager('#{cId}internal_header_tab', '#{cId}internal_tab'); - layoutManager.widthSynchronization(); }, RichShuttleUtils.Condition.ElementPresent("#{cId}"), 100); //setTimeout(init, 0); </script> Modified: trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js =================================================================== --- trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/pickList/src/main/resources/org/richfaces/renderkit/html/scripts/PickList.js 2008-03-25 16:09:00 UTC (rev 7179) @@ -1,8 +1,8 @@ if(!window.Richfaces) window.Richfaces = {}; Richfaces.PickList = Class.create(Richfaces.ListShuttle, { - initialize : function($super, targetList, sourceList, clientId, controlIds, switchByClick, sourceLayoutManager, targetLayoutManager, onlistchanged, valueKeeperId) { - $super(targetList, sourceList, clientId, controlIds, switchByClick, sourceLayoutManager, targetLayoutManager, onlistchanged); + initialize : function($super, targetList, sourceList, clientId, controlIds, switchByClick, onlistchanged, valueKeeperId) { + $super(targetList, sourceList, clientId, controlIds, switchByClick, onlistchanged); this.valueKeeper = $(valueKeeperId); //this.controlListManager(); }, Modified: trunk/ui/pickList/src/main/templates/htmlPickList.jspx =================================================================== --- trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-03-25 16:07:06 UTC (rev 7178) +++ trunk/ui/pickList/src/main/templates/htmlPickList.jspx 2008-03-25 16:09:00 UTC (rev 7179) @@ -157,18 +157,11 @@ var clientId = '#{clientId}'; RichShuttleUtils.execOnLoad( function(){ - var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']]; - var listShuttleCotrolsIdPrefix = [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']]; - - var sourceLayoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab'); - var targetLayoutManager = new LayoutManager('#{clientId}tlInternal_header_tab', '#{clientId}tlInternal_tab'); - - var listShuttle = new Richfaces.PickList(new Richfaces.PickList.Target('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', undefined, Richfaces.PickList.Target.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), + new Richfaces.PickList(new Richfaces.PickList.Target('#{clientId}', '#{clientId}tlInternal_tab', '#{clientId}tlInternal_header_tab', '#{clientId}tlFocusKeeper', undefined, Richfaces.PickList.Target.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), new Richfaces.PickList.Source('#{clientId}', '#{clientId}internal_tab', '#{clientId}internal_header_tab', '#{clientId}focusKeeper', undefined, Richfaces.PickList.Source.SelectItem, #{this:getColumnClassesAsJSArray(context, component)}, #{this:getRowClassesAsJSArray(context, component)}), - "#{clientId}", listShuttleCotrolsIdPrefix, "#{switchByClick}", sourceLayoutManager, targetLayoutManager, #{this:getAsEventHandler(context, component, "onlistchanged")}, + "#{clientId}", [['copy', 'discopy'], ['copyAll', 'discopyAll'], ['remove', 'disremove'], ['removeAll','disremoveAll']], + "#{switchByClick}", #{this:getAsEventHandler(context, component, "onlistchanged")}, "#{clientId}valueKeeper"); - sourceLayoutManager.widthSynchronization(); - targetLayoutManager.widthSynchronization(); }, RichShuttleUtils.Condition.ElementPresent("#{clientId}"), 100 );

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2008