From a74fa80f5d6185164e634ea61055a5e7b158abdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20Gr=C3=B6nroos?= Date: Wed, 7 Nov 2007 11:04:45 +0000 Subject: [PATCH] Refactored widget set names in demo applications. svn changeset:2731/svn branch:trunk --- build/bin/compile-gwt-components | 4 ++-- build/bin/compile-gwt-components.bat | 2 +- build/build.xml | 8 ++++---- .../{WidgetSet.gwt.xml => ColorPickerWidgetSet.gwt.xml} | 2 +- .../client/{WidgetSet.java => ColorPickerWidgetSet.java} | 2 +- .../{WidgetSet.gwt.xml => ReservationWidgetSet.gwt.xml} | 2 +- .../client/{WidgetSet.java => ReservationWidgetSet.java} | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename src/com/itmill/toolkit/demo/colorpicker/gwt/{WidgetSet.gwt.xml => ColorPickerWidgetSet.gwt.xml} (91%) rename src/com/itmill/toolkit/demo/colorpicker/gwt/client/{WidgetSet.java => ColorPickerWidgetSet.java} (92%) rename src/com/itmill/toolkit/demo/reservation/gwt/{WidgetSet.gwt.xml => ReservationWidgetSet.gwt.xml} (93%) rename src/com/itmill/toolkit/demo/reservation/gwt/client/{WidgetSet.java => ReservationWidgetSet.java} (92%) 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 @@ - com.itmill.toolkit.demo.reservation.gwt.WidgetSet + com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet - + @@ -471,11 +471,11 @@ - com.itmill.toolkit.demo.colorpicker.gwt.WidgetSet + com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet - + diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml similarity index 91% rename from src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml rename to 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 @@ - + diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java similarity index 92% rename from src/com/itmill/toolkit/demo/colorpicker/gwt/client/WidgetSet.java rename to 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 similarity index 93% rename from src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml rename to 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 @@ - + diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java similarity index 92% rename from src/com/itmill/toolkit/demo/reservation/gwt/client/WidgetSet.java rename to 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" -- 2.39.5