diff options
| author | Marko Grönroos <magi@iki.fi> | 2007-11-07 11:04:45 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2007-11-07 11:04:45 +0000 |
| commit | a74fa80f5d6185164e634ea61055a5e7b158abdc (patch) | |
| tree | 59af04c0df92597670e4eb12b4595d2f1af2b871 | |
| parent | f39604cbe25f2c408a3130af32b407c234a2f1bb (diff) | |
| download | vaadin-framework-a74fa80f5d6185164e634ea61055a5e7b158abdc.tar.gz vaadin-framework-a74fa80f5d6185164e634ea61055a5e7b158abdc.zip | |
Refactored widget set names in demo applications.
svn changeset:2731/svn branch:trunk
| -rwxr-xr-x | build/bin/compile-gwt-components | 4 | ||||
| -rw-r--r-- | build/bin/compile-gwt-components.bat | 2 | ||||
| -rw-r--r-- | build/build.xml | 8 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml (renamed from src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml) | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java (renamed from src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java) | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml (renamed from src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml) | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java (renamed from src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java) | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components index 42ce80af9c..6095f1c511 100755 --- 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 b1ed38ce56..7967d9fde9 100644 --- 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
-@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 562ae36751..711ec73bcc 100644 --- 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/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml index b38b30ae21..798a5e68cb 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml @@ -6,6 +6,6 @@ <stylesheet src="colorpicker/styles.css"/> <!-- Entry point --> - <entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.WidgetSet"/> + <entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/> </module> diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java index 8cddcdf206..e54c23d686 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java @@ -5,7 +5,7 @@ import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker; import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
import com.itmill.toolkit.terminal.gwt.client.UIDL;
-public class WidgetSet extends DefaultWidgetSet {
+public class ColorPickerWidgetSet extends DefaultWidgetSet {
/** Creates a widget according to its class name. */
public Widget createWidget(UIDL uidl) {
String className = resolveWidgetTypeName(uidl);
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml index 969f0d86cd..1b0c3a4b8a 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml +++ b/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml @@ -9,6 +9,6 @@ <stylesheet src="reservr/styles.css"/> <!-- Entry point --> - <entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.WidgetSet"/> + <entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.ReservationWidgetSet"/> </module> diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java index 66adddc73b..447b7b83c9 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap; import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
import com.itmill.toolkit.terminal.gwt.client.UIDL;
-public class WidgetSet extends DefaultWidgetSet {
+public class ReservationWidgetSet extends DefaultWidgetSet {
public Widget createWidget(UIDL uidl) {
String className = resolveWidgetTypeName(uidl);
if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"
|