diff options
Diffstat (limited to 'src/com/itmill/toolkit/demo')
47 files changed, 136 insertions, 62 deletions
diff --git a/src/com/itmill/toolkit/demo/BrowserDemo.java b/src/com/itmill/toolkit/demo/BrowserDemo.java index e6b6bc3a61..91756b09fd 100644 --- a/src/com/itmill/toolkit/demo/BrowserDemo.java +++ b/src/com/itmill/toolkit/demo/BrowserDemo.java @@ -27,6 +27,7 @@ public class BrowserDemo extends com.itmill.toolkit.Application implements // The embedded page Embedded emb = new Embedded(); + @Override public void init() { // Create and set main window final Window browser = new Window("IT Mill Browser"); diff --git a/src/com/itmill/toolkit/demo/BufferedComponents.java b/src/com/itmill/toolkit/demo/BufferedComponents.java index 38846cfc4b..e66ba6481a 100644 --- a/src/com/itmill/toolkit/demo/BufferedComponents.java +++ b/src/com/itmill/toolkit/demo/BufferedComponents.java @@ -20,6 +20,7 @@ public class BufferedComponents extends Application { private TextField text; + @Override public void init() { final Window w = new Window("Buffered UI components demo"); diff --git a/src/com/itmill/toolkit/demo/CachingDemo.java b/src/com/itmill/toolkit/demo/CachingDemo.java index 8b44aa0119..820ccca7e2 100644 --- a/src/com/itmill/toolkit/demo/CachingDemo.java +++ b/src/com/itmill/toolkit/demo/CachingDemo.java @@ -23,6 +23,7 @@ import com.itmill.toolkit.ui.Window; */
public class CachingDemo extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window("Client-side caching example");
@@ -47,6 +48,7 @@ public class CachingDemo extends com.itmill.toolkit.Application { layout.setMargin(true);
l = new Label(
"The first time you change to this tab, this label is very slow to produce (server-side).<br/> However, it will seem fast the second time you change to this tab, because it has not changed and is cached client-side.") {
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
try {
Thread.sleep(3000);
diff --git a/src/com/itmill/toolkit/demo/Calc.java b/src/com/itmill/toolkit/demo/Calc.java index 4348826a67..bc9e898a52 100644 --- a/src/com/itmill/toolkit/demo/Calc.java +++ b/src/com/itmill/toolkit/demo/Calc.java @@ -24,6 +24,7 @@ public class Calc extends com.itmill.toolkit.Application { private final GridLayout layout = new GridLayout(4, 5); // Application initialization creates UI and connects it to business logic + @Override public void init() { // Place the layout to a floating dialog inside the browser main window diff --git a/src/com/itmill/toolkit/demo/FilterSelect.java b/src/com/itmill/toolkit/demo/FilterSelect.java index 25a12b38b1..f4a9472fcd 100644 --- a/src/com/itmill/toolkit/demo/FilterSelect.java +++ b/src/com/itmill/toolkit/demo/FilterSelect.java @@ -37,6 +37,7 @@ public class FilterSelect extends com.itmill.toolkit.Application { * com.itmill.toolkit.service.Application class. It will be automatically * called by the framework when a user accesses the application. */ + @Override public void init() { /* diff --git a/src/com/itmill/toolkit/demo/HelloWorld.java b/src/com/itmill/toolkit/demo/HelloWorld.java index 35ac5fcf31..bcbf447d09 100644 --- a/src/com/itmill/toolkit/demo/HelloWorld.java +++ b/src/com/itmill/toolkit/demo/HelloWorld.java @@ -24,6 +24,7 @@ public class HelloWorld extends com.itmill.toolkit.Application { * com.itmill.toolkit.service.Application class. It will be automatically * called by the framework when a user accesses the application. */ + @Override public void init() { /* diff --git a/src/com/itmill/toolkit/demo/KeyboardShortcut.java b/src/com/itmill/toolkit/demo/KeyboardShortcut.java index 5ce9c9ba2c..7d3a3a1977 100644 --- a/src/com/itmill/toolkit/demo/KeyboardShortcut.java +++ b/src/com/itmill/toolkit/demo/KeyboardShortcut.java @@ -65,6 +65,7 @@ public class KeyboardShortcut extends Application implements Handler { private TextField f; + @Override public void init() { final Window w = new Window("Keyboard shortcuts demo"); @@ -98,7 +99,7 @@ public class KeyboardShortcut extends Application implements Handler { loki = new VerticalLayout(); main.addComponent(loki); - main.setExpandRatio(loki,1.0f); + main.setExpandRatio(loki, 1.0f); w.addActionHandler(this); diff --git a/src/com/itmill/toolkit/demo/NotificationDemo.java b/src/com/itmill/toolkit/demo/NotificationDemo.java index 860b54f243..8abe65ace8 100644 --- a/src/com/itmill/toolkit/demo/NotificationDemo.java +++ b/src/com/itmill/toolkit/demo/NotificationDemo.java @@ -34,6 +34,7 @@ public class NotificationDemo extends com.itmill.toolkit.Application { * com.itmill.toolkit.service.Application class. It will be automatically * called by the framework when a user accesses the application. */ + @Override public void init() { // Create new window for the application and give the window a visible. diff --git a/src/com/itmill/toolkit/demo/PortletDemo.java b/src/com/itmill/toolkit/demo/PortletDemo.java index e4089612f3..57d8027795 100644 --- a/src/com/itmill/toolkit/demo/PortletDemo.java +++ b/src/com/itmill/toolkit/demo/PortletDemo.java @@ -38,6 +38,7 @@ public class PortletDemo extends Application { Link portletMax = new Link();
Link someAction = null;
+ @Override
public void init() {
main = new Window();
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/demo/SelectDemo.java b/src/com/itmill/toolkit/demo/SelectDemo.java index c356901295..ec0ddcb647 100644 --- a/src/com/itmill/toolkit/demo/SelectDemo.java +++ b/src/com/itmill/toolkit/demo/SelectDemo.java @@ -35,6 +35,7 @@ public class SelectDemo extends com.itmill.toolkit.Application { /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window main = new Window("Select demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/TableDemo.java b/src/com/itmill/toolkit/demo/TableDemo.java index 68176a6e28..c5eee75959 100644 --- a/src/com/itmill/toolkit/demo/TableDemo.java +++ b/src/com/itmill/toolkit/demo/TableDemo.java @@ -69,6 +69,7 @@ public class TableDemo extends com.itmill.toolkit.Application implements /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window main = new Window("Table demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/WindowedDemos.java b/src/com/itmill/toolkit/demo/WindowedDemos.java index 36a7cfc119..26e745bb8e 100644 --- a/src/com/itmill/toolkit/demo/WindowedDemos.java +++ b/src/com/itmill/toolkit/demo/WindowedDemos.java @@ -37,6 +37,7 @@ public class WindowedDemos extends com.itmill.toolkit.Application { servlets.put("Notification demo", "NotificationDemo/"); } + @Override public void init() { // Create new window for the application and give the window a visible. diff --git a/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java b/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java index a6a6ff249e..ad90a74abc 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java +++ b/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java @@ -18,11 +18,13 @@ public class ColorPicker extends AbstractField { } /** The property value of the field is an Integer. */ + @Override public Class getType() { return String.class; } /** Tag is the UIDL element name for client-server communications. */ + @Override public String getTag() { return "colorpicker"; } @@ -41,6 +43,7 @@ public class ColorPicker extends AbstractField { } /** Paint (serialize) the component for the client. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Superclass writes any common attributes in the paint target. super.paintContent(target); @@ -51,6 +54,7 @@ public class ColorPicker extends AbstractField { } /** Deserialize changes received from client. */ + @Override public void changeVariables(Object source, Map variables) { // Sets the currently selected color if (variables.containsKey("colorname") && !isReadOnly()) { diff --git a/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java b/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java index e1fd2a1a8c..a69a552516 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java +++ b/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java @@ -24,6 +24,7 @@ public class ColorPickerApplication extends com.itmill.toolkit.Application { /* Another component. */ Label colorname; + @Override public void init() { setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java index 5661c28e9a..51131534c9 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java @@ -11,20 +11,24 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL; public class ColorPickerWidgetSet extends DefaultWidgetSet {
/** Resolves UIDL tag name to widget class. */
+ @Override
protected Class resolveWidgetType(UIDL uidl) {
final String tag = uidl.getTag();
- if ("colorpicker".equals(tag))
+ if ("colorpicker".equals(tag)) {
return IColorPicker.class;
+ }
// Let the DefaultWidgetSet handle resolution of default widgets
return super.resolveWidgetType(uidl);
}
/** Creates a widget instance according to its class object. */
+ @Override
public Paintable createWidget(UIDL uidl) {
final Class type = resolveWidgetType(uidl);
- if (IColorPicker.class == type)
+ if (IColorPicker.class == type) {
return new IColorPicker();
+ }
// Let the DefaultWidgetSet handle creation of default widgets
return super.createWidget(uidl);
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java index e261235227..b4d060d528 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java @@ -40,11 +40,14 @@ public class GwtColorPicker extends Composite implements ClickListener { // Set the button background colors. DOM.setStyleAttribute(button.getElement(), "background", - colors[colornum]); + colors[colornum]); // For dark colors, the button label must be in white. - if ("black navy maroon blue purple".indexOf(colors[colornum]) != -1) - DOM.setStyleAttribute(button.getElement(), "color", "white"); + if ("black navy maroon blue purple".indexOf(colors[colornum]) != -1) { + DOM + .setStyleAttribute(button.getElement(), "color", + "white"); + } } } @@ -63,7 +66,7 @@ public class GwtColorPicker extends Composite implements ClickListener { // before the widget has been added to the horizontal panel. final Element panelcell = DOM.getParent(currentcolor.getElement()); DOM.setElementProperty(panelcell, "className", - "colorpicker-currentcolorbox"); + "colorpicker-currentcolorbox"); // Set initial color. This will be overridden with the value read from // server. @@ -87,14 +90,15 @@ public class GwtColorPicker extends Composite implements ClickListener { // Obtain the DOM elements. This assumes that the <td> element // of the HorizontalPanel is the parent of the label element. final Element nameelement = currentcolor.getElement(); - final Element cell = DOM.getParent(nameelement); + final Element cell = DOM.getParent(nameelement); // Give feedback by changing the background color - DOM.setStyleAttribute(cell, "background", newcolor); + DOM.setStyleAttribute(cell, "background", newcolor); DOM.setStyleAttribute(nameelement, "background", newcolor); - if ("black navy maroon blue purple".indexOf(newcolor) != -1) + if ("black navy maroon blue purple".indexOf(newcolor) != -1) { DOM.setStyleAttribute(nameelement, "color", "white"); - else + } else { DOM.setStyleAttribute(nameelement, "color", "black"); + } } } diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java index 44e3fbe1f9..8e893fb117 100644 --- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java +++ b/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java @@ -42,8 +42,9 @@ public class IColorPicker extends GwtColorPicker implements Paintable { public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { // This call should be made first. Ensure correct implementation, // and let the containing layout manage caption, etc. - if (client.updateComponent(this, uidl, true)) + if (client.updateComponent(this, uidl, true)) { return; + } // Save reference to server connection object to be able to send // user interaction later @@ -57,10 +58,12 @@ public class IColorPicker extends GwtColorPicker implements Paintable { } /** Override the method to communicate the new value to server. */ + @Override public void setColor(String newcolor) { // Ignore if no change - if (newcolor.equals(currentcolor.getText())) + if (newcolor.equals(currentcolor.getText())) { return; + } // Let the original implementation to do whatever it needs to do super.setColor(newcolor); @@ -68,8 +71,9 @@ public class IColorPicker extends GwtColorPicker implements Paintable { // Updating the state to the server can not be done before // the server connection is known, i.e., before updateFromUIDL() // has been called. - if (uidlId == null || client == null) + if (uidlId == null || client == null) { return; + } // Communicate the user interaction parameters to server. This call will // initiate an AJAX request to the server. diff --git a/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java b/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java index e983c963c4..664fc6d5d9 100644 --- a/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java +++ b/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java @@ -38,6 +38,7 @@ public class CalendarDemo extends com.itmill.toolkit.Application { /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window main = new Window("Calendar demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/demo/reservation/CalendarField.java b/src/com/itmill/toolkit/demo/reservation/CalendarField.java index 2895182c3f..03da8221c6 100644 --- a/src/com/itmill/toolkit/demo/reservation/CalendarField.java +++ b/src/com/itmill/toolkit/demo/reservation/CalendarField.java @@ -63,6 +63,7 @@ public class CalendarField extends DateField implements Container.Viewer { * Gets the components UIDL tag string. Don't add a JavaDoc comment here, we
* use the default documentation from implemented interface.
*/
+ @Override
public String getTag() {
return TAGNAME;
}
@@ -80,6 +81,7 @@ public class CalendarField extends DateField implements Container.Viewer { * the resolution to set.
* @see com.itmill.toolkit.ui.DateField#setResolution(int)
*/
+ @Override
public void setResolution(int resolution) {
if (resolution != RESOLUTION_DAY && resolution != RESOLUTION_HOUR) {
throw new IllegalArgumentException();
@@ -232,6 +234,7 @@ public class CalendarField extends DateField implements Container.Viewer { * @throws PaintException
* if the paint operation failed.
*/
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
super.paintContent(target);
diff --git a/src/com/itmill/toolkit/demo/reservation/GoogleMap.java b/src/com/itmill/toolkit/demo/reservation/GoogleMap.java index 7079823be6..2dac57be63 100644 --- a/src/com/itmill/toolkit/demo/reservation/GoogleMap.java +++ b/src/com/itmill/toolkit/demo/reservation/GoogleMap.java @@ -29,10 +29,12 @@ public class GoogleMap extends AbstractComponent implements Sizeable, private Object itemMarkerXPropertyId = new Object();
private Object itemMarkerYPropertyId = new Object();
+ @Override
public String getTag() {
return "googlemap";
}
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
super.paintContent(target);
// Add size info as variables
diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java index ad661a3a6c..6c7ce5b9a0 100644 --- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java +++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java @@ -53,6 +53,7 @@ public class ReservationApplication extends Application { private GoogleMap map;
+ @Override
public void init() {
//
db = new SampleDB();
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java index 4534449b70..71582ba0c5 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java @@ -11,6 +11,7 @@ import com.itmill.toolkit.terminal.gwt.client.Paintable; import com.itmill.toolkit.terminal.gwt.client.UIDL;
public class ReservationWidgetSet extends DefaultWidgetSet {
+ @Override
public Paintable createWidget(UIDL uidl) {
final Class type = resolveWidgetType(uidl);
if (IGoogleMap.class == type) {
@@ -22,6 +23,7 @@ public class ReservationWidgetSet extends DefaultWidgetSet { return super.createWidget(uidl);
}
+ @Override
protected Class resolveWidgetType(UIDL uidl) {
final String tag = uidl.getTag();
if ("googlemap".equals(tag)) {
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java index 57ec7e6756..8b82260418 100644 --- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java +++ b/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java @@ -56,6 +56,7 @@ public class ICalendarField extends IDateField { });
}
+ @Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
super.updateFromUIDL(uidl, client);
// We want to draw our own hour list
diff --git a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java b/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java index c5e9f28428..b123bc5105 100644 --- a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java +++ b/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java @@ -42,6 +42,7 @@ public class SimpleReserver extends Application { protected User user; + @Override public void init() { final Window w = new Window("Simple Reserver"); w.addStyleName("simplereserver"); @@ -110,6 +111,7 @@ public class SimpleReserver extends Application { return db; } + @Override public Object getUser() { if (getContext() instanceof PortletApplicationContext) { try { diff --git a/src/com/itmill/toolkit/demo/sampler/ActiveLink.java b/src/com/itmill/toolkit/demo/sampler/ActiveLink.java index 0c55772780..5432e96fc1 100644 --- a/src/com/itmill/toolkit/demo/sampler/ActiveLink.java +++ b/src/com/itmill/toolkit/demo/sampler/ActiveLink.java @@ -33,6 +33,7 @@ public class ActiveLink extends Link { super(caption, resource); } + @Override public String getTag() { return TAG; } @@ -84,6 +85,7 @@ public class ActiveLink extends Link { fireEvent(new LinkActivatedEvent(this, linkOpened)); } + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); @@ -93,6 +95,7 @@ public class ActiveLink extends Link { } } + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); if (!isReadOnly() && variables.containsKey("activated")) { diff --git a/src/com/itmill/toolkit/demo/sampler/CodeLabel.java b/src/com/itmill/toolkit/demo/sampler/CodeLabel.java index 57288f090e..67f8875567 100644 --- a/src/com/itmill/toolkit/demo/sampler/CodeLabel.java +++ b/src/com/itmill/toolkit/demo/sampler/CodeLabel.java @@ -14,10 +14,12 @@ public class CodeLabel extends Label { super(content, CONTENT_PREFORMATTED); } + @Override public String getTag() { return TAG; } + @Override public void setContentMode(int contentMode) { if (contentMode != Label.CONTENT_PREFORMATTED) { throw new UnsupportedOperationException( diff --git a/src/com/itmill/toolkit/demo/sampler/Feature.java b/src/com/itmill/toolkit/demo/sampler/Feature.java index ea8b7a90c7..b62b10c6c1 100644 --- a/src/com/itmill/toolkit/demo/sampler/Feature.java +++ b/src/com/itmill/toolkit/demo/sampler/Feature.java @@ -57,8 +57,8 @@ abstract public class Feature { * May return null, if the example has no related resources. * </p> * <p> - * The name of the NamedExternalResource will be shown in the UI. <br/> Note - * that Javadoc should be referenced via {@link #getRelatedAPI()}. + * The name of the NamedExternalResource will be shown in the UI. <br/> + * Note that Javadoc should be referenced via {@link #getRelatedAPI()}. * </p> * * @see #getThemeBase() @@ -176,6 +176,7 @@ abstract public class Feature { return SamplerApplication.getThemeBase(); } + @Override public String toString() { return getName(); } diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java index 4f99741a4a..3e92e9ec79 100644 --- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java +++ b/src/com/itmill/toolkit/demo/sampler/FeatureSet.java @@ -210,30 +210,37 @@ public class FeatureSet extends Feature { } } + @Override public String getDescription() { return desc; } + @Override public String getPathName() { return pathname; } + @Override public String getName() { return name; } + @Override public String getIconName() { return icon; } + @Override public APIResource[] getRelatedAPI() { return null; } + @Override public Class[] getRelatedFeatures() { return null; } + @Override public NamedExternalResource[] getRelatedResources() { return null; } diff --git a/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java b/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java index 3897dee4a2..ac9760592e 100644 --- a/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java +++ b/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java @@ -21,6 +21,7 @@ public class GoogleAnalytics extends AbstractComponent { this.domainName = domainName; } + @Override public String getTag() { return TAG; } @@ -38,6 +39,7 @@ public class GoogleAnalytics extends AbstractComponent { requestRepaint(); } + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); target.addAttribute("trackerid", trackerId); diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java index 22403efd43..6db2c44318 100644 --- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java +++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java @@ -50,6 +50,7 @@ public class SamplerApplication extends Application { // used when trying to guess theme location private static String APP_URL = null; + @Override public void init() { setTheme("sampler"); setMainWindow(new SamplerWindow()); @@ -72,6 +73,7 @@ public class SamplerApplication extends Application { } // Supports multiple browser windows + @Override public Window getWindow(String name) { /*- REST code, using fragments if (features.getFeatureByPath(name) != null) { diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java index 1f1ed06bbb..aaebc9aa49 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java +++ b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Link; public class ProminentPrimaryAction extends Feature { + @Override public String getDescription() { return "A primary action is an action that is clearly the" + " default, and it should be visually more prominent" @@ -21,15 +22,18 @@ public class ProminentPrimaryAction extends Feature { + " - don't force it if it's not obvious."; } + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Button.class), new APIResource(Link.class) }; } + @Override public Class[] getRelatedFeatures() { return new Class[] { ButtonPush.class, ButtonLink.class }; } + @Override public NamedExternalResource[] getRelatedResources() { return new NamedExternalResource[] { diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java index 7b62c08637..94fb0933ae 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java @@ -12,16 +12,17 @@ import com.itmill.toolkit.ui.Button; public class ButtonLink extends Feature { + @Override public String getDescription() { return "A link-styled button."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Button.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { ButtonPush.class, ButtonSwitch.class, LinkCurrentWindow.class, LinkNoDecorations.class, @@ -29,7 +30,7 @@ public class ButtonLink extends Feature { FeatureSet.Links.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java index f438f7c1da..6988bee270 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java @@ -8,22 +8,23 @@ import com.itmill.toolkit.ui.Button; public class ButtonPush extends Feature { + @Override public String getDescription() { return "A basic push-button."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Button.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { ButtonLink.class, ButtonSwitch.class, ProminentPrimaryAction.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java index aa9163bafb..f3bf7d52fc 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java +++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java @@ -8,22 +8,23 @@ import com.itmill.toolkit.ui.Button; public class ButtonSwitch extends Feature { + @Override public String getDescription() { return "A switch button."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Button.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { ButtonPush.class, ButtonLink.class, ProminentPrimaryAction.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java index 58cb756436..c30fd22c57 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Component; public class Icons extends Feature { - + @Override public String getDescription() { return "Most components can have an <i>icon</i>," + " which is usually displayed next to the caption.<br/>" @@ -16,18 +16,18 @@ public class Icons extends Feature { + " Beware of overuse, which will have the opposite effect."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Component.class) }; } - + @Override public Class[] getRelatedFeatures() { // TODO Auto-generated method stub return null; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java index 0e701e6899..3644424ebc 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java +++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.AbstractComponent; public class Tooltips extends Feature { - + @Override public String getDescription() { return "Most components can have a <i>description</i>," + " which is shown as a <i>\"tooltip\"</i>.<br/>" @@ -18,18 +18,18 @@ public class Tooltips extends Feature { + " for that compoenent.)"; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(AbstractComponent.class) }; } - + @Override public Class[] getRelatedFeatures() { // TODO Auto-generated method stub return null; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java index cdc9ec6023..0e183780a6 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java @@ -8,22 +8,23 @@ import com.itmill.toolkit.ui.Link; public class LinkCurrentWindow extends Feature { + @Override public String getDescription() { return "An external link."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Link.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { LinkNoDecorations.class, LinkSizedWindow.class, ButtonLink.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java index 12a7d3217c..ce1917615d 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java @@ -8,22 +8,23 @@ import com.itmill.toolkit.ui.Link; public class LinkNoDecorations extends Feature { + @Override public String getDescription() { return "A link that opens a new window w/o decorations"; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Link.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { LinkCurrentWindow.class, LinkSizedWindow.class, ButtonLink.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java index 961b4fb0e8..5f044ac660 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java +++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java @@ -8,22 +8,23 @@ import com.itmill.toolkit.ui.Link; public class LinkSizedWindow extends Feature { + @Override public String getDescription() { return "A link that opens a small new window w/o decorations"; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Link.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { LinkCurrentWindow.class, LinkNoDecorations.class, ButtonLink.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { // TODO Auto-generated method stub return null; diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java index e69c6c41d9..f4d2afe3be 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window; public class NotificationCustom extends Feature { - + @Override public String getDescription() { return "Notifications are lightweight informational messages," + " used to inform the user of various events.<br/>" @@ -18,20 +18,20 @@ public class NotificationCustom extends Feature { + " and to the point."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Window.class), new APIResource(Window.Notification.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { NotificationHumanized.class, NotificationWarning.class, NotificationError.class, NotificationTray.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { return new NamedExternalResource[] { new NamedExternalResource( "Monolog Boxes and Transparent Messages", diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java index f914e9af4e..2ca8e6a08a 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window; public class NotificationError extends Feature { - + @Override public String getDescription() { return "Notifications are lightweight informational messages," + " used to inform the user of various events. The" @@ -22,20 +22,20 @@ public class NotificationError extends Feature { + " can proceed to correct the situation."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Window.class), new APIResource(Window.Notification.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { NotificationHumanized.class, NotificationTray.class, NotificationWarning.class, NotificationCustom.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { return null; } diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java index 395fcce385..406cb101b6 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window; public class NotificationHumanized extends Feature { - + @Override public String getDescription() { return "Notifications are lightweight informational messages," + " used to inform the user of various events. The" @@ -23,19 +23,19 @@ public class NotificationHumanized extends Feature { + " safely ignore, once the application is familliar."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Window.class), new APIResource(Window.Notification.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { NotificationTray.class, NotificationWarning.class, NotificationError.class, NotificationCustom.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { return new NamedExternalResource[] { new NamedExternalResource( "Monolog Boxes and Transparent Messages", diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java index ea99f53bd8..f55223fe9c 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window; public class NotificationTray extends Feature { - + @Override public String getDescription() { return "Notifications are lightweight informational messages," + " used to inform the user of various events. The" @@ -23,20 +23,20 @@ public class NotificationTray extends Feature { + " (as opposed to being a direct result of the users last action.)"; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Window.class), new APIResource(Window.Notification.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { NotificationHumanized.class, NotificationWarning.class, NotificationError.class, NotificationCustom.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { return new NamedExternalResource[] { new NamedExternalResource( "Monolog Boxes and Transparent Messages", diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java index 72aa5aee3a..da0f477d0d 100644 --- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java +++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java @@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window; public class NotificationWarning extends Feature { - + @Override public String getDescription() { return "Notifications are lightweight informational messages," + " used to inform the user of various events. The" @@ -23,20 +23,20 @@ public class NotificationWarning extends Feature { + " be made aware of, but are probably intentional."; } - + @Override public APIResource[] getRelatedAPI() { return new APIResource[] { new APIResource(Window.class), new APIResource(Window.Notification.class) }; } - + @Override public Class[] getRelatedFeatures() { return new Class[] { NotificationHumanized.class, NotificationTray.class, NotificationError.class, NotificationCustom.class }; } - + @Override public NamedExternalResource[] getRelatedResources() { return new NamedExternalResource[] { new NamedExternalResource( "Monolog Boxes and Transparent Messages", diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java b/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java index 254e463279..96bcc35ebd 100644 --- a/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java +++ b/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL; public class SamplerWidgetSet extends DefaultWidgetSet { + @Override public Paintable createWidget(UIDL uidl) { final Class classType = resolveWidgetType(uidl); if (IGoogleAnalytics.class == classType) { @@ -22,6 +23,7 @@ public class SamplerWidgetSet extends DefaultWidgetSet { } } + @Override protected Class resolveWidgetType(UIDL uidl) { final String tag = uidl.getTag(); if ("googleanalytics".equals(tag)) { diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java index 782270c0d0..b292c38bce 100644 --- a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java +++ b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java @@ -61,6 +61,7 @@ public class IActiveLink extends ILink { return !listening || opened; } + @Override public void onClick(Widget sender) { if (sendVariables()) { @@ -69,6 +70,7 @@ public class IActiveLink extends ILink { } } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { // Ensure correct implementation, // but don't let container manage caption etc. diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java index 6e7ec6fa58..ace6e3558b 100644 --- a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java +++ b/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java @@ -11,6 +11,7 @@ public class ICodeLabel extends ILabel { super(); } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { super.updateFromUIDL(uidl, client); Element pre = getElement().getFirstChildElement(); |