Refactored widget set names in demo applications.

svn changeset:2731/svn branch:trunk

diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
index 42ce80af9c624861023cf70054dbe28f752b588b..6095f1c511648bf124b76acd850bbf0e16a4676b 100755 (executable)
--- a/build/bin/compile-gwt-components
+++ b/build/bin/compile-gwt-components
@@ -35,5 +35,5 @@ rm -r .gwt-cache
 
 # Build the widgetsets
 java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out $OUTDIR com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style $STYLE
-java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet -style $STYLE
-java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.reservation.gwt.WidgetSet -style $STYLE
+java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet -style $STYLE
+java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet -style $STYLE

diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
index b1ed38ce56878ba418d903367c2e97d191306b13..7967d9fde995511d885281d27b9a89f19c231e6d 100644 (file)
--- a/build/bin/compile-gwt-components.bat
+++ b/build/bin/compile-gwt-components.bat
@@ -1,2 +1,2 @@
 @java -Xmx128m -Xms128m -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet\r
-@java -Xmx128m -Xms128m -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.WidgetSet
\ No newline at end of file
+@java -Xmx128m -Xms128m -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet
\ No newline at end of file

diff --git a/build/build.xml b/build/build.xml
index 562ae3675118e94c0185423503e273007a9b47af..711ec73bcc86df0c56fb052bcf1edfa1a7e429ed 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -455,11 +455,11 @@
                        </classpath>
                </java>
 
-               <echo>com.itmill.toolkit.demo.reservation.gwt.WidgetSet</echo>
+               <echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
                <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
                        <arg value="-out" />
                        <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-                       <arg value="com.itmill.toolkit.demo.reservation.gwt.WidgetSet" />
+                       <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
                        <classpath>
                                <pathelement location="build/gwt/${platform}/gwt-user.jar" />
                                <pathelement location="build/gwt/${platform}/${lib-gwt-dev}" />
@@ -471,11 +471,11 @@
                        </classpath>
                </java>
 
-               <echo>com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet</echo>
+               <echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
                <java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
                        <arg value="-out" />
                        <arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-                       <arg value="com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet" />
