Author: ayanul Date: 2007-11-06 04:29:31 -0500 (Tue, 06 Nov 2007) New Revision: 3776 Added: branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties Removed: branches/3.1.x/test-applications/facelets/src/main/java/demo/ branches/3.1.x/test-applications/facelets/src/main/java/div/ branches/3.1.x/test-applications/facelets/src/main/java/resources.properties branches/3.1.x/test-applications/facelets/src/main/java/selectOneMenuPage/ branches/3.1.x/test-applications/facelets/src/main/java/skins/ branches/3.1.x/test-applications/facelets/src/main/java/style/ Modified: branches/3.1.x/test-applications/facelets/src/main/java/dnd/DndBean.java branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java Log: Modified: branches/3.1.x/test-applications/facelets/src/main/java/dnd/DndBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/dnd/DndBean.java 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/dnd/DndBean.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -23,12 +23,12 @@ } public void processDrop(DropEvent event) { - System.out.println("Bean.processDrop()"); + System.out.println("Bean.processDrop()" + event.getDropValue()); this.dragValue = event.getDragValue(); } - public void processDrag(DragEvent dragEvent) { - System.out.println("Bean.processDrag()"); + public void processDrag(DragEvent event) { + System.out.println("Bean.processDrag()"+ event.getDropValue()); } public List getTypes() { Modified: branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -1,6 +1,6 @@ package panelMenu; -import style.icon.Icon; +import util.icon.Icon; public class PanelMenu { Deleted: branches/3.1.x/test-applications/facelets/src/main/java/resources.properties =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/resources.properties 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/resources.properties 2007-11-06 09:29:31 UTC (rev 3776) @@ -1,2 +0,0 @@ -prompt=Your Name\: -greeting=Hello Added: branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/MapComponent.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -0,0 +1,21 @@ +package rich; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +public class MapComponent { + private Map<String, ArrayList<String>> m; + + public MapComponent() { + m = new HashMap<String, ArrayList<String>>(); + } + + public void add(String component, ArrayList<String> path) { + m.put(component, path); + } + + public ArrayList<String> get(String key){ + return m.get(key); + } +} Modified: branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/rich/RichBean.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -1,17 +1,73 @@ package rich; +import java.util.ArrayList; + public class RichBean { private String src; - + private MapComponent map; + public RichBean() { - src = "/Calendar/Calendar.xhtml"; + src = "Blank"; + map = new MapComponent(); + // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); + map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); + map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true})); + map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, false})); + map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true})); + map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true})); + map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false})); + map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {true, true})); + map.add("Effect", add("/Effect/Effect", new boolean [] {false, false})); + map.add("Gmap", add("/Gmap/Gmap", new boolean [] {true, false})); + map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {true, true})); + map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {true, true})); + map.add("Insert", add("/Insert/Insert", new boolean [] {true, false})); + map.add("Message", add("/Message/Message", new boolean [] {true, true})); + map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {true, true})); + map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true, true})); + map.add("Panel", add("/Panel/Panel", new boolean [] {true, true})); + map.add("Panel2", add("/Panel/Panel2", new boolean [] {false, false})); + map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {true, true})); + map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {true, true})); + map.add("Separator", add("/Separator/Separator", new boolean [] {true, true})); + map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {true, true})); + map.add("Spacer", add("/Spacer/Spacer", new boolean [] {true, true})); + map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {true, true})); + map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {true, true})); + map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {true, true})); + map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false})); + map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true})); + map.add("Tree", add("/Tree/Tree", new boolean [] {true, false})); + map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true})); + map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); + map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); } public String getSrc() { return src; } + public String getPathComponent() { + return map.get(src).get(0); + } + + public String getPathProperty() { + return map.get(src).get(1); + } + + public String getPathStraightforward() { + return map.get(src).get(2); + } + public void setSrc(String src) { this.src = src; } + + private ArrayList<String> add(String path, boolean [] arr){ + ArrayList<String> list = new ArrayList<String>(); + list.add(path + ".xhtml"); + if(arr[0]) list.add(path + "Property.xhtml"); else list.add("/pages/Blank/BlankProperty.xhtml"); + if(arr[1]) list.add(path + "Straightforward.xhtml"); else list.add("/pages/Blank/BlankStraightforward.xhtml"); + return list; + } } Modified: branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/separator/Separator.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -142,32 +142,32 @@ public void bTest2(){ setAlign("center"); - setHeight("300px"); - setWidth("10px"); + setHeight("50px"); + setWidth("600px"); setLineType("dotted"); setTitle("Test2"); } public void bTest3(){ setAlign("right"); - setHeight("300px"); - setWidth("10px"); + setHeight("150px"); + setWidth("200px"); setLineType("dashed"); setTitle("Test3"); } public void bTest4(){ setAlign("left"); - setHeight("300px"); - setWidth("10px"); + setHeight("20px"); + setWidth("300px"); setLineType("double"); setTitle("Test4"); } public void bTest5(){ setAlign("left"); - setHeight("300px"); - setWidth("10px"); + setHeight("100px"); + setWidth("100px"); setLineType("solid"); setTitle("Test5"); } Modified: branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-11-06 09:24:37 UTC (rev 3775) +++ branches/3.1.x/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -39,32 +39,32 @@ } public void bTest1() { - setInitialState("Asus"); - setStateOrder("Asus,Benq,Toshiba"); + setInitialState("asus"); + setStateOrder("asus,benq,toshiba"); setSwitchType("client"); } public void bTest2() { - setInitialState("Benq"); - setStateOrder("Toshiba, Asus, Benq"); + setInitialState("benq"); + setStateOrder("toshiba,asus,benq"); setSwitchType("client"); } public void bTest3() { - setInitialState("Asus"); - setStateOrder("Asus,Benq,Toshiba"); + setInitialState("asus"); + setStateOrder("asus,benq,toshiba"); setSwitchType("server"); } public void bTest4() { - setInitialState("Benq"); - setStateOrder("Asus,Benq,Toshiba"); + setInitialState("benq"); + setStateOrder("asus,benq,toshiba"); setSwitchType("ajax"); } public void bTest5() { setInitialState("toshiba"); - setStateOrder("Toshiba, Asus, Benq"); + setStateOrder("toshiba,asus,benq"); setSwitchType("ajax"); } } Added: branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2007-11-06 09:29:31 UTC (rev 3776) @@ -0,0 +1,78 @@ +package util.componentInfo; + +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Field; +import java.util.ArrayList; + +public class ComponentInfo { + private final String beanName; + private String attribute; + private String property; + private boolean print; + + public ComponentInfo(String beanName) { + this.beanName = beanName; + this.attribute = ""; + this.property = ""; + print = true; + } + + public void setComponentInfo(String attribute, String property) { + this.attribute = attribute; + this.property = property; + if(print) printInfo(); + } + + public static String toString(Object obj) { + Class cl = obj.getClass(); + String r = cl.getName() + "["; + Class sc = cl.getSuperclass(); + if (!sc.equals(Object.class)) + r += sc + ","; + Field[] fields = cl.getDeclaredFields(); + try { + AccessibleObject.setAccessible(fields, true); + } catch (SecurityException e) { + } + for (int i = 0; i < fields.length; i++) { + Field f = fields[i]; + r += f.getName() + "="; + try { + Object val = f.get(obj); + r += val.toString(); + } catch (IllegalAccessException e) { + r += "???"; + } + if (i < fields.length - 1) + r += ","; + else + r += "]"; + } + return r; + } + + public boolean isPrint() { + return print; + } + + public void setPrint(boolean print) { + this.print = print; + } + + public String [] getComponentInfo() { + String [] str = {attribute, property}; + return str; + } + + public String getAttribute() { + return attribute; + } + + public String getProperty() { + return property; + } + + private void printInfo() { + System.out.println("beanName: " + beanName + "[attribute:" + attribute + "; property:" + property + "];"); + } +} Added: branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties =================================================================== --- branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties (rev 0) +++ branches/3.1.x/test-applications/facelets/src/main/java/util/resources.properties 2007-11-06 09:29:31 UTC (rev 3776) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello