From: Marko Grönroos Date: Wed, 7 Nov 2007 11:04:45 +0000 (+0000) Subject: Refactored widget set names in demo applications. X-Git-Tag: 6.7.0.beta1~5652 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a74fa80f5d6185164e634ea61055a5e7b158abdc;p=vaadin-framework.git 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 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/ColorPickerWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml new file mode 100644 index 0000000000..798a5e68cb --- /dev/null +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + 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 index b38b30ae21..0000000000 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/WidgetSet.gwt.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - 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 index 0000000000..e54c23d686 --- /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; + +import com.google.gwt.user.client.ui.Widget; +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 ColorPickerWidgetSet extends DefaultWidgetSet { + /** Creates a widget according to its class name. */ + public Widget createWidget(UIDL uidl) { + String className = resolveWidgetTypeName(uidl); + if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker" + .equals(className)) + return new IColorPicker(); + + // Let the DefaultWidgetSet handle creation of default widgets + return super.createWidget(uidl); + } + + /** Resolves UIDL tag name to class name. */ + protected String resolveWidgetTypeName(UIDL uidl) { + String tag = uidl.getTag(); + if ("colorpicker".equals(tag)) + return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"; + + // Let the DefaultWidgetSet handle resolution of default widgets + return super.resolveWidgetTypeName(uidl); + } +} 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 index 8cddcdf206..0000000000 --- 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; - -import com.google.gwt.user.client.ui.Widget; -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 { - /** Creates a widget according to its class name. */ - public Widget createWidget(UIDL uidl) { - String className = resolveWidgetTypeName(uidl); - if ("com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker" - .equals(className)) - return new IColorPicker(); - - // Let the DefaultWidgetSet handle creation of default widgets - return super.createWidget(uidl); - } - - /** Resolves UIDL tag name to class name. */ - protected String resolveWidgetTypeName(UIDL uidl) { - String tag = uidl.getTag(); - if ("colorpicker".equals(tag)) - return "com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker"; - - // Let the DefaultWidgetSet handle resolution of default widgets - return super.resolveWidgetTypeName(uidl); - } -} 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 index 0000000000..1b0c3a4b8a --- /dev/null +++ b/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + 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 index 969f0d86cd..0000000000 --- a/src/com/itmill/toolkit/demo/reservation/gwt/WidgetSet.gwt.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - 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 index 0000000000..447b7b83c9 --- /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; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Widget; +import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField; +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 ReservationWidgetSet extends DefaultWidgetSet { + public Widget createWidget(UIDL uidl) { + String className = resolveWidgetTypeName(uidl); + if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap" + .equals(className)) { + return new IGoogleMap(); + } else if ("com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField" + .equals(className)) { + return new ICalendarField(); + } + + return super.createWidget(uidl); + } + + protected String resolveWidgetTypeName(UIDL uidl) { + + String tag = uidl.getTag(); + if ("googlemap".equals(tag)) { + return "com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"; + } else if ("calendarfield".equals(tag)) { + return "com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField"; + } + + return super.resolveWidgetTypeName(uidl); + } + + public boolean isCorrectImplementation(Widget currentWidget, UIDL uidl) { + return GWT.getTypeName(currentWidget).equals( + resolveWidgetTypeName(uidl)); + } +} 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 index 66adddc73b..0000000000 --- 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; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.Widget; -import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField; -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 Widget createWidget(UIDL uidl) { - String className = resolveWidgetTypeName(uidl); - if ("com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap" - .equals(className)) { - return new IGoogleMap(); - } else if ("com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField" - .equals(className)) { - return new ICalendarField(); - } - - return super.createWidget(uidl); - } - - protected String resolveWidgetTypeName(UIDL uidl) { - - String tag = uidl.getTag(); - if ("googlemap".equals(tag)) { - return "com.itmill.toolkit.terminal.gwt.client.ui.IGoogleMap"; - } else if ("calendarfield".equals(tag)) { - return "com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField"; - } - - return super.resolveWidgetTypeName(uidl); - } - - public boolean isCorrectImplementation(Widget currentWidget, UIDL uidl) { - return GWT.getTypeName(currentWidget).equals( - resolveWidgetTypeName(uidl)); - } -}