+                       <arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
                        <classpath>
                                <pathelement location="build/gwt/${platform}/gwt-user.jar" />
                                <pathelement location="build/gwt/${platform}/${lib-gwt-dev}" />

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
new file mode 100644 (file)
index 0000000..798a5e6
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
@@ -0,0 +1,11 @@
+<module>
+       <!-- Inherit the NoEntry version to avoid multiple entrypoints -->\r
+       <inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> \r
+       \r
+       <!-- WidgetSet default theme -->        
+       <stylesheet src="colorpicker/styles.css"/>
+
+       <!-- Entry point -->
+       <entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/>
+  
+</module>

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml
deleted file mode 100644 (file)
index b38b30a..0000000
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<module>
-       <!-- Inherit the NoEntry version to avoid multiple entrypoints -->\r
-       <inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> \r
-       \r
-       <!-- WidgetSet default theme -->        
-       <stylesheet src="colorpicker/styles.css"/>
-
-       <!-- Entry point -->
-       <entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.WidgetSet"/>
-  
-</module>

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
new file mode 100644 (file)
index 0000000..e54c23d
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
@@ -0,0 +1,29 @@
+package com.itmill.toolkit.demo.colorpicker.gwt.client;\r
+\r
+import com.google.gwt.user.client.ui.Widget;\r
+import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;\r
+import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
+import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
+\r
+public class ColorPickerWidgetSet extends DefaultWidgetSet {\r
+       /** Creates a widget according to its class name. */\r
+    public Widget createWidget(UIDL uidl) {\r
+       String className = resolveWidgetTypeName(uidl);\r
+       if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"\r
+                       .equals(className))\r
+               return new IColorPicker();\r
+\r
+       // Let the DefaultWidgetSet handle creation of default widgets\r
+       return super.createWidget(uidl);\r
+    }\r
+\r
+    /** Resolves UIDL tag name to class name. */\r
+    protected String resolveWidgetTypeName(UIDL uidl) {\r
+       String tag = uidl.getTag();\r
+       if ("colorpicker".equals(tag))\r
+               return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker";\r
+\r
+       // Let the DefaultWidgetSet handle resolution of default widgets\r
+       return super.resolveWidgetTypeName(uidl);\r
+    }\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java
deleted file mode 100644 (file)
index 8cddcdf..0000000
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.itmill.toolkit.demo.colorpicker.gwt.client;\r
-\r
-import com.google.gwt.user.client.ui.Widget;\r
-import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;\r
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
-import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
-\r
-public class WidgetSet extends DefaultWidgetSet {\r
-       /** Creates a widget according to its class name. */\r
-    public Widget createWidget(UIDL uidl) {\r
-       String className = resolveWidgetTypeName(uidl);\r
-       if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"\r
-                       .equals(className))\r
-               return new IColorPicker();\r
-\r
-       // Let the DefaultWidgetSet handle creation of default widgets\r
-       return super.createWidget(uidl);\r
-    }\r
-\r
-    /** Resolves UIDL tag name to class name. */\r
-    protected String resolveWidgetTypeName(UIDL uidl) {\r
-       String tag = uidl.getTag();\r
-       if ("colorpicker".equals(tag))\r
-               return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker";\r
-\r
-       // Let the DefaultWidgetSet handle resolution of default widgets\r
-       return super.resolveWidgetTypeName(uidl);\r
-    }\r
-}\r

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml
new file mode 100644 (file)
index 0000000..1b0c3a4
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml
@@ -0,0 +1,14 @@
+<module>
+       <!-- Inherit the NoEntry version to avoid multiple entrypoints -->\r
+       <inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> \r
+       \r
+       <!-- The googlemaps_gwt module -->\r
+       <inherits name="com.mapitz.gwt.googleMaps.GoogleMaps" /> 
+       
+       <!-- WidgetSet default theme -->        
+       <stylesheet src="reservr/styles.css"/>
+
+       <!-- Entry point -->
+       <entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.ReservationWidgetSet"/>
+  
+</module>

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml
deleted file mode 100644 (file)
index 969f0d8..0000000
--- a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<module>
-       <!-- Inherit the NoEntry version to avoid multiple entrypoints -->\r
-       <inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> \r
-       \r
-       <!-- The googlemaps_gwt module -->\r
-       <inherits name="com.mapitz.gwt.googleMaps.GoogleMaps" /> 
-       
-       <!-- WidgetSet default theme -->        
-       <stylesheet src="reservr/styles.css"/>
-
-       <!-- Entry point -->
-       <entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.WidgetSet"/>
-  
-</module>

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
new file mode 100644 (file)
index 0000000..447b7b8
--- /dev/null
+++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
@@ -0,0 +1,40 @@
+package com.itmill.toolkit.demo.reservation.gwt.client;\r
+\r
+import com.google.gwt.core.client.GWT;\r
+import com.google.gwt.user.client.ui.Widget;\r
+import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField;\r
+import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap;\r
+import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
+import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
+\r
+public class ReservationWidgetSet extends DefaultWidgetSet {\r
+       public Widget createWidget(UIDL uidl) {\r
+               String className = resolveWidgetTypeName(uidl);\r
+               if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"\r
+                               .equals(className)) {\r
+                       return new IGoogleMap();\r
+               } else if ("com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField"\r
+                               .equals(className)) {\r
+                       return new ICalendarField();\r
+               }\r
+\r
+               return super.createWidget(uidl);\r
+       }\r
+\r
+       protected String resolveWidgetTypeName(UIDL uidl) {\r
+\r
+               String tag = uidl.getTag();\r
+               if ("googlemap".equals(tag)) {\r
+                       return "com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap";\r
+               } else if ("calendarfield".equals(tag)) {\r
+                       return "com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField";\r
+               }\r
+\r
+               return super.resolveWidgetTypeName(uidl);\r
+       }\r
+\r
+       public boolean isCorrectImplementation(Widget currentWidget, UIDL uidl) {\r
+               return GWT.getTypeName(currentWidget).equals(\r
+                               resolveWidgetTypeName(uidl));\r
+       }\r
+}\r

diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java
deleted file mode 100644 (file)
index 66adddc..0000000
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.itmill.toolkit.demo.reservation.gwt.client;\r
-\r
-import com.google.gwt.core.client.GWT;\r
-import com.google.gwt.user.client.ui.Widget;\r
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField;\r
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap;\r
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;\r
-import com.itmill.toolkit.terminal.gwt.client.UIDL;\r
-\r
-public class WidgetSet extends DefaultWidgetSet {\r
-       public Widget createWidget(UIDL uidl) {\r
-               String className = resolveWidgetTypeName(uidl);\r
-               if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"\r
-                               .equals(className)) {\r
-                       return new IGoogleMap();\r
-               } else if ("com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField"\r
-                               .equals(className)) {\r
-                       return new ICalendarField();\r
-               }\r
-\r
-               return super.createWidget(uidl);\r
-       }\r
-\r
-       protected String resolveWidgetTypeName(UIDL uidl) {\r
-\r
-               String tag = uidl.getTag();\r
-               if ("googlemap".equals(tag)) {\r
-                       return "com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap";\r
-               } else if ("calendarfield".equals(tag)) {\r
-                       return "com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField";\r
-               }\r
-\r
-               return super.resolveWidgetTypeName(uidl);\r
-       }\r
-\r
-       public boolean isCorrectImplementation(Widget currentWidget, UIDL uidl) {\r
-               return GWT.getTypeName(currentWidget).equals(\r
-                               resolveWidgetTypeName(uidl));\r
-       }\r
-}\r