Author: nbelaevski Date: 2007-07-12 10:56:06 -0400 (Thu, 12 Jul 2007) New Revision: 1607 Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java Log: - unit tests fixed - elonly handling fixed for MethodBinding Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/cdk/generator/src/main/resources/META-INF/templates/componentTag.vm 2007-07-12 14:56:06 UTC (rev 1607) @@ -94,18 +94,6 @@ setValueChangedListenerProperty(component, this._${prop.name}); #elseif($prop.name == "value") setValueProperty(component, this._${prop.name}); - #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) - setValueBinding(component, "${prop.name}",this._${prop.name}); - #elseif(${prop.simpleType}) - // Simple type - ${prop.simpleClassName} - set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); - #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") - set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.String") - setStringProperty(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.Object") - // TODO - handle object - setStringProperty(component, "${prop.name}",this._${prop.name}); #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) if(null != this._${prop.name}){ if (isValueReference(this._${prop.name})) @@ -119,6 +107,18 @@ getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); } } + #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); #else // TODO - setup properties for other cases. // name ${prop.name} with type $prop.classname Modified: trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/cdk/generator/src/main/resources/META-INF/templates12/componentTag.vm 2007-07-12 14:56:06 UTC (rev 1607) @@ -94,18 +94,6 @@ setValueChangedListenerProperty(component, this._${prop.name}); #elseif($prop.name == "value") setValueProperty(component, this._${prop.name}); - #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) - setValueBinding(component, "${prop.name}",this._${prop.name}); - #elseif(${prop.simpleType}) - // Simple type - ${prop.simpleClassName} - set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); - #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") - set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.String") - setStringProperty(component, "${prop.name}",this._${prop.name}); - #elseif( $prop.classname == "java.lang.Object") - // TODO - handle object - setStringProperty(component, "${prop.name}",this._${prop.name}); #elseif( $prop.isInstanceof("javax.faces.el.MethodBinding") ) if(null != this._${prop.name}){ if (isValueReference(this._${prop.name})) @@ -119,6 +107,18 @@ getFacesContext().getExternalContext().log("Component " + component.getClientId(getFacesContext()) + " has invalid ${prop.name} value: " + this._${prop.name}); } } + #elseif($prop.elonly || $prop.isInstanceof("javax.faces.el.ValueBinding") ) + setValueBinding(component, "${prop.name}",this._${prop.name}); + #elseif(${prop.simpleType}) + // Simple type - ${prop.simpleClassName} + set${prop.boxingClass}Property(component, "${prop.name}",this._${prop.name}); + #elseif($prop.classname == "java.lang.Boolean" || $prop.classname == "java.lang.Integer" || $prop.classname == "java.lang.Long") + set${prop.simpleClassName}Property(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.String") + setStringProperty(component, "${prop.name}",this._${prop.name}); + #elseif( $prop.classname == "java.lang.Object") + // TODO - handle object + setStringProperty(component, "${prop.name}",this._${prop.name}); #else // TODO - setup properties for other cases. // name ${prop.name} with type $prop.classname Modified: trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java =================================================================== --- trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/datascroller/src/test/java/org/richfaces/component/DatascrollerComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -57,7 +57,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); } private UIDatascroller scroller; Modified: trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java =================================================================== --- trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -40,7 +40,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("scripts/browser_info.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript"); Modified: trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java =================================================================== --- trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -50,7 +50,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("org.ajax4jsf.util.command.CommandScript"); javaScripts.add("scripts/menu.js"); Modified: trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java =================================================================== --- trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/gmap/src/test/java/org/richfaces/component/GmapComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -48,7 +48,7 @@ private final static String TEST_STYLE = "width:500px; height:400px"; static { - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("script/gmap.js"); javaScripts.add("http://maps.google.com"); 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 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -75,7 +75,7 @@ */ static { - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); javaScripts.add("script/SliderScript.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); 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 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/inputnumber-spinner/src/test/java/org/richfaces/component/InputNumberSpinnerComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -68,7 +68,7 @@ private static Set javaScripts = new HashSet(); static { - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + 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"); Modified: trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java =================================================================== --- trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/menu-components/src/test/java/org/richfaces/component/MenuSeparatorComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -41,7 +41,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript()"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt()"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript()"); javaScripts.add("org.ajax4jsf.util.command.CommandScript()"); } */ Modified: trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java =================================================================== --- trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/modal-panel/src/test/java/org/richfaces/component/ModalPanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -56,7 +56,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("scripts/utils.js"); javaScripts.add("scripts/modalPanel.js"); javaScripts.add("scripts/modalPanelBorders.js"); Modified: trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -48,7 +48,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org.ajax4jsf.javascript.ImageCacheScript"); javaScripts.add("org/ajax4jsf/javascript/scripts/form.js"); javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js"); Modified: trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java =================================================================== --- trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -51,7 +51,7 @@ static { javaScripts.add("org.ajax4jsf.javascript.AjaxScript"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("scripts/togglePanel.js"); } Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-12 14:51:23 UTC (rev 1606) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-12 14:56:06 UTC (rev 1607) @@ -73,7 +73,7 @@ static { javaScripts.add("/org/richfaces/renderkit/html/scripts/json/json.js"); - javaScripts.add("org.ajax4jsf.javascript.PrototypeScriptpt"); + javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("scripts/AJAX.js"); javaScripts.add("org.ajax4jsf.dnd.DnDScript");