diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-01-02 14:40:19 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-01-02 14:40:19 +0000 |
| commit | d9a13c237889ba32830edb27ad34c4d9ea2f180b (patch) | |
| tree | d1bda61bf6de5b5b3724eb99f2618861fb45abcb /src | |
| parent | 19636fc0509e45d3bcedf4d7ba92670fdea4630d (diff) | |
| download | vaadin-framework-d9a13c237889ba32830edb27ad34c4d9ea2f180b.tar.gz vaadin-framework-d9a13c237889ba32830edb27ad34c4d9ea2f180b.zip | |
Cleaned up the whole project
svn changeset:6398/svn branch:trunk
Diffstat (limited to 'src')
354 files changed, 1269 insertions, 420 deletions
diff --git a/src/com/itmill/toolkit/automatedtests/SimplestApplication.java b/src/com/itmill/toolkit/automatedtests/SimplestApplication.java index a81e1daa1a..01f3990bd2 100644 --- a/src/com/itmill/toolkit/automatedtests/SimplestApplication.java +++ b/src/com/itmill/toolkit/automatedtests/SimplestApplication.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window; public class SimplestApplication extends com.itmill.toolkit.Application { + @Override public void init() { final Window main = new Window("Simplest Application window"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java b/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java index c8034e2677..14026aecd1 100644 --- a/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java +++ b/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java @@ -33,6 +33,7 @@ public abstract class Robustness extends com.itmill.toolkit.Application RandomComponents randomComponents = new RandomComponents(); + @Override public void init() { createNewView(); } @@ -61,9 +62,9 @@ public abstract class Robustness extends com.itmill.toolkit.Application } public void buttonClick(ClickEvent event) { - if (event.getButton() == create) + if (event.getButton() == create) { create(); - else if (event.getButton() == remove) { + } else if (event.getButton() == remove) { main.removeAllComponents(); close.removeListener(this); remove.removeListener(this); diff --git a/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java b/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java index 4f9325693d..1770cdd141 100644 --- a/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java +++ b/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java @@ -14,13 +14,15 @@ public class RobustnessComplex extends Robustness implements /** * Create complex layouts with components and listeners. */ + @Override public void create() { count++; // remove old stressLayout, all dependant components should be now // allowed for garbage collection. - if (stressLayout != null) + if (stressLayout != null) { main.removeComponent(stressLayout); + } // create new stress layout stressLayout = randomComponents diff --git a/src/com/itmill/toolkit/automatedtests/util/Log.java b/src/com/itmill/toolkit/automatedtests/util/Log.java index 43c0efe9df..8d113e0fe5 100644 --- a/src/com/itmill/toolkit/automatedtests/util/Log.java +++ b/src/com/itmill/toolkit/automatedtests/util/Log.java @@ -68,10 +68,11 @@ public class Log { String clazz = st[3].getClassName() + ".java"; key = "(" + clazz + ":" + line + ")" + " " + methodName; Integer value = (Integer) classMethodCallCounter.get(key); - if (value == null) + if (value == null) { value = new Integer(1); - else + } else { value = new Integer(value.intValue() + 1); + } classMethodCallCounter.put(key, value); return value.intValue() + ": " + key; } catch (Exception e) { @@ -93,10 +94,11 @@ public class Log { public void add(int type, String message) { String source = getSource(); if (type >= debug) { - if (showClassInformation) + if (showClassInformation) { System.out.println(source + ": " + message); - else + } else { System.out.println(message); + } } } diff --git a/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java b/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java index e13102ea73..9912b23d1b 100644 --- a/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java +++ b/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java @@ -55,11 +55,13 @@ public class StatusServlet extends HttpServlet { VERSION_BUILD = digits[2]; } + @Override public void init(javax.servlet.ServletConfig servletConfig) throws javax.servlet.ServletException { super.init(servletConfig); } + @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { Writer w = response.getWriter(); @@ -72,8 +74,9 @@ public class StatusServlet extends HttpServlet { String p = ""; p += "<p>StatusServlet " + dfHuman.format(new Date()) + "</p>"; - for (int i = 0; i < 30; i++) + for (int i = 0; i < 30; i++) { System.gc(); + } long inUse = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime() .freeMemory()); p += "<p>Memory:<br />\n<memused>" + inUse diff --git a/src/com/itmill/toolkit/data/Buffered.java b/src/com/itmill/toolkit/data/Buffered.java index fde5ca03d3..8fd9b1c5be 100644 --- a/src/com/itmill/toolkit/data/Buffered.java +++ b/src/com/itmill/toolkit/data/Buffered.java @@ -198,6 +198,7 @@ public interface Buffered { * is possible if the commit operation triggers more than * one error at the same time. */ + @Override public final Throwable getCause() { if (causes.length == 0) { return null; diff --git a/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java b/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java index a07d4041f7..91dd00fc46 100644 --- a/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java +++ b/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java @@ -440,8 +440,9 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, public Item addItem(Object itemId) throws UnsupportedOperationException { // Null ids are not accepted - if (itemId == null) + if (itemId == null) { throw new NullPointerException("Container item id can not be null"); + } final Item item = container.addItem(itemId); if (!hierarchical && item != null) { @@ -672,10 +673,12 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, } + @Override public boolean equals(Object obj) { return obj == listener || (obj != null && obj.equals(listener)); } + @Override public int hashCode() { return listener.hashCode(); } diff --git a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java index 1753a051c9..c9e5736b9a 100644 --- a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java +++ b/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java @@ -588,10 +588,12 @@ public class ContainerOrderedWrapper implements Container.Ordered, } + @Override public boolean equals(Object obj) { return obj == listener || (obj != null && obj.equals(listener)); } + @Override public int hashCode() { return listener.hashCode(); } diff --git a/src/com/itmill/toolkit/data/util/FilesystemContainer.java b/src/com/itmill/toolkit/data/util/FilesystemContainer.java index 5ede26cc4f..f1d5273003 100644 --- a/src/com/itmill/toolkit/data/util/FilesystemContainer.java +++ b/src/com/itmill/toolkit/data/util/FilesystemContainer.java @@ -628,6 +628,7 @@ public class FilesystemContainer implements Container.Hierarchical { * * @return A locally unique hash-code as integer */ + @Override public int hashCode() { return file.hashCode() ^ FilesystemContainer.this.hashCode(); } @@ -641,6 +642,7 @@ public class FilesystemContainer implements Container.Hierarchical { * @return <code>true</code> if the given object is the same as this * object, <code>false</code> if not */ + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof FileItem)) { return false; @@ -698,6 +700,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * @see java.lang.Object#toString() */ + @Override public String toString() { if ("".equals(file.getName())) { return file.getAbsolutePath(); diff --git a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java index 4af097e5bb..c702c14795 100644 --- a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java +++ b/src/com/itmill/toolkit/data/util/HierarchicalContainer.java @@ -237,6 +237,7 @@ public class HierarchicalContainer extends IndexedContainer implements * * @see com.itmill.toolkit.data.util.IndexedContainer#addItem() */ + @Override public Object addItem() { final Object id = super.addItem(); if (id != null && !roots.contains(id)) { @@ -252,6 +253,7 @@ public class HierarchicalContainer extends IndexedContainer implements * @see * com.itmill.toolkit.data.util.IndexedContainer#addItem(java.lang.Object) */ + @Override public Item addItem(Object itemId) { final Item item = super.addItem(itemId); if (item != null) { @@ -265,6 +267,7 @@ public class HierarchicalContainer extends IndexedContainer implements * * @see com.itmill.toolkit.data.util.IndexedContainer#removeAllItems() */ + @Override public boolean removeAllItems() { final boolean success = super.removeAllItems(); @@ -284,6 +287,7 @@ public class HierarchicalContainer extends IndexedContainer implements * com.itmill.toolkit.data.util.IndexedContainer#removeItem(java.lang.Object * ) */ + @Override public boolean removeItem(Object itemId) { final boolean success = super.removeItem(itemId); diff --git a/src/com/itmill/toolkit/data/util/IndexedContainer.java b/src/com/itmill/toolkit/data/util/IndexedContainer.java index bf08158ee0..eca382d91c 100644 --- a/src/com/itmill/toolkit/data/util/IndexedContainer.java +++ b/src/com/itmill/toolkit/data/util/IndexedContainer.java @@ -1116,6 +1116,7 @@ public class IndexedContainer implements Container, Container.Indexed, * * @return <code>String</code> representation of the Item contents */ + @Override public String toString() { String retValue = ""; @@ -1138,6 +1139,7 @@ public class IndexedContainer implements Container, Container.Indexed, * * @return A locally unique hash-code as integer */ + @Override public int hashCode() { return itemId.hashCode(); } @@ -1151,6 +1153,7 @@ public class IndexedContainer implements Container, Container.Indexed, * @return <code>true</code> if the given object is the same as this * object, <code>false</code> if not */ + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().equals(IndexedContainerItem.class)) { @@ -1347,6 +1350,7 @@ public class IndexedContainer implements Container, Container.Indexed, * @return <code>String</code> representation of the value stored in the * Property */ + @Override public String toString() { final Object value = getValue(); if (value == null) { @@ -1364,6 +1368,7 @@ public class IndexedContainer implements Container, Container.Indexed, * * @return A locally unique hash-code as integer */ + @Override public int hashCode() { return itemId.hashCode() ^ propertyId.hashCode(); } @@ -1377,6 +1382,7 @@ public class IndexedContainer implements Container, Container.Indexed, * @return <code>true</code> if the given object is the same as this * object, <code>false</code> if not */ + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().equals(IndexedContainerProperty.class)) { @@ -1533,6 +1539,7 @@ public class IndexedContainer implements Container, Container.Indexed, * @throws CloneNotSupportedException * if an object cannot be cloned. . */ + @Override public Object clone() throws CloneNotSupportedException { // Creates the clone @@ -1589,6 +1596,7 @@ public class IndexedContainer implements Container, Container.Indexed, * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { return super.equals(obj); } @@ -1608,6 +1616,7 @@ public class IndexedContainer implements Container, Container.Indexed, this.onlyMatchPrefix = onlyMatchPrefix; } + @Override public boolean equals(Object obj) { // Only ones of the objects of the same class can be equal @@ -1635,6 +1644,7 @@ public class IndexedContainer implements Container, Container.Indexed, return true; } + @Override public int hashCode() { return (propertyId != null ? propertyId.hashCode() : 0) ^ (filterString != null ? filterString.hashCode() : 0); diff --git a/src/com/itmill/toolkit/data/util/MethodProperty.java b/src/com/itmill/toolkit/data/util/MethodProperty.java index 45a3e53a4e..165d54c902 100644 --- a/src/com/itmill/toolkit/data/util/MethodProperty.java +++ b/src/com/itmill/toolkit/data/util/MethodProperty.java @@ -559,6 +559,7 @@ public class MethodProperty implements Property, Property.ValueChangeNotifier, * * @return String representation of the value stored in the Property */ + @Override public String toString() { final Object value = getValue(); if (value == null) { @@ -734,6 +735,7 @@ public class MethodProperty implements Property, Property.ValueChangeNotifier, /** * @see java.lang.Throwable#getCause() */ + @Override public Throwable getCause() { return cause; } diff --git a/src/com/itmill/toolkit/data/util/ObjectProperty.java b/src/com/itmill/toolkit/data/util/ObjectProperty.java index c89d1f5cc9..1821a815ed 100644 --- a/src/com/itmill/toolkit/data/util/ObjectProperty.java +++ b/src/com/itmill/toolkit/data/util/ObjectProperty.java @@ -122,6 +122,7 @@ public class ObjectProperty implements Property, Property.ValueChangeNotifier, * @return <code>String</code> representation of the value stored in the * ObjectProperty */ + @Override public String toString() { final Object value = getValue(); if (value != null) { diff --git a/src/com/itmill/toolkit/data/util/PropertyFormatter.java b/src/com/itmill/toolkit/data/util/PropertyFormatter.java index 62f793213f..c6454a7f47 100644 --- a/src/com/itmill/toolkit/data/util/PropertyFormatter.java +++ b/src/com/itmill/toolkit/data/util/PropertyFormatter.java @@ -143,6 +143,7 @@ public abstract class PropertyFormatter implements Property, * @return If the datasource returns null, this is null. Otherwise this is * String given by format(). */ + @Override public String toString() { Object value = dataSource == null ? false : dataSource.getValue(); if (value == null) { diff --git a/src/com/itmill/toolkit/data/util/PropertysetItem.java b/src/com/itmill/toolkit/data/util/PropertysetItem.java index fd60121ebc..dfc819ca7e 100644 --- a/src/com/itmill/toolkit/data/util/PropertysetItem.java +++ b/src/com/itmill/toolkit/data/util/PropertysetItem.java @@ -109,8 +109,9 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, public boolean addItemProperty(Object id, Property property) { // Null ids are not accepted - if (id == null) + if (id == null) { throw new NullPointerException("Item property id can not be null"); + } // Cant add a property twice if (map.containsKey(id)) { @@ -135,6 +136,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * * @return <code>String</code> representation of the Item contents */ + @Override public String toString() { String retValue = ""; @@ -243,6 +245,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * * @see java.lang.Object#clone() */ + @Override public Object clone() throws CloneNotSupportedException { final PropertysetItem npsi = new PropertysetItem(); @@ -267,6 +270,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * otherwise <code>false</code>. * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof PropertysetItem)) { @@ -310,6 +314,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * @return the hash code value. * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return (list == null ? 0 : list.hashCode()) diff --git a/src/com/itmill/toolkit/data/util/QueryContainer.java b/src/com/itmill/toolkit/data/util/QueryContainer.java index b22064dbdb..2c76e58702 100644 --- a/src/com/itmill/toolkit/data/util/QueryContainer.java +++ b/src/com/itmill/toolkit/data/util/QueryContainer.java @@ -562,6 +562,7 @@ public class QueryContainer implements Container, Container.Ordered, * * @see #close() */ + @Override public void finalize() { try { close(); 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(); diff --git a/src/com/itmill/toolkit/event/ListenerMethod.java b/src/com/itmill/toolkit/event/ListenerMethod.java index 03d54ad38a..1984dd8380 100644 --- a/src/com/itmill/toolkit/event/ListenerMethod.java +++ b/src/com/itmill/toolkit/event/ListenerMethod.java @@ -475,6 +475,7 @@ public class ListenerMethod implements EventListener { .equals(this.method)); } + @Override public int hashCode() { int hash = 7; @@ -486,6 +487,7 @@ public class ListenerMethod implements EventListener { return hash; } + @Override public boolean equals(Object obj) { if (this == obj) { @@ -546,6 +548,7 @@ public class ListenerMethod implements EventListener { * is nonexistent or unknown. * @see java.lang.Throwable#getCause() */ + @Override public Throwable getCause() { return cause; } @@ -556,6 +559,7 @@ public class ListenerMethod implements EventListener { * @return the error message. * @see java.lang.Throwable#getMessage() */ + @Override public String getMessage() { return message; } @@ -563,6 +567,7 @@ public class ListenerMethod implements EventListener { /** * @see java.lang.Throwable#toString() */ + @Override public String toString() { String msg = super.toString(); if (cause != null) { diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java index 80ccf42449..7062342944 100644 --- a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java +++ b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java @@ -99,6 +99,7 @@ public class ITMillToolkitDesktopMode { + "</a><br>Close this window to shutdown the server.</center>" + "</html>"); link.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { BrowserLauncher.openBrowser(applicationUrl); } @@ -136,6 +137,7 @@ public class ITMillToolkitDesktopMode { cancelButton.addActionListener(buttonListener); frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { final Rectangle bounds = frame.getBounds(); frame.setTitle("Confirm close"); diff --git a/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java b/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java index 4ae769e90b..47a50b1e26 100644 --- a/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java +++ b/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java @@ -159,6 +159,7 @@ public class CompositeErrorMessage implements ErrorMessage { * * @return String, comma separated list of error messages. */ + @Override public String toString() { String retval = "["; int pos = 0; diff --git a/src/com/itmill/toolkit/terminal/Sizeable.java b/src/com/itmill/toolkit/terminal/Sizeable.java index e0ec15684f..df0c5305a9 100644 --- a/src/com/itmill/toolkit/terminal/Sizeable.java +++ b/src/com/itmill/toolkit/terminal/Sizeable.java @@ -110,6 +110,7 @@ public interface Sizeable { * separately (and components might have different default * unit). */ + @Deprecated public void setWidth(float width); /** @@ -132,6 +133,7 @@ public interface Sizeable { * but is error-prone since the unit must be set separately (and * components might have different default unit). */ + @Deprecated public void setHeight(float height); /** @@ -150,6 +152,7 @@ public interface Sizeable { * {@link #setWidth(String)} or {@link #setWidth(float, int)}, * which is less error-prone. */ + @Deprecated public void setWidthUnits(int units); /** @@ -168,6 +171,7 @@ public interface Sizeable { * {@link #setHeight(String)} or {@link #setHeight(float, int)}, * which is less error-prone. */ + @Deprecated public void setHeightUnits(int units); /** diff --git a/src/com/itmill/toolkit/terminal/SystemError.java b/src/com/itmill/toolkit/terminal/SystemError.java index 019f8c2521..b5d2fae5d0 100644 --- a/src/com/itmill/toolkit/terminal/SystemError.java +++ b/src/com/itmill/toolkit/terminal/SystemError.java @@ -103,6 +103,7 @@ public class SystemError extends RuntimeException implements ErrorMessage { * @return the cause. * @see java.lang.Throwable#getCause() */ + @Override public Throwable getCause() { return cause; } diff --git a/src/com/itmill/toolkit/terminal/ThemeResource.java b/src/com/itmill/toolkit/terminal/ThemeResource.java index bdce49a521..809f5a2bc8 100644 --- a/src/com/itmill/toolkit/terminal/ThemeResource.java +++ b/src/com/itmill/toolkit/terminal/ThemeResource.java @@ -54,6 +54,7 @@ public class ThemeResource implements Resource { * <code>false</code> if not. * @see java.lang.Object#equals(Object) */ + @Override public boolean equals(Object obj) { return obj instanceof ThemeResource && resourceID.equals(((ThemeResource) obj).resourceID); @@ -62,6 +63,7 @@ public class ThemeResource implements Resource { /** * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return resourceID.hashCode(); } @@ -69,6 +71,7 @@ public class ThemeResource implements Resource { /** * @see java.lang.Object#toString() */ + @Override public String toString() { return resourceID.toString(); } diff --git a/src/com/itmill/toolkit/terminal/UserError.java b/src/com/itmill/toolkit/terminal/UserError.java index 1443d812f5..92b33e4f8b 100644 --- a/src/com/itmill/toolkit/terminal/UserError.java +++ b/src/com/itmill/toolkit/terminal/UserError.java @@ -136,6 +136,7 @@ public class UserError implements ErrorMessage { } /* Documented in superclass */ + @Override public String toString() { return msg; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java index 729164fea5..e0b39d4997 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java @@ -249,6 +249,7 @@ public class DefaultWidgetSet implements WidgetSet { * * @deprecated use resolveWidgetType instead */ + @Deprecated protected String resolveWidgetTypeName(UIDL uidl) { Class type = resolveWidgetType(uidl); return type.getName(); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java b/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java index 55a4526b3c..b4577d14f7 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java @@ -188,6 +188,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console { } }; + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); switch (DOM.eventGetType(event)) { @@ -280,6 +281,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console { .getClientHeight() - 160); } + @Override public void setPixelSize(int width, int height) { panel.setHeight((height - 20) + "px"); panel.setWidth((width - 2) + "px"); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java b/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java index 8d91863090..68357bb70a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java @@ -64,6 +64,7 @@ public class MouseEventDetails { private MouseEventDetails() { } + @Override public String toString() { return "" + button + DELIM + clientX + DELIM + clientY + DELIM + altKey + DELIM + ctrlKey + DELIM + metaKey + DELIM + shiftKey + DELIM diff --git a/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java b/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java index 9e16f16e9e..668f16ad17 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java @@ -27,6 +27,7 @@ public class RenderSpace extends Size { * Returns pixels available vertically for contained widget, including * possible scrollbars. */ + @Override public int getHeight() { return super.getHeight(); } @@ -35,6 +36,7 @@ public class RenderSpace extends Size { * Returns pixels available horizontally for contained widget, including * possible scrollbars. */ + @Override public int getWidth() { return super.getWidth(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java b/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java index 73a13c130e..fb9c989afd 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java @@ -200,6 +200,7 @@ public class UIDL { return json.size() - 2; } + @Override public String toString() { String s = "<" + getTag(); @@ -270,6 +271,7 @@ public class UIDL { } + @Override protected boolean isKeyboardNavigationEnabled(TreeItem currentItem) { return false; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Util.java b/src/com/itmill/toolkit/terminal/gwt/client/Util.java index 7c13ce7d76..d9ec666655 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/Util.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/Util.java @@ -41,6 +41,7 @@ public class Util { private static Timer lazySizeChangeTimer = new Timer() { private boolean lazySizeChangeTimerScheduled = false; + @Override public void run() { componentSizeUpdated(latelyChangedWidgets); latelyChangedWidgets.clear(); @@ -167,6 +168,7 @@ public class Util { * * @return true if IE */ + @Deprecated public static boolean isIE() { return BrowserInfo.get().isIE(); } @@ -178,6 +180,7 @@ public class Util { * * @return true if IE6 */ + @Deprecated public static boolean isIE6() { return BrowserInfo.get().isIE6(); } @@ -186,6 +189,7 @@ public class Util { * @deprecated use BrowserInfo class instead * @return */ + @Deprecated public static boolean isIE7() { return BrowserInfo.get().isIE7(); } @@ -194,6 +198,7 @@ public class Util { * @deprecated use BrowserInfo class instead * @return */ + @Deprecated public static boolean isFF2() { return BrowserInfo.get().isFF2(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java index 6a7ad121bb..a97787218f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java @@ -55,6 +55,7 @@ public class IAccordion extends ITabsheetBase implements } } + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { rendering = true; selectedUIDLItemIndex = -1; @@ -89,6 +90,7 @@ public class IAccordion extends ITabsheetBase implements rendering = false; } + @Override protected void renderTab(UIDL tabUidl, int index, boolean selected, boolean hidden) { StackItem item; @@ -153,6 +155,7 @@ public class IAccordion extends ITabsheetBase implements } + @Override protected void selectTab(final int index, final UIDL contentUidl) { StackItem item = stack.get(index); if (index != activeTabIndex) { @@ -176,6 +179,7 @@ public class IAccordion extends ITabsheetBase implements } } + @Override public void setWidth(String width) { if (this.width.equals(width)) { return; @@ -199,6 +203,7 @@ public class IAccordion extends ITabsheetBase implements } } + @Override public void setHeight(String height) { super.setHeight(height); this.height = height; @@ -303,6 +308,7 @@ public class IAccordion extends ITabsheetBase implements } } + @Override public void setVisible(boolean visible) { super.setVisible(visible); } @@ -377,6 +383,7 @@ public class IAccordion extends ITabsheetBase implements updateCaption(tabUidl); } + @Override public void onBrowserEvent(Event event) { onSelectTab(this); } @@ -471,6 +478,7 @@ public class IAccordion extends ITabsheetBase implements } + @Override protected void clearPaintables() { stack.clear(); clear(); @@ -484,6 +492,7 @@ public class IAccordion extends ITabsheetBase implements return width == null || width.equals(""); } + @Override protected Iterator getPaintableIterator() { return paintables.iterator(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java index 5fee01b5ff..411e646a0c 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java @@ -95,6 +95,7 @@ public class IContextMenu extends IToolkitOverlay { super(true); } + @Override public void onPopupClosed(PopupPanel sender, boolean autoClosed) { super.onPopupClosed(sender, autoClosed); hide(); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java index e9f910048c..e045d3a402 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java @@ -54,6 +54,7 @@ public class IDateField extends FlowPanel implements Paintable, Field { sinkEvents(ITooltip.TOOLTIP_EVENTS);
}
+ @Override
public void onBrowserEvent(Event event) {
super.onBrowserEvent(event);
if (client != null) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java index e9474a97f4..50ab226a53 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java @@ -17,6 +17,7 @@ public class IDateFieldCalendar extends IDateField { add(date);
}
+ @Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
super.updateFromUIDL(uidl, client);
date.updateCalendar();
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java index dc8e9c4343..16930255de 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java @@ -111,6 +111,7 @@ public class IEmbedded extends HTML implements Paintable { return url; } + @Override public void setWidth(String width) { this.width = width; if (isDynamicHeight()) { @@ -134,11 +135,13 @@ public class IEmbedded extends HTML implements Paintable { return height == null || height.equals(""); } + @Override public void setHeight(String height) { this.height = height; super.setHeight(height); } + @Override protected void onDetach() { // Force browser to fire unload event when component is detached from // the view (IE doesn't do this automatically) @@ -148,6 +151,7 @@ public class IEmbedded extends HTML implements Paintable { super.onDetach(); } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (DOM.eventGetType(event) == Event.ONLOAD) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 69e24e844a..2644077e9f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -930,7 +930,8 @@ public class IFilterSelect extends Composite implements Paintable, Field, public int getTextboxPadding() { if (textboxPadding < 0) { - textboxPadding = Util.measureHorizontalPaddingAndBorder(tb.getElement(), 4); + textboxPadding = Util.measureHorizontalPaddingAndBorder(tb + .getElement(), 4); } return textboxPadding; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java index 0b204515c1..65f639e0a8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java @@ -347,6 +347,7 @@ public class IFormLayout extends SimplePanel implements Container { return owner; } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (client != null) { @@ -383,6 +384,7 @@ public class IFormLayout extends SimplePanel implements Container { } } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (owner != null) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java index 77addf8323..20e529dfd3 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java @@ -34,6 +34,7 @@ public class ILabel extends HTML implements Paintable { sinkEvents(ITooltip.TOOLTIP_EVENTS); } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (event.getTypeInt() == Event.ONLOAD) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java index 7bc4863dfb..8d1214fbdb 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java @@ -35,6 +35,7 @@ public class IListSelect extends IOptionGroupBase { select.setVisibleItemCount(VISIBLE_COUNT); } + @Override protected void buildOptions(UIDL uidl) { select.setClient(client); select.setMultipleSelect(isMultiselect()); @@ -58,6 +59,7 @@ public class IListSelect extends IOptionGroupBase { } } + @Override protected Object[] getSelectedItems() { final Vector selectedItemKeys = new Vector(); for (int i = 0; i < select.getItemCount(); i++) { @@ -68,6 +70,7 @@ public class IListSelect extends IOptionGroupBase { return selectedItemKeys.toArray(); } + @Override public void onChange(Widget sender) { final int si = select.getSelectedIndex(); if (si == -1 && !isNullSelectionAllowed()) { @@ -84,16 +87,19 @@ public class IListSelect extends IOptionGroupBase { } } + @Override public void setHeight(String height) { select.setHeight(height); super.setHeight(height); } + @Override public void setWidth(String width) { select.setWidth(width); super.setWidth(width); } + @Override protected void setTabIndex(int tabIndex) { ((TooltipListBox) optionsContainer).setTabIndex(tabIndex); } @@ -125,6 +131,7 @@ class TooltipListBox extends ListBox { pntbl = s; } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (client != null) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java index dde94d76a3..725659c916 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java @@ -61,6 +61,7 @@ public class IMarginInfo { } } + @Override public boolean equals(Object obj) { if (!(obj instanceof IMarginInfo)) { return false; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java index 61e5c2175f..2b4e1ea425 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java @@ -67,7 +67,7 @@ public class IMenuBar extends Widget implements Paintable, PopupListener { Element table = DOM.createTable(); Element tbody = DOM.createTBody(); - DOM.appendChild(this.getElement(), table); + DOM.appendChild(getElement(), table); DOM.appendChild(table, tbody); if (!subMenu) { @@ -103,8 +103,8 @@ public class IMenuBar extends Widget implements Paintable, PopupListener { uidlId = uidl.getId(); // Empty the menu every time it receives new information - if (!this.getItems().isEmpty()) { - this.clearItems(); + if (!getItems().isEmpty()) { + clearItems(); } UIDL options = uidl.getChildUIDL(0); @@ -199,7 +199,7 @@ public class IMenuBar extends Widget implements Paintable, PopupListener { if (collapseItems) { int topLevelWidth = 0; - int ourWidth = this.getOffsetWidth(); + int ourWidth = getOffsetWidth(); int i = 0; for (; i < getItems().size() && topLevelWidth < ourWidth; i++) { @@ -207,7 +207,7 @@ public class IMenuBar extends Widget implements Paintable, PopupListener { topLevelWidth += item.getOffsetWidth(); } - if (topLevelWidth > this.getOffsetWidth()) { + if (topLevelWidth > getOffsetWidth()) { ArrayList toBeCollapsed = new ArrayList(); IMenuBar collapsed = new IMenuBar(true); for (int j = i - 2; j < getItems().size(); j++) { @@ -345,6 +345,7 @@ public class IMenuBar extends Widget implements Paintable, PopupListener { * com.google.gwt.user.client.ui.Widget#onBrowserEvent(com.google.gwt.user * .client.Event) */ + @Override public void onBrowserEvent(Event e) { super.onBrowserEvent(e); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java index 8cb8d6ca61..536ed15de6 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java @@ -26,6 +26,7 @@ public class INativeSelect extends IOptionGroupBase implements Field { } + @Override protected void buildOptions(UIDL uidl) { select.setClient(client); select.setEnabled(!isDisabled() && !isReadonly()); @@ -53,6 +54,7 @@ public class INativeSelect extends IOptionGroupBase implements Field { } + @Override protected Object[] getSelectedItems() { final Vector selectedItemKeys = new Vector(); for (int i = 0; i < select.getItemCount(); i++) { @@ -63,6 +65,7 @@ public class INativeSelect extends IOptionGroupBase implements Field { return selectedItemKeys.toArray(); } + @Override public void onChange(Widget sender) { if (select.isMultipleSelect()) { @@ -78,16 +81,19 @@ public class INativeSelect extends IOptionGroupBase implements Field { } } + @Override public void setHeight(String height) { select.setHeight(height); super.setHeight(height); } + @Override public void setWidth(String width) { select.setWidth(width); super.setWidth(width); } + @Override protected void setTabIndex(int tabIndex) { ((TooltipListBox) optionsContainer).setTabIndex(tabIndex); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java index c737a52e95..88b7b36bdc 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java @@ -32,6 +32,7 @@ public class IOptionGroup extends IOptionGroupBase { /*
* Return true if no elements were changed, false otherwise.
*/
+ @Override
protected void buildOptions(UIDL uidl) {
panel.clear();
for (final Iterator it = uidl.getChildIterator(); it.hasNext();) {
@@ -54,10 +55,12 @@ public class IOptionGroup extends IOptionGroupBase { }
}
+ @Override
protected Object[] getSelectedItems() {
return selectedKeys.toArray();
}
+ @Override
public void onClick(Widget sender) {
super.onClick(sender);
if (sender instanceof CheckBox) {
@@ -76,6 +79,7 @@ public class IOptionGroup extends IOptionGroupBase { }
}
+ @Override
protected void setTabIndex(int tabIndex) {
for (Iterator iterator = panel.iterator(); iterator.hasNext();) {
if (isMultiselect()) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java index 04e90dfaa2..c47518f6ea 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java @@ -207,6 +207,7 @@ public class IPopupView extends HTML implements Paintable { // For some reason ONMOUSEOUT events are not always recieved, so we have // to use ONMOUSEMOVE that doesn't target the popup + @Override public boolean onEventPreview(Event event) { Element target = DOM.eventGetTarget(event); @@ -234,6 +235,7 @@ public class IPopupView extends HTML implements Paintable { return super.onEventPreview(event); } + @Override public void hide() { // Notify children with focus if ((popupComponentWidget instanceof HasFocus)) { @@ -251,6 +253,7 @@ public class IPopupView extends HTML implements Paintable { super.hide(); } + @Override public boolean remove(Widget w) { unregisterPaintables(); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java index 77465f3304..0567ec4012 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java @@ -68,6 +68,7 @@ public class IProgressIndicator extends Widget implements Paintable { } } + @Override protected void onAttach() { super.onAttach(); if (pollerSuspendedDueDetach) { @@ -75,12 +76,14 @@ public class IProgressIndicator extends Widget implements Paintable { } } + @Override protected void onDetach() { super.onDetach(); poller.cancel(); pollerSuspendedDueDetach = true; } + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (!visible) { @@ -90,6 +93,7 @@ public class IProgressIndicator extends Widget implements Paintable { class Poller extends Timer { + @Override public void run() { client.sendPendingVariableChanges(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java index 90bd763f79..4a2b389db2 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java @@ -316,6 +316,7 @@ public class ITablePaging extends Composite implements Table, Paintable, setWidget(new Label(textContent)); } + @Override public void onBrowserEvent(Event event) { System.out.println("CEll event: " + event.toString()); switch (DOM.eventGetType(event)) { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java index 9f268b3689..a21d1b7d98 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java @@ -8,7 +8,6 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.ComplexPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
import com.itmill.toolkit.terminal.gwt.client.Util;
/**
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java index 7a90f5e1ab..6c51b33b67 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java @@ -48,6 +48,7 @@ public class ITextualDate extends IDateField implements Paintable, Field, add(text);
}
+ @Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
int origRes = currentResolution;
@@ -235,6 +236,7 @@ public class ITextualDate extends IDateField implements Paintable, Field, return format.trim();
}
+ @Override
public void setWidth(String newWidth) {
if (!"".equals(newWidth) && (width == null || !newWidth.equals(width))) {
if (BrowserInfo.get().isIE6()) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java index c5aca05a03..30cf86c9c8 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java @@ -66,6 +66,7 @@ public class ITwinColSelect extends IOptionGroupBase { panel.add(selections);
}
+ @Override
protected void buildOptions(UIDL uidl) {
final boolean enabled = !isDisabled() && !isReadonly();
options.setMultipleSelect(isMultiselect());
@@ -108,6 +109,7 @@ public class ITwinColSelect extends IOptionGroupBase { }
+ @Override
protected Object[] getSelectedItems() {
final Vector selectedItemKeys = new Vector();
for (int i = 0; i < selections.getItemCount(); i++) {
@@ -140,6 +142,7 @@ public class ITwinColSelect extends IOptionGroupBase { return selectedIndexes;
}
+ @Override
public void onClick(Widget sender) {
super.onClick(sender);
if (sender == add) {
@@ -195,6 +198,7 @@ public class ITwinColSelect extends IOptionGroupBase { }
}
+ @Override
public void setHeight(String height) {
super.setHeight(height);
if ("".equals(height)) {
@@ -210,6 +214,7 @@ public class ITwinColSelect extends IOptionGroupBase { selections.setHeight("100%");
}
+ @Override
public void setWidth(String width) {
super.setWidth(width);
if (!"".equals(width) && width != null) {
@@ -225,6 +230,7 @@ public class ITwinColSelect extends IOptionGroupBase { widthSet = true;
}
+ @Override
protected void setTabIndex(int tabIndex) {
options.setTabIndex(tabIndex);
selections.setTabIndex(tabIndex);
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java index 84707dec69..e70009de67 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java @@ -117,6 +117,7 @@ public class IUpload extends FormPanel implements Paintable, ClickListener, * changes from UploadStarted event. Will be cleared on complete. */ t = new Timer() { + @Override public void run() { client.sendPendingVariableChanges(); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java index dd2f868816..1fb3e3c991 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java @@ -53,6 +53,7 @@ import com.google.gwt.user.client.ui.Widget; * * @deprecated */ +@Deprecated public class MenuBar extends Widget implements PopupListener { private final Element body; @@ -210,6 +211,7 @@ public class MenuBar extends Widget implements PopupListener { return autoOpen; } + @Override public void onBrowserEvent(Event event) { super.onBrowserEvent(event); @@ -304,6 +306,7 @@ public class MenuBar extends Widget implements PopupListener { return selectedItem; } + @Override protected void onDetach() { // When the menu is detached, make sure to close all of its children. if (popup != null) { @@ -379,6 +382,7 @@ public class MenuBar extends Widget implements PopupListener { item.getSubMenu().onShow(); } + @Override public boolean onEventPreview(Event event) { // Hook the popup panel's event preview. We use this to keep it // from diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java index 35bd209825..d12052a802 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java @@ -34,6 +34,7 @@ import com.google.gwt.user.client.ui.UIObject; * * @deprecated */ +@Deprecated public class MenuItem extends UIObject implements HasHTML { private static final String DEPENDENT_STYLENAME_SELECTED_ITEM = "selected"; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java index 4ecc477a3e..5ecf2aced5 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java @@ -31,6 +31,7 @@ public class TreeAction extends Action { * * Actions are always sent immediatedly to server. */ + @Override public void execute() { owner.getClient().updateVariable(owner.getPaintableId(), "action", targetKey + "," + actionKey, true); diff --git a/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java b/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java index 4ddbabdb96..1ec2d9f93b 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java @@ -82,6 +82,7 @@ public class PortletApplicationContext extends WebApplicationContext { return cx;
}
+ @Override
protected void removeApplication(Application application) {
portletListeners.remove(application);
for (Iterator it = portletToApplication.keySet().iterator(); it
@@ -94,6 +95,7 @@ public class PortletApplicationContext extends WebApplicationContext { super.removeApplication(application);
}
+ @Override
public boolean equals(Object obj) {
if (portletSession == null) {
return super.equals(obj);
@@ -101,6 +103,7 @@ public class PortletApplicationContext extends WebApplicationContext { return portletSession.equals(obj);
}
+ @Override
public int hashCode() {
if (portletSession == null) {
return super.hashCode();
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java b/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java index 4eda3a4d05..9ec3b5a2e1 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java @@ -50,6 +50,7 @@ public class SystemMessageException extends RuntimeException { /**
* @see java.lang.Throwable#getCause()
*/
+ @Override
public Throwable getCause() {
return cause;
}
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java index 2bb408ffd6..e0cf13d22d 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java @@ -102,10 +102,12 @@ public class WebApplicationContext implements ApplicationContext, return cx; } + @Override public boolean equals(Object obj) { return session.equals(obj); } + @Override public int hashCode() { return session.hashCode(); } diff --git a/src/com/itmill/toolkit/tests/BasicRandomTest.java b/src/com/itmill/toolkit/tests/BasicRandomTest.java index 1f2b7e1256..9486811026 100644 --- a/src/com/itmill/toolkit/tests/BasicRandomTest.java +++ b/src/com/itmill/toolkit/tests/BasicRandomTest.java @@ -89,6 +89,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements private RandomComponents randomComponents; + @Override public void init() { // addWindow(new Window("ATFTest", create())); final Window mainWindow = new Window("Testing", create()); @@ -338,6 +339,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements /** * ErrorEvents are printed to default error stream and not in GUI. */ + @Override public void terminalError( com.itmill.toolkit.terminal.Terminal.ErrorEvent event) { final Throwable e = event.getThrowable(); diff --git a/src/com/itmill/toolkit/tests/CustomLayoutDemo.java b/src/com/itmill/toolkit/tests/CustomLayoutDemo.java index 0409a81e66..32b1176c9d 100644 --- a/src/com/itmill/toolkit/tests/CustomLayoutDemo.java +++ b/src/com/itmill/toolkit/tests/CustomLayoutDemo.java @@ -46,6 +46,7 @@ public class CustomLayoutDemo extends com.itmill.toolkit.Application implements /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window mainWindow = new Window("CustomLayout demo"); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/LayoutDemo.java b/src/com/itmill/toolkit/tests/LayoutDemo.java index 132c1a8548..cc9235c903 100644 --- a/src/com/itmill/toolkit/tests/LayoutDemo.java +++ b/src/com/itmill/toolkit/tests/LayoutDemo.java @@ -28,6 +28,7 @@ public class LayoutDemo extends com.itmill.toolkit.Application { /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window mainWindow = new Window("Layout demo"); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/ListenerOrder.java b/src/com/itmill/toolkit/tests/ListenerOrder.java index 76c50ae69a..21b0f381d2 100644 --- a/src/com/itmill/toolkit/tests/ListenerOrder.java +++ b/src/com/itmill/toolkit/tests/ListenerOrder.java @@ -26,6 +26,7 @@ public class ListenerOrder extends com.itmill.toolkit.Application implements HashMap buttonListeners = new HashMap(); + @Override public void init() { createNewView(); } diff --git a/src/com/itmill/toolkit/tests/ModalWindow.java b/src/com/itmill/toolkit/tests/ModalWindow.java index 70edf029f6..a91ddd7cc1 100644 --- a/src/com/itmill/toolkit/tests/ModalWindow.java +++ b/src/com/itmill/toolkit/tests/ModalWindow.java @@ -27,6 +27,7 @@ public class ModalWindow extends com.itmill.toolkit.Application implements private Window test; private Button reopen; + @Override public void init() { // Create main window diff --git a/src/com/itmill/toolkit/tests/NativeWindowing.java b/src/com/itmill/toolkit/tests/NativeWindowing.java index 04f54194b1..79d8ba1c46 100644 --- a/src/com/itmill/toolkit/tests/NativeWindowing.java +++ b/src/com/itmill/toolkit/tests/NativeWindowing.java @@ -17,6 +17,7 @@ public class NativeWindowing extends Application { Window main = new Window("Windowing test"); + @Override public void init() { setMainWindow(main); @@ -96,6 +97,7 @@ public class NativeWindowing extends Application { "Commit (saves window state: size, place, scrollpos)")); } + @Override public Window getWindow(String name) { final Window w = super.getWindow(name); diff --git a/src/com/itmill/toolkit/tests/Parameters.java b/src/com/itmill/toolkit/tests/Parameters.java index 358a95ab57..6b95da10aa 100644 --- a/src/com/itmill/toolkit/tests/Parameters.java +++ b/src/com/itmill/toolkit/tests/Parameters.java @@ -35,6 +35,7 @@ public class Parameters extends com.itmill.toolkit.Application implements private final Table params = new Table(); + @Override @SuppressWarnings("deprecation") public void init() { final Window main = new Window("Parameters demo"); @@ -96,6 +97,7 @@ public class Parameters extends com.itmill.toolkit.Application implements * * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String) */ + @Override public DownloadStream handleURI(URL context, String relativeUri) { this.context.setValue(context.toString()); relative.setValue(relativeUri); diff --git a/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java b/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java index 6cf2804cfb..c56822dca3 100644 --- a/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java +++ b/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java @@ -47,6 +47,7 @@ public class PerformanceTestBasicComponentRendering extends CustomComponent { .getTestTable(5, 200); Table t2 = new Table("Test Table with 199 rows rendered initially") { + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); // end timing on cache row request diff --git a/src/com/itmill/toolkit/tests/QueryContainerDemo.java b/src/com/itmill/toolkit/tests/QueryContainerDemo.java index 1ace2988f8..f75b0e743c 100644 --- a/src/com/itmill/toolkit/tests/QueryContainerDemo.java +++ b/src/com/itmill/toolkit/tests/QueryContainerDemo.java @@ -70,6 +70,7 @@ public class QueryContainerDemo extends com.itmill.toolkit.Application /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window main = new Window("QueryContainer demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/RandomLayoutStress.java b/src/com/itmill/toolkit/tests/RandomLayoutStress.java index 5925fb69ec..c515a2cf9c 100644 --- a/src/com/itmill/toolkit/tests/RandomLayoutStress.java +++ b/src/com/itmill/toolkit/tests/RandomLayoutStress.java @@ -45,6 +45,7 @@ public class RandomLayoutStress extends com.itmill.toolkit.Application { /** * Initialize Application. Demo components are added to main window. */ + @Override public void init() { final Window mainWindow = new Window("Layout demo"); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java index 3f45718324..99e770f487 100644 --- a/src/com/itmill/toolkit/tests/TestBench.java +++ b/src/com/itmill/toolkit/tests/TestBench.java @@ -63,6 +63,7 @@ public class TestBench extends com.itmill.toolkit.Application implements HashMap itemCaptions = new HashMap(); + @Override public void init() { // Add testable classes to hierarchical container diff --git a/src/com/itmill/toolkit/tests/TestCaptionWrapper.java b/src/com/itmill/toolkit/tests/TestCaptionWrapper.java index ae8c886c59..7843cc11d2 100644 --- a/src/com/itmill/toolkit/tests/TestCaptionWrapper.java +++ b/src/com/itmill/toolkit/tests/TestCaptionWrapper.java @@ -49,6 +49,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { setCompositionRoot(main); } + @Override public void attach() { super.attach(); createNewView(); diff --git a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java b/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java index 58784919e6..b1f454834e 100644 --- a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java +++ b/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java @@ -75,6 +75,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, private final Action ACTION3 = new Action("Show history"); private final Action[] actions = new Action[] { ACTION1, ACTION2, ACTION3 }; + @Override public void init() { sampleDatabase = new SampleDatabase(); createNewView(); @@ -95,7 +96,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, + "All components are in immmediate mode. See source how to tweak this test.")); main.addComponent(eventListenerFeedback); - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { window = new Window("Components inside Window (TEST: Window)"); @@ -110,7 +111,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, getMainWindow().addWindow(window); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target @@ -123,7 +124,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, target.addComponent(ol); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target @@ -136,7 +137,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, target.addComponent(ol2); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target.addComponent(new Label( @@ -158,7 +159,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, // test(expandLayout); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (true) { target.addComponent(new Label( @@ -181,7 +182,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, // test(expandLayout); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target.addComponent(new Label( @@ -193,7 +194,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, // test(gridLayout); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target @@ -207,7 +208,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, target.addComponent(el); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target.addComponent(new Label( @@ -218,7 +219,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, target.addComponent(panel); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target @@ -239,7 +240,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, target.addComponent(sp1l); } - //////////////////////////////////////////////////////////////////////// + // ////////////////////////////////////////////////////////////////////// // //// if (false) { target diff --git a/src/com/itmill/toolkit/tests/TestDateField.java b/src/com/itmill/toolkit/tests/TestDateField.java index 6476115ebc..d586cdefca 100644 --- a/src/com/itmill/toolkit/tests/TestDateField.java +++ b/src/com/itmill/toolkit/tests/TestDateField.java @@ -63,6 +63,7 @@ public class TestDateField extends CustomComponent { df4.setLocale(new Locale("fi", "FI"));
}
+ @Override
public void attach() {
final ClassResource res = new ClassResource("m.gif", super
.getApplication());
diff --git a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java index e8692f1241..3d80050b04 100644 --- a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java +++ b/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java @@ -20,6 +20,7 @@ public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends SplitPanel firstLevelSplit; + @Override public void init() { setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java b/src/com/itmill/toolkit/tests/TestForNativeWindowing.java index 5e7216101b..bc43a86c50 100644 --- a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java +++ b/src/com/itmill/toolkit/tests/TestForNativeWindowing.java @@ -17,6 +17,7 @@ public class TestForNativeWindowing extends Application { Window main = new Window("Windowing test"); + @Override public void init() { setMainWindow(main); @@ -96,6 +97,7 @@ public class TestForNativeWindowing extends Application { "Commit (saves window state: size, place, scrollpos)")); } + @Override public Window getWindow(String name) { final Window w = super.getWindow(name); diff --git a/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java b/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java index 4f4d2dc099..29a9e32456 100644 --- a/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java +++ b/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java @@ -21,6 +21,7 @@ public class TestSetVisibleAndCaching extends com.itmill.toolkit.Application { int selectedPanel = 0; + @Override public void init() { final Window mainWindow = new Window("TestSetVisibleAndCaching"); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java b/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java index 032bb9f037..37130d1a8c 100644 --- a/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java +++ b/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java @@ -37,6 +37,7 @@ public class TestSizeableIncomponents extends Application { private Button next; private Panel testPanel; + @Override public void init() { initComponentList(); @@ -144,6 +145,7 @@ public class TestSizeableIncomponents extends Application { cont.addItem(t); t = new Testable(c); t.addConfiguration(new Configuration("100px*100px") { + @Override void configure(Component c) { c.setWidth(60); c.setHeight(60); @@ -151,6 +153,7 @@ public class TestSizeableIncomponents extends Application { }); t = new Testable(c); t.addConfiguration(new Configuration("Width 50em") { + @Override void configure(Component c) { c.setWidth("50em"); } @@ -158,12 +161,14 @@ public class TestSizeableIncomponents extends Application { cont.addItem(t); t = new Testable(c); t.addConfiguration(new Configuration("Height 7cm") { + @Override void configure(Component c) { c.setHeight("7cm"); } }); cont.addItem(t); t = new Testable(c) { + @Override public Component getComponent() throws InstantiationException, IllegalAccessException { @@ -183,6 +188,7 @@ public class TestSizeableIncomponents extends Application { }; t.addConfiguration(new Configuration("100%*100%") { + @Override void configure(Component c) { c.setSizeFull(); } @@ -286,6 +292,7 @@ public class TestSizeableIncomponents extends Application { return c; } + @Override public String toString() { return getTestableName(); } @@ -305,6 +312,7 @@ public class TestSizeableIncomponents extends Application { abstract void configure(Component c); + @Override public String toString() { return getDescription(); } diff --git a/src/com/itmill/toolkit/tests/TestSplitPanel.java b/src/com/itmill/toolkit/tests/TestSplitPanel.java index fffd1ffb5a..06d033431b 100644 --- a/src/com/itmill/toolkit/tests/TestSplitPanel.java +++ b/src/com/itmill/toolkit/tests/TestSplitPanel.java @@ -14,6 +14,7 @@ public class TestSplitPanel extends com.itmill.toolkit.Application { // SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL); SplitPanel verticalSplit = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL); + @Override public void init() { final Window mainWindow = new Window("Feature Browser"); setMainWindow(mainWindow); diff --git a/src/com/itmill/toolkit/tests/TreeFilesystem.java b/src/com/itmill/toolkit/tests/TreeFilesystem.java index e22634ef91..8b3fb7e457 100644 --- a/src/com/itmill/toolkit/tests/TreeFilesystem.java +++ b/src/com/itmill/toolkit/tests/TreeFilesystem.java @@ -31,6 +31,7 @@ public class TreeFilesystem extends com.itmill.toolkit.Application implements private final Tree tree = new Tree(); + @Override public void init() { final Window main = new Window("Tree filesystem demo"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java b/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java index 8a0e364d5e..d07d621440 100644 --- a/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java +++ b/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java @@ -42,6 +42,7 @@ public class TreeFilesystemContainer extends com.itmill.toolkit.Application private final Label fileProperties = new Label(); + @Override public void init() { final Window w = new Window("Tree FilesystemContainer demo"); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/UpgradingSample.java b/src/com/itmill/toolkit/tests/UpgradingSample.java index 50f6e177a9..40096c6456 100644 --- a/src/com/itmill/toolkit/tests/UpgradingSample.java +++ b/src/com/itmill/toolkit/tests/UpgradingSample.java @@ -52,6 +52,7 @@ public class UpgradingSample extends Application implements private final GridLayout layout = new GridLayout(2, 1); /* Initialize the application */ + @Override public void init() { // Create the main window of the application @@ -73,6 +74,7 @@ public class UpgradingSample extends Application implements // Overriding usetUser method is a simple way of updating application // privileges when the user is changed + @Override public void setUser(Object user) { super.setUser(user); if (user != null) { diff --git a/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java b/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java index 76c06ad130..69e41e991d 100644 --- a/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java +++ b/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java @@ -25,6 +25,7 @@ public class UsingObjectsInSelect extends com.itmill.toolkit.Application public static Random random = new Random(1); + @Override public void init() { final Window main = new Window("Select demo"); setMainWindow(main); @@ -81,6 +82,7 @@ public class UsingObjectsInSelect extends com.itmill.toolkit.Application this.estimatedHours = estimatedHours; } + @Override public String toString() { return type + ", " + assignedTo; } diff --git a/src/com/itmill/toolkit/tests/book/BookTestApplication.java b/src/com/itmill/toolkit/tests/book/BookTestApplication.java index c1466c6e70..a7d5799d22 100644 --- a/src/com/itmill/toolkit/tests/book/BookTestApplication.java +++ b/src/com/itmill/toolkit/tests/book/BookTestApplication.java @@ -611,12 +611,14 @@ public class BookTestApplication extends com.itmill.toolkit.Application { } else if (param.equals("paging")) { PagingTable table = new PagingTable(); table.addContainerProperty("Column 1", String.class, null); - for (int i = 0; i < 100; i++) + for (int i = 0; i < 100; i++) { table.addItem(new Object[] { "Item " + i }, new Integer(i)); + } main.addComponent(table); } - } else + } else { main.addComponent(new TableExample1()); + } } void example_Upload(Window main, String param) { @@ -809,8 +811,9 @@ public class BookTestApplication extends com.itmill.toolkit.Application { for (int i = 0; i < 9; i++) { HorizontalLayout celllayout = new HorizontalLayout(); celllayout.addComponent((Component) cells[i][0]); - if (i == 0) + if (i == 0) { celllayout.setExpandRatio((Component) cells[i][0], 1); + } celllayout.setComponentAlignment((Component) cells[i][0], ((Integer) cells[i][1]).intValue(), @@ -890,8 +893,9 @@ public class BookTestApplication extends com.itmill.toolkit.Application { form.getFooter().addComponent(okbar); main.addComponent(form); - } else + } else { main.addComponent(new FormExample()); + } } void example_ExpandLayout(Window main, String param) { @@ -1171,10 +1175,11 @@ public class BookTestApplication extends com.itmill.toolkit.Application { // Grow the progress value until it reaches 1.0. current += 0.01; - if (current > 1.0) + if (current > 1.0) { indicator.setValue(new Float(1.0)); - else + } else { indicator.setValue(new Float(current)); + } // After the progress is full for a while, stop. if (current > 1.2) { @@ -1221,8 +1226,9 @@ public class BookTestApplication extends com.itmill.toolkit.Application { String items[] = new String[] { "-- Select --", "Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune" }; - for (int i = 0; i < items.length; i++) + for (int i = 0; i < items.length; i++) { select.addItem(items[i]); + } select.setNullSelectionItemId(items[0]); // When an item is selected in the second window, add @@ -1432,8 +1438,9 @@ public class BookTestApplication extends com.itmill.toolkit.Application { .getBrowserApplication(); // Add a browser-dependent style name for the main window - if (browserApplication.indexOf("Firefox/2") != -1) + if (browserApplication.indexOf("Firefox/2") != -1) { main.addStyleName("firefox2"); + } // Display the client identification string main.addComponent(new Label(browserApplication)); diff --git a/src/com/itmill/toolkit/tests/book/ChatApplication.java b/src/com/itmill/toolkit/tests/book/ChatApplication.java index eaea83062c..5ad52daf2b 100644 --- a/src/com/itmill/toolkit/tests/book/ChatApplication.java +++ b/src/com/itmill/toolkit/tests/book/ChatApplication.java @@ -1,26 +1,37 @@ package com.itmill.toolkit.tests.book; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import com.itmill.toolkit.Application; -import com.itmill.toolkit.ui.*; +import com.itmill.toolkit.ui.Button; +import com.itmill.toolkit.ui.ProgressIndicator; +import com.itmill.toolkit.ui.Table; +import com.itmill.toolkit.ui.TextField; +import com.itmill.toolkit.ui.Window; import com.itmill.toolkit.ui.Button.ClickEvent; -public class ChatApplication extends Application implements Button.ClickListener { - /* ChatApplication instances of different users. - * Warning: a hack, not safe, because sessions can expire. */ +public class ChatApplication extends Application implements + Button.ClickListener { + /* + * ChatApplication instances of different users. Warning: a hack, not safe, + * because sessions can expire. + */ static List users = new ArrayList(); - + /* Messages as a shared list. */ - static List messages = new ArrayList(); - int localSize = 0; + static List messages = new ArrayList(); + int localSize = 0; /* User interface. */ - Table messageTable = new Table(); - TextField username = new TextField("Username:"); - TextField message = new TextField("Message:"); + Table messageTable = new Table(); + TextField username = new TextField("Username:"); + TextField message = new TextField("Message:"); + @Override public void init() { - final Window main = new Window ("Chat"); + final Window main = new Window("Chat"); setMainWindow(main); setTheme("tests-magi"); users.add(this); @@ -31,9 +42,9 @@ public class ChatApplication extends Application implements Button.ClickListener messageTable.addContainerProperty("Sender", String.class, ""); messageTable.addContainerProperty("Message", String.class, ""); updateTable(); - + main.addComponent(message); - + Button send = new Button("Send"); send.addListener(this); main.addComponent(send); @@ -45,24 +56,28 @@ public class ChatApplication extends Application implements Button.ClickListener } public void buttonClick(ClickEvent event) { - synchronized(users) { + synchronized (users) { // Create the new message in the shared list. - messages.add(new String[]{new String((String) username.getValue()), - new String((String) message.getValue())}); + messages.add(new String[] { + new String((String) username.getValue()), + new String((String) message.getValue()) }); // Update the message tables for all users. - for (Iterator i = users.iterator();i.hasNext();) - ((ChatApplication)i.next()).updateTable(); + for (Iterator i = users.iterator(); i.hasNext();) { + ((ChatApplication) i.next()).updateTable(); + } } } void updateTable() { - if (localSize == messages.size()) + if (localSize == messages.size()) { return; // No updating needed + } // Add new messages to the table - while (localSize < messages.size()) - messageTable.addItem((Object[])messages.get(localSize++), - new Integer(localSize-1)); + while (localSize < messages.size()) { + messageTable.addItem((Object[]) messages.get(localSize++), + new Integer(localSize - 1)); + } } } diff --git a/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java b/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java index 2ed44785bd..012070d277 100644 --- a/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java +++ b/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java @@ -7,7 +7,6 @@ package com.itmill.toolkit.tests.book; import com.itmill.toolkit.event.Action; import com.itmill.toolkit.event.ShortcutAction; import com.itmill.toolkit.event.Action.Handler; -import com.itmill.toolkit.ui.AbstractField; import com.itmill.toolkit.ui.Button; import com.itmill.toolkit.ui.CustomComponent; import com.itmill.toolkit.ui.FormLayout; @@ -25,7 +24,8 @@ public class DefaultButtonExample extends CustomComponent implements Handler { TextField password = new TextField("Password"); OrderedLayout buttons = new FormLayout(); - // Create buttons and define their listener methods. Here we use parameterless + // Create buttons and define their listener methods. Here we use + // parameterless // methods so that we can use same methods for both click events and // keyboard actions. Button ok = new Button("OK", this, "okHandler"); @@ -33,13 +33,12 @@ public class DefaultButtonExample extends CustomComponent implements Handler { // Have the unmodified Enter key cause an event Action action_ok = new ShortcutAction("Default key", - ShortcutAction.KeyCode.ENTER, - null); + ShortcutAction.KeyCode.ENTER, null); // Have the C key modified with Alt cause an event Action action_cancel = new ShortcutAction("Alt+C", - ShortcutAction.KeyCode.C, - new int[] { ShortcutAction.ModifierKey.ALT }); + ShortcutAction.KeyCode.C, + new int[] { ShortcutAction.ModifierKey.ALT }); Window window = null; @@ -73,7 +72,7 @@ public class DefaultButtonExample extends CustomComponent implements Handler { */ public Action[] getActions(Object target, Object sender) { System.out.println("getActions()"); - return new Action[] {action_ok, action_cancel}; + return new Action[] { action_ok, action_cancel }; } /** @@ -81,22 +80,24 @@ public class DefaultButtonExample extends CustomComponent implements Handler { * the same listener methods that are called with ButtonClick events. */ public void handleAction(Action action, Object sender, Object target) { - if (action == action_ok) + if (action == action_ok) { okHandler(); - if (action == action_cancel) + } + if (action == action_cancel) { cancelHandler(); + } } public void okHandler() { // Do something: report the click - formlayout.addComponent(new Label("OK clicked. "+ - "User="+username.getValue()+ - ", password="+password.getValue())); + formlayout.addComponent(new Label("OK clicked. " + "User=" + + username.getValue() + ", password=" + password.getValue())); // } public void cancelHandler() { // Do something: report the click - formlayout.addComponent(new Label("Cancel clicked. User="+username.getValue()+", password="+password.getValue())); + formlayout.addComponent(new Label("Cancel clicked. User=" + + username.getValue() + ", password=" + password.getValue())); } } diff --git a/src/com/itmill/toolkit/tests/book/FormExample.java b/src/com/itmill/toolkit/tests/book/FormExample.java index 2125888004..d0c78c0c54 100644 --- a/src/com/itmill/toolkit/tests/book/FormExample.java +++ b/src/com/itmill/toolkit/tests/book/FormExample.java @@ -30,9 +30,9 @@ import com.itmill.toolkit.ui.TextField; public class FormExample extends CustomComponent { /** Contact information data model. */ public class Contact { - String name = ""; - String address = ""; - int postalCode = 20540; + String name = ""; + String address = ""; + int postalCode = 20540; String city; } @@ -59,20 +59,22 @@ public class FormExample extends CustomComponent { public void setPostalCode(String postalCode) { try { - if (postalCode != null) + if (postalCode != null) { this.postalCode = Integer.parseInt(postalCode); - else + } else { this.postalCode = 0; + } } catch (NumberFormatException e) { this.postalCode = 0; } } public String getPostalCode() { - if (postalCode > 0) + if (postalCode > 0) { return String.valueOf(postalCode); - else + } else { return ""; + } } public void setCity(String city) { @@ -102,12 +104,14 @@ public class FormExample extends CustomComponent { Component uiContext) { String pid = (String) propertyId; - if (pid.equals("name")) + if (pid.equals("name")) { return new TextField("Name"); - - if (pid.equals("address")) + } + + if (pid.equals("address")) { return new TextField("Street Address"); - + } + if (pid.equals("postalCode")) { TextField field = new TextField("Postal Code"); field.setColumns(5); @@ -121,7 +125,8 @@ public class FormExample extends CustomComponent { return ((String) value).matches("[0-9]{5}"); } - public void validate(Object value) throws InvalidValueException { + public void validate(Object value) + throws InvalidValueException { if (!isValid(value)) { throw new InvalidValueException( "Postal code must be a number 10000-99999."); @@ -131,15 +136,16 @@ public class FormExample extends CustomComponent { field.addValidator(postalCodeValidator); return field; } - + if (pid.equals("city")) { Select select = new Select("City"); final String cities[] = new String[] { "Amsterdam", "Berlin", "Helsinki", "Hong Kong", "London", "Luxemburg", "New York", "Oslo", "Paris", "Rome", "Stockholm", "Tokyo", "Turku" }; - for (int i = 0; i < cities.length; i++) + for (int i = 0; i < cities.length; i++) { select.addItem(cities[i]); + } return select; } return null; @@ -157,7 +163,8 @@ public class FormExample extends CustomComponent { // Set form caption and description texts. form.setCaption("Contact Information"); - form.setDescription("Please enter valid name and address. Fields marked with * are required."); + form + .setDescription("Please enter valid name and address. Fields marked with * are required."); // Use custom field factory to create the fields in the form. form.setFieldFactory(new MyFieldFactory()); @@ -191,7 +198,7 @@ public class FormExample extends CustomComponent { // necessary for the validation of the fields to occur immediately when // the input focus changes and not just on commit. form.setImmediate(true); - + // Set buffering so that commit() must be called for the form // before input is written to the data. (Input is not written // immediately through). @@ -199,7 +206,8 @@ public class FormExample extends CustomComponent { form.setReadThrough(false); // Add Commit and Discard controls to the form. - ExpandLayout footer = new ExpandLayout(OrderedLayout.ORIENTATION_HORIZONTAL); + ExpandLayout footer = new ExpandLayout( + OrderedLayout.ORIENTATION_HORIZONTAL); // The Commit button calls form.commit(). Button commit = new Button("Commit", form, "commit"); @@ -208,7 +216,7 @@ public class FormExample extends CustomComponent { Button discard = new Button("Discard", form, "discard"); footer.addComponent(commit); footer.setComponentAlignment(commit, ExpandLayout.ALIGNMENT_RIGHT, - ExpandLayout.ALIGNMENT_TOP); + ExpandLayout.ALIGNMENT_TOP); footer.setHeight("25px"); footer.addComponent(discard); form.setFooter(footer); diff --git a/src/com/itmill/toolkit/tests/book/FormExample2.java b/src/com/itmill/toolkit/tests/book/FormExample2.java index 8d9c0e86e2..a1113a1461 100644 --- a/src/com/itmill/toolkit/tests/book/FormExample2.java +++ b/src/com/itmill/toolkit/tests/book/FormExample2.java @@ -29,7 +29,7 @@ public class FormExample2 extends CustomComponent { public class PersonBean { String name = ""; String city = ""; - + public void setName(String name) { this.name = name; } @@ -64,9 +64,9 @@ public class FormExample2 extends CustomComponent { public Field createField(Item item, Object propertyId, Component uiContext) { String pid = (String) propertyId; - if (pid.equals("name")) + if (pid.equals("name")) { return new TextField("Name"); - else if (pid.equals("city")) { + } else if (pid.equals("city")) { Select select = new Select("City"); select.addItem("Berlin"); select.addItem("Helsinki"); @@ -91,7 +91,8 @@ public class FormExample2 extends CustomComponent { // Set form caption and description texts form.setCaption("Contact Information"); - form.setDescription("Please specify name of the person and the city where the person lives in."); + form + .setDescription("Please specify name of the person and the city where the person lives in."); // Use the custom field factory to create the fields in the form. form.setFieldFactory(new MyFieldFactory()); @@ -110,7 +111,7 @@ public class FormExample2 extends CustomComponent { order.add("name"); order.add("city"); form.setVisibleItemProperties(order); - + form.getField("name").setRequired(true); form.getField("name").setRequiredError("You must enter a name."); form.getField("city").setRequired(true); @@ -118,6 +119,6 @@ public class FormExample2 extends CustomComponent { OrderedLayout root = new OrderedLayout(); root.setWidth(300, OrderedLayout.UNITS_PIXELS); root.addComponent(form); - this.setCompositionRoot(root); + setCompositionRoot(root); } } diff --git a/src/com/itmill/toolkit/tests/book/MyDynamicResource.java b/src/com/itmill/toolkit/tests/book/MyDynamicResource.java index 34ca740a8f..5981a4ffbf 100644 --- a/src/com/itmill/toolkit/tests/book/MyDynamicResource.java +++ b/src/com/itmill/toolkit/tests/book/MyDynamicResource.java @@ -1,12 +1,19 @@ package com.itmill.toolkit.tests.book; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.net.URL; import java.util.Map; + import javax.imageio.ImageIO; -import com.itmill.toolkit.terminal.*; + +import com.itmill.toolkit.terminal.DownloadStream; +import com.itmill.toolkit.terminal.ParameterHandler; +import com.itmill.toolkit.terminal.URIHandler; /** * Demonstrates handling URI parameters and the URI itself to create a dynamic @@ -20,8 +27,9 @@ public class MyDynamicResource implements URIHandler, ParameterHandler { */ public void handleParameters(Map parameters) { // Get and store the passed HTTP parameter. - if (parameters.containsKey("text")) - textToDisplay = ((String[])parameters.get("text"))[0]; + if (parameters.containsKey("text")) { + textToDisplay = ((String[]) parameters.get("text"))[0]; + } } /** @@ -34,22 +42,24 @@ public class MyDynamicResource implements URIHandler, ParameterHandler { public DownloadStream handleURI(URL context, String relativeUri) { // Catch the given URI that identifies the resource, otherwise let other // URI handlers or the Application to handle the response. - if (!relativeUri.startsWith("myresource")) + if (!relativeUri.startsWith("myresource")) { return null; - + } + // Create an image and draw some background on it. - BufferedImage image = new BufferedImage (200, 200, BufferedImage.TYPE_INT_RGB); + BufferedImage image = new BufferedImage(200, 200, + BufferedImage.TYPE_INT_RGB); Graphics drawable = image.getGraphics(); drawable.setColor(Color.lightGray); - drawable.fillRect(0,0,200,200); + drawable.fillRect(0, 0, 200, 200); drawable.setColor(Color.yellow); - drawable.fillOval(25,25,150,150); + drawable.fillOval(25, 25, 150, 150); drawable.setColor(Color.blue); - drawable.drawRect(0,0,199,199); - + drawable.drawRect(0, 0, 199, 199); + // Use the parameter to create dynamic content. drawable.setColor(Color.black); - drawable.drawString("Text: "+textToDisplay, 75, 100); + drawable.drawString("Text: " + textToDisplay, 75, 100); try { // Write the image to a buffer. @@ -57,8 +67,9 @@ public class MyDynamicResource implements URIHandler, ParameterHandler { ImageIO.write(image, "png", imagebuffer); // Return a stream from the buffer. - ByteArrayInputStream istream = new ByteArrayInputStream(imagebuffer.toByteArray()); - return new DownloadStream (istream,null,null); + ByteArrayInputStream istream = new ByteArrayInputStream(imagebuffer + .toByteArray()); + return new DownloadStream(istream, null, null); } catch (IOException e) { return null; } diff --git a/src/com/itmill/toolkit/tests/book/MyUploader.java b/src/com/itmill/toolkit/tests/book/MyUploader.java index a9215f09b5..2702bbf087 100644 --- a/src/com/itmill/toolkit/tests/book/MyUploader.java +++ b/src/com/itmill/toolkit/tests/book/MyUploader.java @@ -9,13 +9,17 @@ import java.io.FileOutputStream; import java.io.OutputStream; import com.itmill.toolkit.terminal.FileResource; -import com.itmill.toolkit.ui.*; +import com.itmill.toolkit.ui.CustomComponent; +import com.itmill.toolkit.ui.Embedded; +import com.itmill.toolkit.ui.Label; +import com.itmill.toolkit.ui.Panel; +import com.itmill.toolkit.ui.Upload; -public class MyUploader extends CustomComponent -implements Upload.SucceededListener, Upload.FailedListener, Upload.Receiver { - Panel root; // Root element for contained components. - Panel imagePanel; // Panel that contains the uploaded image. - File file; // File to write to. +public class MyUploader extends CustomComponent implements + Upload.SucceededListener, Upload.FailedListener, Upload.Receiver { + Panel root; // Root element for contained components. + Panel imagePanel; // Panel that contains the uploaded image. + File file; // File to write to. MyUploader() { root = new Panel("My Upload Component"); @@ -30,7 +34,8 @@ implements Upload.SucceededListener, Upload.FailedListener, Upload.Receiver { upload.addListener((Upload.FailedListener) this); root.addComponent(upload); - root.addComponent(new Label("Click 'Browse' to select a file and then click 'Upload'.")); + root.addComponent(new Label( + "Click 'Browse' to select a file and then click 'Upload'.")); // Create a panel for displaying the uploaded file (image). imagePanel = new Panel("Uploaded image"); @@ -59,9 +64,10 @@ implements Upload.SucceededListener, Upload.FailedListener, Upload.Receiver { // Log the upload on screen. root.addComponent(new Label("File " + event.getFilename() + " of type '" + event.getMIMEType() + "' uploaded.")); - + // Display the uploaded file in the image panel. - final FileResource imageResource = new FileResource(file, getApplication()); + final FileResource imageResource = new FileResource(file, + getApplication()); imagePanel.removeAllComponents(); imagePanel.addComponent(new Embedded("", imageResource)); } diff --git a/src/com/itmill/toolkit/tests/book/SSNField.java b/src/com/itmill/toolkit/tests/book/SSNField.java index 0659ebb910..2dcb2d5c68 100644 --- a/src/com/itmill/toolkit/tests/book/SSNField.java +++ b/src/com/itmill/toolkit/tests/book/SSNField.java @@ -4,8 +4,6 @@ package com.itmill.toolkit.tests.book; -import java.text.MessageFormat; - import com.itmill.toolkit.data.Property; import com.itmill.toolkit.data.Validator; import com.itmill.toolkit.data.Property.ValueChangeEvent; @@ -19,7 +17,8 @@ import com.itmill.toolkit.ui.TextField; public class SSNField extends CustomComponent implements Property.ValueChangeListener { OrderedLayout layout = new FormLayout(); - // new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL); //;new FormLayout(); + // new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL); //;new + // FormLayout(); TextField myfield; Label myerror; @@ -39,11 +38,13 @@ public class SSNField extends CustomComponent implements /** Validate the given SSN. */ public void validate(Object value) throws InvalidValueException { final String ssn = (String) value; - if (ssn.length() == 0) - return; + if (ssn.length() == 0) { + return; + } - if (ssn.length() != 11) + if (ssn.length() != 11) { throw new InvalidValueException("Invalid SSN length"); + } final String numbers = ssn.substring(0, 6) + ssn.substring(7, 10); final int checksum = new Integer(numbers).intValue() % 31; @@ -66,8 +67,10 @@ public class SSNField extends CustomComponent implements /* Create and set the validator object for the field. */ myfield.addValidator(new SSNValidator()); - /* ValueChageEvent will be generated immediately when the component - loses focus. */ + /* + * ValueChageEvent will be generated immediately when the component + * loses focus. + */ myfield.setImmediate(true); /* Listen for ValueChangeEvent events. */ diff --git a/src/com/itmill/toolkit/tests/book/SelectExample.java b/src/com/itmill/toolkit/tests/book/SelectExample.java index 9ba5d61ae9..7b9cec14cc 100644 --- a/src/com/itmill/toolkit/tests/book/SelectExample.java +++ b/src/com/itmill/toolkit/tests/book/SelectExample.java @@ -26,6 +26,7 @@ public class SelectExample extends CustomComponent implements planetName = name; } + @Override public String toString() { return "The Planet " + planetName; } diff --git a/src/com/itmill/toolkit/tests/book/TableCellStyle.java b/src/com/itmill/toolkit/tests/book/TableCellStyle.java index ddb8872a13..ac66c45f81 100644 --- a/src/com/itmill/toolkit/tests/book/TableCellStyle.java +++ b/src/com/itmill/toolkit/tests/book/TableCellStyle.java @@ -11,42 +11,52 @@ public class TableCellStyle extends CustomComponent { public TableCellStyle() { Table table = new Table("Table with Cell Styles"); table.addStyleName("checkerboard"); - + // Add some columns in the table. In this example, the property IDs // of the container are integers so we can determine the column number // easily. - table.addContainerProperty("0", String.class, null, "", null, null); // Row header - for (int i=0; i<8; i++) - table.addContainerProperty(""+(i+1), String.class, null, - String.valueOf((char) (65+i)), null, null); - + table.addContainerProperty("0", String.class, null, "", null, null); // Row + // header + for (int i = 0; i < 8; i++) { + table.addContainerProperty("" + (i + 1), String.class, null, String + .valueOf((char) (65 + i)), null, null); + } + // Add some items in the table. - table.addItem(new Object[]{"1", "R", "N", "B", "Q", "K", "B", "N", "R"}, new Integer(0)); - table.addItem(new Object[]{"2", "P", "P", "P", "P", "P", "P", "P", "P"}, new Integer(1)); - for (int i=2; i<6; i++) - table.addItem(new Object[]{String.valueOf(i+1), "", "", "", "", "", "", "", ""}, new Integer(i)); - table.addItem(new Object[]{"7", "P", "P", "P", "P", "P", "P", "P", "P"}, new Integer(6)); - table.addItem(new Object[]{"8", "R", "N", "B", "Q", "K", "B", "N", "R"}, new Integer(7)); + table.addItem(new Object[] { "1", "R", "N", "B", "Q", "K", "B", "N", + "R" }, new Integer(0)); + table.addItem(new Object[] { "2", "P", "P", "P", "P", "P", "P", "P", + "P" }, new Integer(1)); + for (int i = 2; i < 6; i++) { + table.addItem(new Object[] { String.valueOf(i + 1), "", "", "", "", + "", "", "", "" }, new Integer(i)); + } + table.addItem(new Object[] { "7", "P", "P", "P", "P", "P", "P", "P", + "P" }, new Integer(6)); + table.addItem(new Object[] { "8", "R", "N", "B", "Q", "K", "B", "N", + "R" }, new Integer(7)); table.setPageLength(8); - + // Set cell style generator table.setCellStyleGenerator(new Table.CellStyleGenerator() { public String getStyle(Object itemId, Object propertyId) { - int row = ((Integer)itemId).intValue(); - int col = Integer.parseInt((String)propertyId); - + int row = ((Integer) itemId).intValue(); + int col = Integer.parseInt((String) propertyId); + // The first column. - if (col == 0) + if (col == 0) { return "rowheader"; - + } + // Other cells. - if ((row+col)%2 == 1) + if ((row + col) % 2 == 1) { return "black"; - else + } else { return "white"; + } } }); - + setCompositionRoot(table); } } diff --git a/src/com/itmill/toolkit/tests/book/TableEditable.java b/src/com/itmill/toolkit/tests/book/TableEditable.java index 76c4f4e100..5941d474ba 100644 --- a/src/com/itmill/toolkit/tests/book/TableEditable.java +++ b/src/com/itmill/toolkit/tests/book/TableEditable.java @@ -10,50 +10,45 @@ import java.util.GregorianCalendar; import com.itmill.toolkit.data.Property; import com.itmill.toolkit.data.Property.ValueChangeEvent; -import com.itmill.toolkit.ui.Button; import com.itmill.toolkit.ui.CheckBox; import com.itmill.toolkit.ui.CustomComponent; -import com.itmill.toolkit.ui.Label; import com.itmill.toolkit.ui.OrderedLayout; -import com.itmill.toolkit.ui.RichTextArea; import com.itmill.toolkit.ui.Table; -import com.itmill.toolkit.ui.TextField; -import com.itmill.toolkit.ui.Button.ClickEvent; public class TableEditable extends CustomComponent { /* A layout needed for the example. */ OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); - + TableEditable() { setCompositionRoot(layout); // Create a table. It is by default not editable. final Table table = new Table(); - + // Define the names and data types of columns. - table.addContainerProperty("Date", Date.class, null); - table.addContainerProperty("Work", Boolean.class, null); - table.addContainerProperty("Comments", String.class, null); - + table.addContainerProperty("Date", Date.class, null); + table.addContainerProperty("Work", Boolean.class, null); + table.addContainerProperty("Comments", String.class, null); + // Add a few items in the table. - for (int i=0; i<100; i++) { - Calendar calendar = new GregorianCalendar(2008,0,1); + for (int i = 0; i < 100; i++) { + Calendar calendar = new GregorianCalendar(2008, 0, 1); calendar.add(Calendar.DAY_OF_YEAR, i); - + // Create the table row. - table.addItem(new Object[] {calendar.getTime(), - new Boolean(false), - ""}, - new Integer(i)); // Item identifier + table.addItem(new Object[] { calendar.getTime(), + new Boolean(false), "" }, new Integer(i)); // Item + // identifier } - + table.setPageLength(8); layout.addComponent(table); - + final CheckBox switchEditable = new CheckBox("Editable"); switchEditable.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - table.setEditable(((Boolean)event.getProperty().getValue()).booleanValue()); + table.setEditable(((Boolean) event.getProperty().getValue()) + .booleanValue()); } }); switchEditable.setImmediate(true); diff --git a/src/com/itmill/toolkit/tests/book/TableEditableBean.java b/src/com/itmill/toolkit/tests/book/TableEditableBean.java index 1029eabee2..fdb052197b 100644 --- a/src/com/itmill/toolkit/tests/book/TableEditableBean.java +++ b/src/com/itmill/toolkit/tests/book/TableEditableBean.java @@ -22,29 +22,29 @@ import com.itmill.toolkit.ui.OrderedLayout; import com.itmill.toolkit.ui.Table; /** - * Shows how to bind a bean to a table and make it editable. + * Shows how to bind a bean to a table and make it editable. */ public class TableEditableBean extends CustomComponent { /** * Let's have a simple example bean. */ - public class MyBean { - boolean selected; - String text; - - public MyBean() { - this.selected = false; - this.text = ""; - } - - public boolean isSelected() { - System.out.println("isSelected() called: " + selected); + public class MyBean { + boolean selected; + String text; + + public MyBean() { + selected = false; + text = ""; + } + + public boolean isSelected() { + System.out.println("isSelected() called: " + selected); return selected; } public void setSelected(boolean selected) { this.selected = selected; - System.out.println("setSelected1("+selected+") called."); + System.out.println("setSelected1(" + selected + ") called."); } public String getText() { @@ -54,26 +54,27 @@ public class TableEditableBean extends CustomComponent { public void setText(String text) { this.text = text; - System.out.println("setText("+text+") called."); + System.out.println("setText(" + text + ") called."); } - }; + }; /** * Custom field factory that sets the fields as immediate for debugging * purposes. This is not normally necessary, unless you want to have some * interaction that requires it. */ - public class MyFieldFactory extends BaseFieldFactory { - public Field createField(Class type, Component uiContext) { - // Let the BaseFieldFactory create the fields - Field field = super.createField(type, uiContext); - - // ...and just set them as immediate - ((AbstractField)field).setImmediate(true); - + public class MyFieldFactory extends BaseFieldFactory { + @Override + public Field createField(Class type, Component uiContext) { + // Let the BaseFieldFactory create the fields + Field field = super.createField(type, uiContext); + + // ...and just set them as immediate + ((AbstractField) field).setImmediate(true); + return field; - } - } + } + } /** * This is a custom container that allows adding BeanItems inside it. The @@ -83,13 +84,13 @@ public class TableEditableBean extends CustomComponent { * Most of the interface methods are implemented with just dummy * implementations, as they are not needed in this example. */ - public class MyContainer implements Container { + public class MyContainer implements Container { Item[] items; - int current = 0; - - public MyContainer() { - items = new Item[100]; // Yeah this is just a test - } + int current = 0; + + public MyContainer() { + items = new Item[100]; // Yeah this is just a test + } public boolean addContainerProperty(Object propertyId, Class type, Object defaultValue) throws UnsupportedOperationException { @@ -105,8 +106,8 @@ public class TableEditableBean extends CustomComponent { } /** - * This addItem method is specific for this container and allows adding - * BeanItem objects. The BeanItems must be bound to MyBean objects. + * This addItem method is specific for this container and allows adding + * BeanItem objects. The BeanItems must be bound to MyBean objects. */ public void addItem(BeanItem item) throws UnsupportedOperationException { items[current++] = item; @@ -114,9 +115,10 @@ public class TableEditableBean extends CustomComponent { public boolean containsId(Object itemId) { if (itemId instanceof Integer) { - int pos = ((Integer)itemId).intValue(); - if (pos >= 0 && pos < 100) + int pos = ((Integer) itemId).intValue(); + if (pos >= 0 && pos < 100) { return items[pos] != null; + } } return false; } @@ -128,10 +130,10 @@ public class TableEditableBean extends CustomComponent { */ public Property getContainerProperty(Object itemId, Object propertyId) { if (itemId instanceof Integer) { - int pos = ((Integer)itemId).intValue(); + int pos = ((Integer) itemId).intValue(); if (pos >= 0 && pos < 100) { Item item = items[pos]; - + // The BeanItem provides the property objects for the items. return item.getItemProperty(propertyId); } @@ -143,24 +145,26 @@ public class TableEditableBean extends CustomComponent { public Collection getContainerPropertyIds() { // This container can contain only BeanItems bound to MyBeans. Item item = new BeanItem(new MyBean()); - + // The BeanItem knows how to get the property names from the bean. return item.getItemPropertyIds(); } public Item getItem(Object itemId) { if (itemId instanceof Integer) { - int pos = ((Integer)itemId).intValue(); - if (pos >= 0 && pos < 100) + int pos = ((Integer) itemId).intValue(); + if (pos >= 0 && pos < 100) { return items[pos]; + } } return null; } public Collection getItemIds() { Vector ids = new Vector(); - for (int i=0; i<100; i++) + for (int i = 0; i < 100; i++) { ids.add(Integer.valueOf(i)); + } return ids; } @@ -185,48 +189,51 @@ public class TableEditableBean extends CustomComponent { public int size() { return current; } - - } + + } TableEditableBean() { /* A layout needed for the example. */ - OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); + OrderedLayout layout = new OrderedLayout( + OrderedLayout.ORIENTATION_VERTICAL); setCompositionRoot(layout); // Create a table. It is by default not editable. final Table table = new Table(); layout.addComponent(table); table.setPageLength(8); - + // Use the custom container as the data source MyContainer myContainer = new MyContainer(); table.setContainerDataSource(myContainer); - + // Add a few items in the table. - for (int i=0; i<5; i++) { + for (int i = 0; i < 5; i++) { // Create the bean - MyBean item = new MyBean(); - item.setText("MyBean " + i); - - // Have an Item that is bound to the bean - BeanItem bitem = new BeanItem(item); - - // Add the item directly to the container using the custom addItem() + MyBean item = new MyBean(); + item.setText("MyBean " + i); + + // Have an Item that is bound to the bean + BeanItem bitem = new BeanItem(item); + + // Add the item directly to the container using the custom addItem() // method. We could otherwise add it to the Table as well, but // the Container interface of Table does not allow adding items - // as such, just item IDs. - myContainer.addItem(bitem); + // as such, just item IDs. + myContainer.addItem(bitem); } - + // Use custom field factory that sets the checkboxes in immediate mode. // This is just for debugging purposes and is not normally necessary. table.setFieldFactory(new MyFieldFactory()); - // Have a check box to switch the table between normal and editable mode. + // Have a check box to switch the table between normal and editable + // mode. final CheckBox switchEditable = new CheckBox("Editable"); switchEditable.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - table.setEditable(((Boolean)event.getProperty().getValue()).booleanValue()); + table.setEditable(((Boolean) event.getProperty().getValue()) + .booleanValue()); } }); switchEditable.setImmediate(true); diff --git a/src/com/itmill/toolkit/tests/book/TableExample.java b/src/com/itmill/toolkit/tests/book/TableExample.java index 80c5dad3b0..4d888eaeae 100644 --- a/src/com/itmill/toolkit/tests/book/TableExample.java +++ b/src/com/itmill/toolkit/tests/book/TableExample.java @@ -26,22 +26,28 @@ public class TableExample extends CustomComponent { layout.addComponent(table); /* Define the names, data types, and default values of columns. */ - table.addContainerProperty("First Name", String.class, "(no first name)"); - table.addContainerProperty("Last Name", String.class, "(no last name)"); - table.addContainerProperty("Year", Integer.class, null); + table.addContainerProperty("First Name", String.class, + "(no first name)"); + table.addContainerProperty("Last Name", String.class, "(no last name)"); + table.addContainerProperty("Year", Integer.class, null); /* We use these entries to generate random items in a table. */ - final String[] firstnames = new String[] { "Donald", "Patty", "Sally", "Douglas" }; - final String[] lastnames = new String[] { "Smith", "Jones", "Adams", "Knuth" }; + final String[] firstnames = new String[] { "Donald", "Patty", "Sally", + "Douglas" }; + final String[] lastnames = new String[] { "Smith", "Jones", "Adams", + "Knuth" }; /* Add some items in the table and assign them an Item ID (IID). */ for (int i = 0; i < 1000; i++) { /* Add a randomly generated item in the Table. */ - table.addItem(new Object[] { - firstnames[(int) (Math.random() * (firstnames.length - 0.01))], - lastnames[(int) (Math.random() * (lastnames.length - 0.01))], - new Integer((int) (1900 + Math.random() * 100)) }, - new Integer(i)); + table + .addItem( + new Object[] { + firstnames[(int) (Math.random() * (firstnames.length - 0.01))], + lastnames[(int) (Math.random() * (lastnames.length - 0.01))], + new Integer( + (int) (1900 + Math.random() * 100)) }, + new Integer(i)); } /* Set the number of items visible in the table. */ @@ -53,17 +59,20 @@ public class TableExample extends CustomComponent { /* Allow selecting items from the table. */ table.setSelectable(true); - - /* When an item is selected, the selection is sent immediately to server. */ + + /* + * When an item is selected, the selection is sent immediately to + * server. + */ table.setImmediate(true); - + /* Handle selection change. */ table.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { current.setValue("Selected: " + table.getValue().toString()); } }); - + layout.addComponent(current); } } diff --git a/src/com/itmill/toolkit/tests/book/TableExample1.java b/src/com/itmill/toolkit/tests/book/TableExample1.java index 52d1513394..cf9ad1d438 100644 --- a/src/com/itmill/toolkit/tests/book/TableExample1.java +++ b/src/com/itmill/toolkit/tests/book/TableExample1.java @@ -17,21 +17,29 @@ public class TableExample1 extends CustomComponent { /* Create the table with a caption. */ Table table = new Table("This is my Table"); - - /* Define the names and data types of columns. - * The "default value" parameter is meaningless here. */ - table.addContainerProperty("First Name", String.class, null); - table.addContainerProperty("Last Name", String.class, null); - table.addContainerProperty("Year", Integer.class, null); + + /* + * Define the names and data types of columns. The "default value" + * parameter is meaningless here. + */ + table.addContainerProperty("First Name", String.class, null); + table.addContainerProperty("Last Name", String.class, null); + table.addContainerProperty("Year", Integer.class, null); /* Add a few items in the table. */ - table.addItem(new Object[] {"Nicolaus","Copernicus",new Integer(1473)}, new Integer(1)); - table.addItem(new Object[] {"Tycho", "Brahe", new Integer(1546)}, new Integer(2)); - table.addItem(new Object[] {"Giordano","Bruno", new Integer(1548)}, new Integer(3)); - table.addItem(new Object[] {"Galileo", "Galilei", new Integer(1564)}, new Integer(4)); - table.addItem(new Object[] {"Johannes","Kepler", new Integer(1571)}, new Integer(5)); - table.addItem(new Object[] {"Isaac", "Newton", new Integer(1643)}, new Integer(6)); - + table.addItem(new Object[] { "Nicolaus", "Copernicus", + new Integer(1473) }, new Integer(1)); + table.addItem(new Object[] { "Tycho", "Brahe", new Integer(1546) }, + new Integer(2)); + table.addItem(new Object[] { "Giordano", "Bruno", new Integer(1548) }, + new Integer(3)); + table.addItem(new Object[] { "Galileo", "Galilei", new Integer(1564) }, + new Integer(4)); + table.addItem(new Object[] { "Johannes", "Kepler", new Integer(1571) }, + new Integer(5)); + table.addItem(new Object[] { "Isaac", "Newton", new Integer(1643) }, + new Integer(6)); + /* Set number of visible rows. */ table.setPageLength(5); diff --git a/src/com/itmill/toolkit/tests/book/TableExample2.java b/src/com/itmill/toolkit/tests/book/TableExample2.java index f82c96c68d..3472300123 100644 --- a/src/com/itmill/toolkit/tests/book/TableExample2.java +++ b/src/com/itmill/toolkit/tests/book/TableExample2.java @@ -14,34 +14,45 @@ import com.itmill.toolkit.ui.Table; public class TableExample2 extends CustomComponent { /* A layout needed for the example. */ OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); - + TableExample2() { setCompositionRoot(layout); /* Create the table with a caption. */ final Table table = new Table(); - - /* Define the names and data types of columns. - * The "default value" parameter is meaningless here. */ - table.addContainerProperty("First Name", String.class, null); - table.addContainerProperty("Last Name", String.class, null); - table.addContainerProperty("Year", Integer.class, null); + + /* + * Define the names and data types of columns. The "default value" + * parameter is meaningless here. + */ + table.addContainerProperty("First Name", String.class, null); + table.addContainerProperty("Last Name", String.class, null); + table.addContainerProperty("Year", Integer.class, null); /* Add a few items in the table. */ - table.addItem(new Object[] {"Nicolaus","Copernicus",new Integer(1473)}, new Integer(1)); - table.addItem(new Object[] {"Tycho", "Brahe", new Integer(1546)}, new Integer(2)); - table.addItem(new Object[] {"Giordano","Bruno", new Integer(1548)}, new Integer(3)); - table.addItem(new Object[] {"Galileo", "Galilei", new Integer(1564)}, new Integer(4)); - table.addItem(new Object[] {"Johannes","Kepler", new Integer(1571)}, new Integer(5)); - table.addItem(new Object[] {"Isaac", "Newton", new Integer(1643)}, new Integer(6)); - + table.addItem(new Object[] { "Nicolaus", "Copernicus", + new Integer(1473) }, new Integer(1)); + table.addItem(new Object[] { "Tycho", "Brahe", new Integer(1546) }, + new Integer(2)); + table.addItem(new Object[] { "Giordano", "Bruno", new Integer(1548) }, + new Integer(3)); + table.addItem(new Object[] { "Galileo", "Galilei", new Integer(1564) }, + new Integer(4)); + table.addItem(new Object[] { "Johannes", "Kepler", new Integer(1571) }, + new Integer(5)); + table.addItem(new Object[] { "Isaac", "Newton", new Integer(1643) }, + new Integer(6)); + /* Set number of visible rows. */ table.setPageLength(5); /* Allow selecting items from the table. */ table.setSelectable(true); - - /* When an item is selected, the selection is sent immediately to server. */ + + /* + * When an item is selected, the selection is sent immediately to + * server. + */ table.setImmediate(true); /* Feedback from selection. */ diff --git a/src/com/itmill/toolkit/tests/book/TableExample3.java b/src/com/itmill/toolkit/tests/book/TableExample3.java index cf20a8bf49..152d0ed4c9 100644 --- a/src/com/itmill/toolkit/tests/book/TableExample3.java +++ b/src/com/itmill/toolkit/tests/book/TableExample3.java @@ -4,14 +4,11 @@ package com.itmill.toolkit.tests.book; -import com.itmill.toolkit.data.Property; -import com.itmill.toolkit.data.Property.ValueChangeEvent; import com.itmill.toolkit.ui.Button; import com.itmill.toolkit.ui.CheckBox; import com.itmill.toolkit.ui.CustomComponent; import com.itmill.toolkit.ui.Label; import com.itmill.toolkit.ui.OrderedLayout; -import com.itmill.toolkit.ui.RichTextArea; import com.itmill.toolkit.ui.Table; import com.itmill.toolkit.ui.TextField; import com.itmill.toolkit.ui.Button.ClickEvent; @@ -19,37 +16,41 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class TableExample3 extends CustomComponent { /* A layout needed for the example. */ OrderedLayout layout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL); - + TableExample3() { setCompositionRoot(layout); - // Create a table and add a style to allow setting the row height in theme. + // Create a table and add a style to allow setting the row height in + // theme. final Table table = new Table(); table.addStyleName("components-inside"); - - /* Define the names and data types of columns. - * The "default value" parameter is meaningless here. */ - table.addContainerProperty("Sum", Label.class, null); - table.addContainerProperty("Is Transferred", CheckBox.class, null); - table.addContainerProperty("Comments", TextField.class, null); - table.addContainerProperty("Details", Button.class, null); - + + /* + * Define the names and data types of columns. The "default value" + * parameter is meaningless here. + */ + table.addContainerProperty("Sum", Label.class, null); + table.addContainerProperty("Is Transferred", CheckBox.class, null); + table.addContainerProperty("Comments", TextField.class, null); + table.addContainerProperty("Details", Button.class, null); + /* Add a few items in the table. */ - for (int i=0; i<100; i++) { + for (int i = 0; i < 100; i++) { // Create the fields for the current table row - Label sumField = new Label(String.format("Sum is <b>$%04.2f</b><br/><i>(VAT incl.)</i>", - new Object[] {new Double(Math.random()*1000)}), - Label.CONTENT_XHTML); + Label sumField = new Label(String.format( + "Sum is <b>$%04.2f</b><br/><i>(VAT incl.)</i>", + new Object[] { new Double(Math.random() * 1000) }), + Label.CONTENT_XHTML); CheckBox transferredField = new CheckBox("is transferred"); - + // Multiline text field. This required modifying the height of the // table row. TextField commentsField = new TextField(); commentsField.setRows(3); - + // The Table item identifier for the row. Integer itemId = new Integer(i); - + // Create a button and handle its click. A Button does not know // the item it is contained in, so we have to store the item // ID as user-defined data. @@ -58,16 +59,16 @@ public class TableExample3 extends CustomComponent { detailsField.addListener(new Button.ClickListener() { public void buttonClick(ClickEvent event) { // Get the item identifier from the user-defined data. - Integer itemId = (Integer)event.getButton().getData(); - getWindow().showNotification("Link "+itemId.intValue()+" clicked."); - } + Integer itemId = (Integer) event.getButton().getData(); + getWindow().showNotification( + "Link " + itemId.intValue() + " clicked."); + } }); detailsField.addStyleName("link"); - + // Create the table row. - table.addItem(new Object[] {sumField, transferredField, - commentsField, detailsField}, - itemId); + table.addItem(new Object[] { sumField, transferredField, + commentsField, detailsField }, itemId); } // Show just three rows because they are so high. @@ -75,8 +76,8 @@ public class TableExample3 extends CustomComponent { // Initially show the 50th item in the top of the table. table.setCurrentPageFirstItemIndex(50); - //table.setCurrentPageFirstItemId(initial); - + // table.setCurrentPageFirstItemId(initial); + layout.addComponent(table); } } diff --git a/src/com/itmill/toolkit/tests/book/TableHuge.java b/src/com/itmill/toolkit/tests/book/TableHuge.java index 411153dc18..9553e7cb9e 100644 --- a/src/com/itmill/toolkit/tests/book/TableHuge.java +++ b/src/com/itmill/toolkit/tests/book/TableHuge.java @@ -23,9 +23,9 @@ public class TableHuge extends CustomComponent { * This is a virtual container that generates the items on the fly when * requested. */ - public class HugeContainer implements Container,Indexed { + public class HugeContainer implements Container, Indexed { int numberofitems; - + public HugeContainer(int numberofitems) { this.numberofitems = numberofitems; } @@ -53,8 +53,9 @@ public class TableHuge extends CustomComponent { public boolean containsId(Object itemId) { if (itemId instanceof Integer) { int pos = ((Integer) itemId).intValue(); - if (pos >= 0 && pos < numberofitems) + if (pos >= 0 && pos < numberofitems) { return true; + } } return false; } @@ -68,7 +69,8 @@ public class TableHuge extends CustomComponent { if (itemId instanceof Integer) { int pos = ((Integer) itemId).intValue(); if (pos >= 0 && pos < numberofitems) { - return new ObjectProperty("This is the item "+pos+" in the huge table"); + return new ObjectProperty("This is the item " + pos + + " in the huge table"); } } return null; @@ -83,10 +85,11 @@ public class TableHuge extends CustomComponent { public Item getItem(Object itemId) { if (itemId instanceof Integer) { - int pos = ((Integer)itemId).intValue(); + int pos = ((Integer) itemId).intValue(); if (pos >= 0 && pos < numberofitems) { Item item = new PropertysetItem(); - item.addItemProperty("id", new ObjectProperty("This is the item "+pos+" in the huge table")); + item.addItemProperty("id", new ObjectProperty( + "This is the item " + pos + " in the huge table")); return item; } } @@ -160,25 +163,27 @@ public class TableHuge extends CustomComponent { } public boolean isLastId(Object itemId) { - return ((Integer) itemId).intValue() == (numberofitems-1); + return ((Integer) itemId).intValue() == (numberofitems - 1); } public Object lastItemId() { - return new Integer(numberofitems-1); + return new Integer(numberofitems - 1); } public Object nextItemId(Object itemId) { int pos = indexOfId(itemId); - if (pos >= numberofitems-1) + if (pos >= numberofitems - 1) { return null; - return getIdByIndex(pos+1); + } + return getIdByIndex(pos + 1); } public Object prevItemId(Object itemId) { int pos = indexOfId(itemId); - if (pos <= 0) + if (pos <= 0) { return null; - return getIdByIndex(pos-1); + } + return getIdByIndex(pos - 1); } } @@ -186,7 +191,7 @@ public class TableHuge extends CustomComponent { Table table = new Table("HUGE table, REALLY HUGE"); table.setContainerDataSource(new HugeContainer(500000)); table.setPageLength(20); - + setCompositionRoot(table); } } diff --git a/src/com/itmill/toolkit/tests/book/WindowOpener.java b/src/com/itmill/toolkit/tests/book/WindowOpener.java index 331da8f953..e33a53cfbf 100644 --- a/src/com/itmill/toolkit/tests/book/WindowOpener.java +++ b/src/com/itmill/toolkit/tests/book/WindowOpener.java @@ -12,25 +12,25 @@ import com.itmill.toolkit.ui.Window; import com.itmill.toolkit.ui.Window.CloseEvent; /** Component contains a button that allows opening a window. */ -public class WindowOpener extends CustomComponent - implements Window.CloseListener { - Window mainwindow; // Reference to main window - Window mywindow; // The window to be opened - Button openbutton; // Button for opening the window +public class WindowOpener extends CustomComponent implements + Window.CloseListener { + Window mainwindow; // Reference to main window + Window mywindow; // The window to be opened + Button openbutton; // Button for opening the window Button closebutton; // A button in the window - Label explanation; // A descriptive text + Label explanation; // A descriptive text public WindowOpener(String label, Window main) { mainwindow = main; /* The component consists of a button that opens the window. */ final VerticalLayout layout = new VerticalLayout(); - + openbutton = new Button("Open Window", this, "openButtonClick"); explanation = new Label("Explanation"); layout.addComponent(openbutton); layout.addComponent(explanation); - + setCompositionRoot(layout); } diff --git a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java b/src/com/itmill/toolkit/tests/book/WindowTestApplication.java index 0affc7a4f6..49bceb89fc 100644 --- a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java +++ b/src/com/itmill/toolkit/tests/book/WindowTestApplication.java @@ -11,9 +11,10 @@ import com.itmill.toolkit.ui.Window; import com.itmill.toolkit.ui.Button.ClickEvent; public class WindowTestApplication extends Application { - Window anotherpage = null; - HashMap windows = new HashMap(); + Window anotherpage = null; + HashMap windows = new HashMap(); + @Override public void init() { final Window main = new Window("Window Test Application"); setMainWindow(main); @@ -36,48 +37,53 @@ public class WindowTestApplication extends Application { new Button.ClickListener() { public void buttonClick(ClickEvent event) { // Open the window. - main.open(new ExternalResource(mywindow.getURL()), "_new"); + main.open(new ExternalResource(mywindow.getURL()), + "_new"); } })); /* Add a link to the second window. */ Link link = new Link("Click to open second window", - new ExternalResource(mywindow.getURL())); + new ExternalResource(mywindow.getURL())); link.setTargetName("_new"); main.addComponent(link); // Add the link manually inside a Label. - main.addComponent(new Label("Second window: <a href='" + mywindow.getURL() - + "' target='_new'>click to open</a>", - Label.CONTENT_XHTML)); - main.addComponent(new Label("The second window can be accessed through URL: " - + mywindow.getURL())); + main.addComponent(new Label("Second window: <a href='" + + mywindow.getURL() + "' target='_new'>click to open</a>", + Label.CONTENT_XHTML)); + main.addComponent(new Label( + "The second window can be accessed through URL: " + + mywindow.getURL())); // Add links to windows that do not yet exist, but are created // dynamically when the URL is called. main.addComponent(new Label("URLs to open item windows:")); final String[] items = new String[] { "mercury", "venus", "earth", "mars", "jupiter", "saturn", "uranus", "neptune" }; - + for (int inx = 0; inx < items.length; inx++) { String item = items[inx]; - // We do not create window objects here, but just links to the windows + // We do not create window objects here, but just links to the + // windows String windowUrl = getURL() + "planet-" + item; - main.addComponent(new Label("A window about '" + item + "': <a href='" + - windowUrl + "' target='_new'>" + windowUrl + - "</a>", Label.CONTENT_XHTML)); + main.addComponent(new Label("A window about '" + item + + "': <a href='" + windowUrl + "' target='_new'>" + + windowUrl + "</a>", Label.CONTENT_XHTML)); } } + @Override public Window getWindow(String name) { if (name.startsWith("planet-")) { String planetName = name.substring("planet-".length()); if (!windows.containsKey(planetName)) { // Create the window object on the fly. Window newWindow = new Window("Yet Another Page"); - newWindow.addComponent(new Label("This window contains details about " + - planetName + ".")); + newWindow.addComponent(new Label( + "This window contains details about " + planetName + + ".")); windows.put(planetName, newWindow); // We must add the window to the application, it is not done diff --git a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java index 2f16f3fe02..a2aa848fb0 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java @@ -57,6 +57,7 @@ public abstract class Feature extends CustomComponent { * Feature component initialization is lazily done when the feature is * attached to application */ + @Override public void attach() { super.attach(); @@ -186,6 +187,7 @@ public abstract class Feature extends CustomComponent { } // Fix for #512 + @Override public String getDescription() { if (description != null && description.getValue() != null) { return description.getValue().toString(); diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java index 6121b3f98b..2481336b8f 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java @@ -35,6 +35,7 @@ public class FeatureBrowser extends CustomComponent implements private final Select themeSelector = new Select(); + @Override public void attach() { if (initialized) { @@ -219,51 +220,61 @@ public class FeatureBrowser extends CustomComponent implements } + @Override public void addComponent(Component c) { // TODO Auto-generated method stub } + @Override public void addListener(ComponentAttachListener listener) { // TODO Auto-generated method stub } + @Override public void addListener(ComponentDetachListener listener) { // TODO Auto-generated method stub } + @Override public Iterator getComponentIterator() { // TODO Auto-generated method stub return null; } + @Override public void moveComponentsFrom(ComponentContainer source) { // TODO Auto-generated method stub } + @Override public void removeAllComponents() { // TODO Auto-generated method stub } + @Override public void removeComponent(Component c) { // TODO Auto-generated method stub } + @Override public void removeListener(ComponentAttachListener listener) { // TODO Auto-generated method stub } + @Override public void removeListener(ComponentDetachListener listener) { // TODO Auto-generated method stub } + @Override public void replaceComponent(Component oldComponent, Component newComponent) { // TODO Auto-generated method stub @@ -280,51 +291,61 @@ public class FeatureBrowser extends CustomComponent implements } + @Override public float getHeight() { // TODO Auto-generated method stub return 0; } + @Override public int getHeightUnits() { // TODO Auto-generated method stub return 0; } + @Override public float getWidth() { // TODO Auto-generated method stub return 0; } + @Override public int getWidthUnits() { // TODO Auto-generated method stub return 0; } + @Override public void setHeight(float height) { // TODO Auto-generated method stub } + @Override public void setHeightUnits(int units) { // TODO Auto-generated method stub } + @Override public void setSizeFull() { // TODO Auto-generated method stub } + @Override public void setSizeUndefined() { // TODO Auto-generated method stub } + @Override public void setWidth(float width) { // TODO Auto-generated method stub } + @Override public void setWidthUnits(int units) { // TODO Auto-generated method stub diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java index be2aac0d30..5c20b9122c 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java @@ -35,6 +35,7 @@ public class FeatureBuffering extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -64,6 +65,7 @@ public class FeatureBuffering extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -71,14 +73,17 @@ public class FeatureBuffering extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java index 05f35cd7d5..0f9624737e 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java @@ -16,6 +16,7 @@ public class FeatureButton extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -37,6 +38,7 @@ public class FeatureButton extends Feature { return l; } + @Override protected String getExampleSrc() { return "Button b = new Button(\"Caption\");\n"; @@ -45,6 +47,7 @@ public class FeatureButton extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "In IT Mill Toolkit, boolean input values are represented by buttons. " + "Buttons may function either as a push buttons or switches. (checkboxes)<br/><br/>" @@ -56,10 +59,12 @@ public class FeatureButton extends Feature { + "the presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Button"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java index 37c94d7a4c..8fae3b40db 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java @@ -40,6 +40,7 @@ public class FeatureContainers extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -70,18 +71,22 @@ public class FeatureContainers extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java index 395328dbb1..158a58d167 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java @@ -27,6 +27,7 @@ public class FeatureCustomLayout extends Feature { + "<br /><br />The default theme handles the styles that are not defined by just drawing " + "the subcomponents with flowlayout."; + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -56,20 +57,24 @@ public class FeatureCustomLayout extends Feature { return l; } + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getExampleSrc() { return "CustomLayout c = new CustomLayout(\"mystyle\");\n" + "c.addComponent(new Label(\"Example description\"),\"label1-location\");\n" + "c.addComponent(new Button(\"Example action\"),\"example-action-location\");\n"; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return "Custom Layout"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java index 562d47d403..efd324e95b 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java @@ -28,6 +28,7 @@ public class FeatureDateField extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -70,11 +71,13 @@ public class FeatureDateField extends Feature { return l; } + @Override protected String getExampleSrc() { return "DateField df = new DateField(\"Caption\");\n" + "df.setValue(new java.util.Date());\n"; } + @Override protected String getDescriptionXHTML() { return "Representing Dates and times and providing a way to select " + "or enter some specific date and/or time is an typical need in " @@ -89,10 +92,12 @@ public class FeatureDateField extends Feature { + "presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "DateField"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java index 380131a653..da2c13c060 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java @@ -16,6 +16,7 @@ public class FeatureEmbedded extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -66,12 +67,14 @@ public class FeatureEmbedded extends Feature { return l; } + @Override protected String getExampleSrc() { return "// Load image from jpg-file, that is in the same package with the application\n" + "Embedded e = new Embedded(\"Image title\",\n" + " new ClassResource(\"image.jpg\", getApplication()));"; } + @Override protected String getDescriptionXHTML() { return "The embedding feature allows for adding images, multimedia and other non-specified " + "content to your application. " @@ -79,10 +82,12 @@ public class FeatureEmbedded extends Feature { + "Actual support for embedded media types is left to the terminal."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Embedded"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java index 94da491433..72fd2d81e1 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java @@ -29,6 +29,7 @@ public class FeatureForm extends Feature implements Select resetLayout = new Select("Restart"); + @Override protected Component getDemoComponent() { if (demo == null) { @@ -146,6 +147,7 @@ public class FeatureForm extends Feature implements } } + @Override protected String getDescriptionXHTML() { return "Form is a flexible, yet simple container for fields. " + " It provides support for any layouts and provides buffering interface for" @@ -167,10 +169,12 @@ public class FeatureForm extends Feature implements + " all the Property-panels in demos are composed of Form-components."; } + @Override protected String getTitle() { return "Form"; } + @Override protected String getImage() { return "icon_demo.png"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java index d0cd83001f..5856395fa2 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java @@ -20,6 +20,7 @@ public class FeatureGridLayout extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -46,6 +47,7 @@ public class FeatureGridLayout extends Feature { return l; } + @Override protected String getExampleSrc() { return "GridLayout gl = new GridLayout(2,2);\n" + "gl.addComponent(new Label(\"Label 1 in GridLayout\"));\n" @@ -57,6 +59,7 @@ public class FeatureGridLayout extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "This feature provides a container that lays out components " + "into a grid of given width and height." @@ -64,10 +67,12 @@ public class FeatureGridLayout extends Feature { + "properties affect the presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "GridLayout"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java index bd880969d9..b6ac096614 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java @@ -30,6 +30,7 @@ public class FeatureItems extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -60,6 +61,7 @@ public class FeatureItems extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -67,14 +69,17 @@ public class FeatureItems extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Introduction of Data Model Item"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java index fc059452ed..5e759fc67b 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java @@ -15,6 +15,7 @@ public class FeatureLabel extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -42,6 +43,7 @@ public class FeatureLabel extends Feature { return l; } + @Override protected String getExampleSrc() { return "Label l = new Label(\"Caption\");\n"; } @@ -49,6 +51,7 @@ public class FeatureLabel extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "Labels components are for captions and plain text. " + "By default, it is a light-weight component for presenting " @@ -63,10 +66,12 @@ public class FeatureLabel extends Feature { + "the presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Label"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java index 2b91a4262b..5a135e03d3 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java @@ -16,6 +16,7 @@ public class FeatureLink extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -40,10 +41,12 @@ public class FeatureLink extends Feature { return l; } + @Override protected String getExampleSrc() { return "Link link = new Link(\"Link caption\",new ExternalResource(\"http://www.itmill.com\"));\n"; } + @Override protected String getDescriptionXHTML() { return "The link feature allows for making refences to both internal and external resources. " + "The link can open the new resource in a new window, allowing for control of the newly " @@ -53,10 +56,12 @@ public class FeatureLink extends Feature { } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Link"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java index 295eedc21b..cc0ca982d7 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java @@ -16,6 +16,7 @@ public class FeatureOrderedLayout extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -44,6 +45,7 @@ public class FeatureOrderedLayout extends Feature { return l; } + @Override protected String getExampleSrc() { return "OrderedLayout ol = new OrderedLayout(OrderedLayout.ORIENTATION_FLOW);\n" + "ol.addComponent(new TextField(\"Textfield caption\"));\n" @@ -54,6 +56,7 @@ public class FeatureOrderedLayout extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "This feature provides a container for laying out components either " + "vertically, horizontally or flowingly. The orientation may be changed " @@ -65,10 +68,12 @@ public class FeatureOrderedLayout extends Feature { + "affect the presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "OrderedLayout"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java b/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java index 1aa4510d87..21006c7ecf 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java @@ -17,6 +17,7 @@ public class FeaturePanel extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -44,12 +45,14 @@ public class FeaturePanel extends Feature { return l; } + @Override protected String getExampleSrc() { return "Panel show = new Panel(\"Panel caption\");\n" + "show.addComponent(new Label(\"This is an example Label component that is added into Panel.\"));"; } + @Override protected String getDescriptionXHTML() { return "Panel is a container for other components, by default it draws a frame around it's " + "extremities and may have a caption to clarify the nature of the contained components' purpose." @@ -57,10 +60,12 @@ public class FeaturePanel extends Feature { + "this layout may be switched on the fly."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Panel"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java index 1107bb5148..2727a1dee7 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java @@ -35,6 +35,7 @@ public class FeatureParameters extends Feature implements URIHandler, params.addContainerProperty("Values", String.class, ""); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -91,16 +92,19 @@ public class FeatureParameters extends Feature implements URIHandler, return l; } + @Override protected String getDescriptionXHTML() { return "This is a demonstration of how URL parameters can be recieved and handled." + "Parameters and URL:s can be received trough the windows by registering " + "URIHandler and ParameterHandler classes window."; } + @Override protected String getImage() { return "parameters.jpg"; } + @Override protected String getTitle() { return "Parameters"; } @@ -110,6 +114,7 @@ public class FeatureParameters extends Feature implements URIHandler, * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); getWindow().addURIHandler(this); @@ -121,6 +126,7 @@ public class FeatureParameters extends Feature implements URIHandler, * * @see com.itmill.toolkit.ui.Component#detach() */ + @Override public void detach() { super.detach(); getWindow().removeURIHandler(this); diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java index 34d8c3efa8..f6e64e4fee 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java @@ -38,6 +38,7 @@ public class FeatureProperties extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -68,18 +69,22 @@ public class FeatureProperties extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java index 80f6d9cc9d..9b118c3fd7 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java @@ -24,6 +24,7 @@ public class FeatureSelect extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -50,6 +51,7 @@ public class FeatureSelect extends Feature { return l; } + @Override protected String getExampleSrc() { return "Select s = new Select(\"Select Car\");\n" + "s.addItem(\"Audi\");\n" + "s.addItem(\"BMW\");\n" @@ -60,6 +62,7 @@ public class FeatureSelect extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "The select component combines two different modes of item selection. " + "Firstly it presents the single selection mode, which is usually represented as " @@ -74,10 +77,12 @@ public class FeatureSelect extends Feature { + " presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Select"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java index 056d5d5d5e..ad9d6a9e59 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java @@ -15,6 +15,7 @@ public class FeatureTabSheet extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -45,6 +46,7 @@ public class FeatureTabSheet extends Feature { return l; } + @Override protected String getExampleSrc() { return "TabSheet ts = new TabSheet();\n" + "ts.addTab(new Label(\"This is an example Label component that is added into Tab 1.\"),\"Tab 1 caption\",null);\n" @@ -52,6 +54,7 @@ public class FeatureTabSheet extends Feature { + "ts.addTab(new Label(\"This is an example Label component that is added into Tab 3.\"),\"Tab 3 caption\",null);"; } + @Override protected String getDescriptionXHTML() { return "A multicomponent container with tabs for switching between them.<br/>" + "In the normal case, one would place a layout component on each tab.<br/><br />" @@ -59,10 +62,12 @@ public class FeatureTabSheet extends Feature { + "the presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "TabSheet"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java index e937a12577..c3d2c75a87 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java @@ -15,6 +15,7 @@ public class FeatureTextField extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout( @@ -36,6 +37,7 @@ public class FeatureTextField extends Feature { return l; } + @Override protected String getExampleSrc() { return "TextField tf = new TextField(\"Caption\");\n" + "tf.setValue(\"Contents\");"; @@ -44,6 +46,7 @@ public class FeatureTextField extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "TextField combines the logic of both the single line text-entry field and the multi-line " + "text-area into one component. " @@ -57,10 +60,12 @@ public class FeatureTextField extends Feature { + "presentation of the component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "TextField"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java index a403b68004..51c58e49a9 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java @@ -58,6 +58,7 @@ public class FeatureTree extends Feature implements Action.Handler { } } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -109,6 +110,7 @@ public class FeatureTree extends Feature implements Action.Handler { return l; } + @Override protected String getExampleSrc() { return "// Create tree\n" + "t = new Tree(\"Organization Structure\");\n" @@ -124,6 +126,7 @@ public class FeatureTree extends Feature implements Action.Handler { + " t.setChildrenAllowed(names[i], false);\n"; } + @Override protected String getDescriptionXHTML() { return "A tree is a natural way to represent datasets that have" + " hierarchical relationships, such as filesystems, message " @@ -142,10 +145,12 @@ public class FeatureTree extends Feature implements Action.Handler { + "affect the presentation of the tree component."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Tree"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java index 2b400f138e..e08a810056 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java @@ -27,6 +27,7 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -48,6 +49,7 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener { return l; } + @Override protected String getExampleSrc() { return "Upload u = new Upload(\"Upload a file:\", uploadReceiver);\n\n" + "public class uploadReceiver \n" @@ -58,16 +60,19 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener { } + @Override protected String getDescriptionXHTML() { return "This demonstrates the use of the Upload component together with the Link component. " + "This implementation does not actually store the file to disk, it only keeps it in a buffer. " + "The example given on the <em>Code Sample</em>-tab on the other hand stores the file to disk and binds the link to that file."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Upload"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java index 0f33ec5ad9..6ade71272b 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java @@ -30,6 +30,7 @@ public class FeatureValidators extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -60,6 +61,7 @@ public class FeatureValidators extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -67,14 +69,17 @@ public class FeatureValidators extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java index 867ba8162a..ea22642705 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java @@ -27,6 +27,7 @@ public class FeatureWindow extends Feature implements Window.CloseListener { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout layoutRoot = new OrderedLayout(); @@ -70,12 +71,14 @@ public class FeatureWindow extends Feature implements Window.CloseListener { return layoutRoot; } + @Override protected String getExampleSrc() { return "Window win = new Window();\n" + "getApplication().addWindow(win);\n"; } + @Override protected String getDescriptionXHTML() { return "The window support in IT Mill Toolkit allows for opening and closing windows, " + "refreshing one window from another (for asynchronous terminals), " @@ -84,10 +87,12 @@ public class FeatureWindow extends Feature implements Window.CloseListener { + "this feature."; } + @Override protected String getImage() { return "icon_demo.png"; } + @Override protected String getTitle() { return "Window"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java b/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java index 912cd2b92e..2f76a00f9f 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class FeaturesApplication extends com.itmill.toolkit.Application { + @Override public void init() { if (getProperty("statistics") != null) { FeatureUtil.setStatistics(true); @@ -22,6 +23,7 @@ public class FeaturesApplication extends com.itmill.toolkit.Application { /** * ErrorEvents are printed to default error stream and not in GUI. */ + @Override public void terminalError( com.itmill.toolkit.terminal.Terminal.ErrorEvent event) { final Throwable e = event.getThrowable(); diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java index f2a42f63e3..a1073840f0 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java @@ -22,6 +22,7 @@ public class IntroBasic extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -52,6 +53,7 @@ public class IntroBasic extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -59,14 +61,17 @@ public class IntroBasic extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return "Introduction of basic UI components"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java index 6a316cabc7..04869e4d5e 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java @@ -23,6 +23,7 @@ public class IntroComponents extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -56,6 +57,7 @@ public class IntroComponents extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -63,14 +65,17 @@ public class IntroComponents extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java index 18b7d90731..be1a730de1 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java @@ -22,6 +22,7 @@ public class IntroDataHandling extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -50,6 +51,7 @@ public class IntroDataHandling extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -57,15 +59,18 @@ public class IntroDataHandling extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return "Please select <em>Embedded Objects</em> or <em>Upload</em>" + " from the menu for more information."; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java index 346e23dab2..d245a7e888 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java @@ -23,6 +23,7 @@ public class IntroDataModel extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -53,6 +54,7 @@ public class IntroDataModel extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -60,14 +62,17 @@ public class IntroDataModel extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java index 368d743d9b..8eac95c269 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java @@ -22,6 +22,7 @@ public class IntroItemContainers extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -52,6 +53,7 @@ public class IntroItemContainers extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -59,14 +61,17 @@ public class IntroItemContainers extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java index 2921a3c75a..4b1990961a 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java @@ -24,6 +24,7 @@ public class IntroLayouts extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -54,6 +55,7 @@ public class IntroLayouts extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -61,14 +63,17 @@ public class IntroLayouts extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return null; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return null; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java index 9e3a256c14..8a197af197 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java @@ -14,6 +14,7 @@ public class IntroTerminal extends Feature { super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -28,6 +29,7 @@ public class IntroTerminal extends Feature { return l; } + @Override protected String getExampleSrc() { return null; } @@ -35,14 +37,17 @@ public class IntroTerminal extends Feature { /** * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML() */ + @Override protected String getDescriptionXHTML() { return ""; } + @Override protected String getImage() { return null; } + @Override protected String getTitle() { return "Introduction for terminals (TODO)"; } diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java index 81b9289c7d..1670ed0dd8 100644 --- a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java +++ b/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java @@ -60,6 +60,7 @@ public class IntroWelcome extends Feature implements URIHandler, super(); } + @Override protected Component getDemoComponent() { final OrderedLayout l = new OrderedLayout(); @@ -90,6 +91,7 @@ public class IntroWelcome extends Feature implements URIHandler, return l; } + @Override protected String getExampleSrc() { return "" + "package com.itmill.toolkit.demo;\n" @@ -103,14 +105,17 @@ public class IntroWelcome extends Feature implements URIHandler, } // not ready yet to give description, see paint instead + @Override protected String getDescriptionXHTML() { return description; } + @Override protected String getImage() { return "icon_intro.png"; } + @Override protected String getTitle() { return "Welcome"; } @@ -120,6 +125,7 @@ public class IntroWelcome extends Feature implements URIHandler, * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); getWindow().addURIHandler(this); @@ -131,6 +137,7 @@ public class IntroWelcome extends Feature implements URIHandler, * * @see com.itmill.toolkit.ui.Component#detach() */ + @Override public void detach() { super.detach(); getWindow().removeURIHandler(this); diff --git a/src/com/itmill/toolkit/tests/robustness/Robustness.java b/src/com/itmill/toolkit/tests/robustness/Robustness.java index 03c1b57aeb..76a45a3639 100644 --- a/src/com/itmill/toolkit/tests/robustness/Robustness.java +++ b/src/com/itmill/toolkit/tests/robustness/Robustness.java @@ -29,6 +29,7 @@ public abstract class Robustness extends com.itmill.toolkit.Application RandomComponents randomComponents = new RandomComponents(); + @Override public void init() { createNewView(); } @@ -56,9 +57,9 @@ public abstract class Robustness extends com.itmill.toolkit.Application } public void buttonClick(ClickEvent event) { - if (event.getButton() == create) + if (event.getButton() == create) { create(); - else if (event.getButton() == remove) { + } else if (event.getButton() == remove) { main.removeAllComponents(); close.removeListener(this); remove.removeListener(this); diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java index 04d64bb972..dc4626aad7 100644 --- a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java +++ b/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java @@ -8,13 +8,15 @@ import com.itmill.toolkit.ui.OrderedLayout; public class RobustnessSimple extends Robustness implements Button.ClickListener { + @Override public void create() { count++; // remove old stressLayout, all dependant components should be now // allowed for garbage collection. - if (stressLayout != null) + if (stressLayout != null) { main.removeComponent(stressLayout); + } // create new stress layout stressLayout = new OrderedLayout(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java b/src/com/itmill/toolkit/tests/tickets/Ticket1225.java index 4cbf1267f0..c119478c43 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1225.java @@ -16,6 +16,7 @@ import com.itmill.toolkit.ui.Window; */ public class Ticket1225 extends Application { + @Override public void init() { final Window mainWin = new Window( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java index 1e51951c62..76102bb2ba 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java @@ -16,6 +16,7 @@ public class Ticket1230 extends Application { private Select selectWithoutNullItem;
private Select selectWithNullItem;
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket124.java b/src/com/itmill/toolkit/tests/tickets/Ticket124.java index 1c839e2029..4d3293769b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket124.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket124.java @@ -14,6 +14,7 @@ public class Ticket124 extends Application { private TextField tf;
private GridLayout gl;
+ @Override
public void init() {
Window w = new Window("#124: Insert & remove row for GridLayout");
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java b/src/com/itmill/toolkit/tests/tickets/Ticket1245.java index b7c0e07179..61800af0a1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1245.java @@ -15,6 +15,7 @@ public class Ticket1245 extends com.itmill.toolkit.Application { TextField f = new TextField();
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java b/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java index 9b99019773..3ced64947b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java @@ -134,6 +134,7 @@ public class Ticket1362Login extends Application { setCompositionRoot(iframe); } + @Override public void attach() { super.attach(); getApplication().addResource(loginPage); @@ -141,6 +142,7 @@ public class Ticket1362Login extends Application { iframe.setSource(loginPage); } + @Override public void detach() { getApplication().removeResource(loginPage); getWindow().removeParameterHandler(paramHandler); @@ -220,6 +222,7 @@ public class Ticket1362Login extends Application { private ExpandLayout el; + @Override public void init() { final Window mainWin = new Window( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java b/src/com/itmill/toolkit/tests/tickets/Ticket1365.java index eb3504dc56..becd0781b0 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1365.java @@ -14,6 +14,7 @@ public class Ticket1365 extends com.itmill.toolkit.Application implements Label status = new Label("ENTER and CTRL-S fires shortcut action.");
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java b/src/com/itmill/toolkit/tests/tickets/Ticket1368.java index 70b5f383ba..b2f137ec8c 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1368.java @@ -12,6 +12,7 @@ public class Ticket1368 extends Application { private Table t; + @Override public void init() { final Window mainWin = new Window("Test app to #1368"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java b/src/com/itmill/toolkit/tests/tickets/Ticket1397.java index 9f34d93d2e..08305830eb 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1397.java @@ -18,6 +18,7 @@ public class Ticket1397 extends Application { Window main; + @Override public void init() { setTheme("default"); main = new Window("PopupView test"); @@ -101,8 +102,9 @@ public class Ticket1397 extends Application { // Fifth test component Table table = new Table("Table for testing purposes"); - for (int i = 0; i < 5; i++) + for (int i = 0; i < 5; i++) { table.addContainerProperty("" + (i + 1), String.class, ""); + } table.addContainerProperty("" + 6, PopupView.class, null); table.addContainerProperty("" + 7, PopupView.class, null); table.setPageLength(20); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java b/src/com/itmill/toolkit/tests/tickets/Ticket1435.java index 65d06db678..d235ac9cef 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1435.java @@ -18,6 +18,7 @@ public class Ticket1435 extends Application { private static final boolean useWorkaround = true; + @Override public void init() { final Window mainWin = new Window("ButtonPanel containing a table test"); @@ -169,6 +170,7 @@ public class Ticket1435 extends Application { container.setHeight("100%"); } + @Override public void setHeight(String height) { root.setHeight(height); lastHeight = root.getHeight(); @@ -176,6 +178,7 @@ public class Ticket1435 extends Application { container.setHeight("100%"); } + @Override public void setWidth(String width) { root.setWidth(width); } @@ -184,6 +187,7 @@ public class Ticket1435 extends Application { root.setWidth(width, unit); } + @Override public void setSizeFull() { setWidth("100%"); setHeight("100%"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java b/src/com/itmill/toolkit/tests/tickets/Ticket1444.java index 8436378b30..9ee7d4772e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1444.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1444 extends Application { + @Override public void init() { final Window mainWin = new Window( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java b/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java index 3e941643f3..62bebb7319 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1465ModalNotification extends Application { + @Override public void init() { final Window mainWin = new Window("ButtonPanel containing a table test"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java index c45c1ceb5c..648aecf2fc 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java @@ -28,14 +28,14 @@ public class Ticket1506_TestContainer implements Container { String.class));
item1.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name 1",
String.class));
- this.items.put(ITEM_1_ID, item1);
+ items.put(ITEM_1_ID, item1);
final PropertysetItem item2 = new PropertysetItem();
item2.addItemProperty(PROPERTY_1_ID, new ObjectProperty("value 2",
String.class));
item2.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name 2",
String.class));
- this.items.put(ITEM_2_ID, item2);
+ items.put(ITEM_2_ID, item2);
}
public Item getItem(Object itemId) {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java index 73a3f6c319..7654eef668 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java @@ -29,7 +29,7 @@ public class Ticket1506_TestContainer2 implements Container { "value " + i, String.class));
item.addItemProperty(PROPERTY_2_ID, new ObjectProperty("name " + i,
String.class));
- this.items.put(String.valueOf(i), item);
+ items.put(String.valueOf(i), item);
}
}
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java b/src/com/itmill/toolkit/tests/tickets/Ticket1519.java index 4f0decf1ef..72ebc5e0bb 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1519.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1519 extends Application { + @Override public void init() { final Window mainWin = new Window("Test app to #1368"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java b/src/com/itmill/toolkit/tests/tickets/Ticket1572.java index 6de0fd56d3..11457b02f6 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1572.java @@ -14,6 +14,7 @@ public class Ticket1572 extends com.itmill.toolkit.Application { private GridLayout gl;
private Label spacingstate;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java b/src/com/itmill/toolkit/tests/tickets/Ticket1581.java index cd880ced9d..a8f65314e5 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1581.java @@ -15,6 +15,7 @@ public class Ticket1581 extends com.itmill.toolkit.Application { private ProgressIndicator poller;
private Thread thread;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
@@ -30,6 +31,7 @@ public class Ticket1581 extends com.itmill.toolkit.Application { thread = new Thread() {
+ @Override
public void run() {
super.run();
while (true) {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java b/src/com/itmill/toolkit/tests/tickets/Ticket1589.java index d97208fad1..9a4767dc2b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1589.java @@ -20,6 +20,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1589 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java b/src/com/itmill/toolkit/tests/tickets/Ticket1598.java index 3c21d25a4d..8b1b819206 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1598.java @@ -16,6 +16,7 @@ public class Ticket1598 extends Application { final MenuBar menuBar = new MenuBar(); + @Override public void init() { setMainWindow(main); setTheme("default"); @@ -66,13 +67,14 @@ public class Ticket1598 extends Application { MenuItem third = (MenuItem) menuBar.getItems().get(2); third.setIcon(new ThemeResource("icons/16/document.png")); - for (int i = 2; i <= 3; i++) + for (int i = 2; i <= 3; i++) { ((MenuItem) menuBar.getItems().get(i)).setCommand(new Command() { public void menuSelected(MenuItem selectedItem) { main.showNotification("Action " + selectedItem.getText()); } }); + } final MenuItem fourth = (MenuItem) menuBar.getItems().get(3); fourth.setText("Toggle animation"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket161.java b/src/com/itmill/toolkit/tests/tickets/Ticket161.java index a3a13bf93c..5369c2397c 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket161.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket161.java @@ -14,6 +14,7 @@ public class Ticket161 extends Application { private Table t; + @Override public void init() { final Window mainWin = new Window("Test app to #1368"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java b/src/com/itmill/toolkit/tests/tickets/Ticket1632.java index 62b7d21bd2..e126c1193e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1632.java @@ -13,6 +13,7 @@ public class Ticket1632 extends Application { private Table t; + @Override public void init() { final Window mainWin = new Window("Test app"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java b/src/com/itmill/toolkit/tests/tickets/Ticket1659.java index 659fbc3f4d..94b222a2bf 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1659.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1659 extends Application { + @Override public void init() { final Window mainWin = new Window(); setMainWindow(mainWin); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java b/src/com/itmill/toolkit/tests/tickets/Ticket1663.java index edbd96f69e..a25741ee5f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1663.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1663 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
Window main = new Window("#1663");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java b/src/com/itmill/toolkit/tests/tickets/Ticket1673.java index 320412d69a..2bfd551799 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1673.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1673 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window("#1673");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java b/src/com/itmill/toolkit/tests/tickets/Ticket1737.java index e36ea3f5ce..ac1ab350f1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1737.java @@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1737 extends Application { Resource slowRes = new ClassResource(Calc.class, "m-bullet-blue.gif", this) { + @Override public DownloadStream getStream() { try { Thread.sleep(4000); @@ -24,6 +25,7 @@ public class Ticket1737 extends Application { } }; + @Override public void init() { final Window main = new Window(getClass().getName().substring( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java b/src/com/itmill/toolkit/tests/tickets/Ticket1767.java index 4b3134a64f..550d3a6d0f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1767.java @@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1767 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java b/src/com/itmill/toolkit/tests/tickets/Ticket1772.java index e0e3f1e8ce..4e9221d0c1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1772.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1772 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java b/src/com/itmill/toolkit/tests/tickets/Ticket1775.java index ca3093855d..403efac2e4 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1775.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1775 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window("#1775");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java index 38f9305d92..102f9c25fa 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java @@ -18,6 +18,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application { LinkedList listOfAllFields = new LinkedList();
+ @Override
public void init() {
final Window main = new Window("#1804");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java b/src/com/itmill/toolkit/tests/tickets/Ticket1805.java index e9a84531d4..b72d3e7e6d 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1805.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1805 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java b/src/com/itmill/toolkit/tests/tickets/Ticket1806.java index a7694952c6..61ef29f396 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1806.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1806 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java b/src/com/itmill/toolkit/tests/tickets/Ticket1811.java index 338b85524b..0075cac4ce 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1811.java @@ -15,6 +15,7 @@ public class Ticket1811 extends com.itmill.toolkit.Application { LinkedList listOfAllFields = new LinkedList();
+ @Override
public void init() {
final Window main = new Window("#1811");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java b/src/com/itmill/toolkit/tests/tickets/Ticket1819.java index 03701ba698..1f03390976 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1819.java @@ -14,6 +14,7 @@ public class Ticket1819 extends com.itmill.toolkit.Application { LinkedList listOfAllFields = new LinkedList();
+ @Override
public void init() {
final Window main = new Window("#1819");
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java index 312c8ca5cb..050f520aa5 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java @@ -16,6 +16,7 @@ public class Ticket1834PanelScrolling extends com.itmill.toolkit.Application { private Panel p;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java b/src/com/itmill/toolkit/tests/tickets/Ticket1857.java index 9fe891e770..5a014de09b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1857.java @@ -13,6 +13,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1857 extends Application implements Handler { + @Override public void init() { setTheme("tests-tickets"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java b/src/com/itmill/toolkit/tests/tickets/Ticket1868.java index e0b0ae3bf0..897ac4aac3 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1868.java @@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1868 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
setMainWindow(new Window("#1868"));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java b/src/com/itmill/toolkit/tests/tickets/Ticket1869.java index 9794015e90..25f97201e6 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1869.java @@ -12,6 +12,7 @@ public class Ticket1869 extends com.itmill.toolkit.Application { LinkedList listOfAllFields = new LinkedList();
+ @Override
public void init() {
GridLayout lo = new GridLayout(2, 1);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java index a5f394d68b..e5b4578693 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1878.java @@ -35,6 +35,7 @@ public class Ticket1878 extends Application { private Button switchToOrderedButton;
private Button switchToFormsButton;
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java b/src/com/itmill/toolkit/tests/tickets/Ticket1902.java index 9779fc9700..89f3148817 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1902.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1902 extends Application { + @Override public void init() { // Main layout and main window diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java b/src/com/itmill/toolkit/tests/tickets/Ticket1904.java index 2c6a86677c..41d10630ab 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1904.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1904 extends Application { + @Override public void init() { setMainWindow(new Window("#1904")); setTheme("tests-tickets"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java b/src/com/itmill/toolkit/tests/tickets/Ticket1916.java index 9cc8eaa20d..1548949ff9 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1916.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1916 extends Application { + @Override public void init() { OrderedLayout test = new OrderedLayout( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java b/src/com/itmill/toolkit/tests/tickets/Ticket1919.java index 9662615e4b..83581bee5e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1919.java @@ -11,6 +11,7 @@ public class Ticket1919 extends com.itmill.toolkit.Application { private GridLayout lo;
private boolean on = true;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java b/src/com/itmill/toolkit/tests/tickets/Ticket1921.java index 5adde6eb27..2e78422277 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1921.java @@ -16,6 +16,7 @@ public class Ticket1921 extends Application implements ParameterHandler { Button button; OrderedLayout outer, inner; + @Override public void init() { outer = new OrderedLayout(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java b/src/com/itmill/toolkit/tests/tickets/Ticket1923.java index 9182a795da..b75b08dbac 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1923.java @@ -11,6 +11,7 @@ public class Ticket1923 extends com.itmill.toolkit.Application { private Panel p;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java b/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java index 9bb7b72b56..ac4d9562d3 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java @@ -14,6 +14,7 @@ public class Ticket1924ThemeChanging extends com.itmill.toolkit.Application { @SuppressWarnings("unused")
private Panel p;
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java index 0f6ee95f38..92c92eeba1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1925.java @@ -5,6 +5,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1925 extends Application {
+ @Override
public void init() {
Window mainWindow = new Window("Test åäö");
setMainWindow(mainWindow);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java b/src/com/itmill/toolkit/tests/tickets/Ticket1934.java index 8d2b8cbd9d..c086f51867 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1934.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1934 extends Application { + @Override public void init() { Window w = new Window( "#1934 : Horizontal ExpandLayout completely broken"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java b/src/com/itmill/toolkit/tests/tickets/Ticket1939.java index 50aaf03c1d..97f6437d9f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1939.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1939 extends Application { + @Override public void init() { Window w = new Window(getClass().getName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java b/src/com/itmill/toolkit/tests/tickets/Ticket1940.java index f485f3f387..347b17878b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1940.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1940 extends Application { + @Override public void init() { final Window w = new Window(getClass().getName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java index 4357a9bac3..e37a393a15 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1953.java @@ -13,6 +13,7 @@ public class Ticket1953 extends Application { public static final String spacerStyle = "test-spacer"; public static final String pageButtonStyle = "test-page-change"; + @Override public void init() { final Window main = new Window(getClass().getName().substring( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java index 496016f4ec..de95399bf8 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966.java @@ -31,6 +31,7 @@ public class Ticket1966 extends Application { names.put(new Integer(TOP), "Top");
}
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java index 5e8f3b1e91..a4e7e24dd1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java @@ -32,6 +32,7 @@ public class Ticket1966_2 extends Application { names.put(new Integer(TOP), "Top");
}
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java index d9f2df08b1..59fc33d3ad 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java @@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1966_3 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java b/src/com/itmill/toolkit/tests/tickets/Ticket1969.java index cc11d040d5..606d571d37 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1969.java @@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket1969 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java b/src/com/itmill/toolkit/tests/tickets/Ticket1970.java index ea40703ddd..6550f0aa76 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1970.java @@ -11,10 +11,12 @@ import com.itmill.toolkit.ui.Window.CloseEvent; public class Ticket1970 extends Application { + @Override public void init() { setMainWindow(createWindow()); } + @Override public Window getWindow(String name) { // If we already have the requested window, use it diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java b/src/com/itmill/toolkit/tests/tickets/Ticket1972.java index 6377b12e1f..5b885f18cd 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1972.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1972 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java b/src/com/itmill/toolkit/tests/tickets/Ticket1973.java index 2c5b2710cd..27a42ffbf8 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1973.java @@ -13,6 +13,7 @@ public class Ticket1973 extends com.itmill.toolkit.Application { Window main = new Window();
Table table = new Table();
+ @Override
public void init() {
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java b/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java index 2769b5e70f..2879213a8e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java @@ -13,6 +13,7 @@ public class Ticket1973_2 extends Application { Window main = new Window(); Table table = new Table(); + @Override public void init() { setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java b/src/com/itmill/toolkit/tests/tickets/Ticket1975.java index c5d0ec90f1..faaf11d9e8 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1975.java @@ -18,6 +18,7 @@ public class Ticket1975 extends Application { private CustomLayout cl1;
private CustomLayout cl2;
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java b/src/com/itmill/toolkit/tests/tickets/Ticket1982.java index 892b8ee538..8f1ef81885 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1982.java @@ -16,6 +16,7 @@ public class Ticket1982 extends Application { private List components = new ArrayList(); + @Override public void init() { Window main = new Window(); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java b/src/com/itmill/toolkit/tests/tickets/Ticket1983.java index f8fafedbfd..977361b6e0 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1983.java @@ -16,6 +16,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; */ public class Ticket1983 extends Application { + @Override public void init() { Window main = new Window("Test for ticket 1983"); main.setLayout(new TestLayout()); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java b/src/com/itmill/toolkit/tests/tickets/Ticket1986.java index ae413c01d4..1a920da655 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1986.java @@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1986 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java b/src/com/itmill/toolkit/tests/tickets/Ticket1991.java index 6ec03cac89..a2f10a753a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1991.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket1991 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java b/src/com/itmill/toolkit/tests/tickets/Ticket1995.java index c079836282..38f041f8fd 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket1995.java @@ -14,6 +14,7 @@ public class Ticket1995 extends Application { private static final Object PROPERTY_1 = "Test";
private Table table;
+ @Override
public void init() {
final Window mainWin = new Window(getClass().getName());
setMainWindow(mainWin);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket20.java b/src/com/itmill/toolkit/tests/tickets/Ticket20.java index d074509f2a..193bb0961f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket20.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket20.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket20 extends Application { + @Override public void init() { final Window mainWin = new Window("Test app for #20"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java b/src/com/itmill/toolkit/tests/tickets/Ticket2001.java index a03268cf57..3ce16c2030 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2001.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2001 extends Application { + @Override public void init() { final Window w = new Window(getClass().getName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java b/src/com/itmill/toolkit/tests/tickets/Ticket2002.java index eec74108a0..596f931570 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2002.java @@ -26,6 +26,7 @@ public class Ticket2002 extends Application { this.long2 = long2;
}
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java b/src/com/itmill/toolkit/tests/tickets/Ticket2009.java index f9eebb02b7..a5f7782d30 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2009.java @@ -17,6 +17,7 @@ public class Ticket2009 extends com.itmill.toolkit.Application { TextField f = new TextField();
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java b/src/com/itmill/toolkit/tests/tickets/Ticket2011.java index eeabff0da2..4fc75fc1e6 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2011.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2011 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java b/src/com/itmill/toolkit/tests/tickets/Ticket2014.java index 4dfd5e7103..f6c66421d4 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2014.java @@ -17,6 +17,7 @@ public class Ticket2014 extends Application { private Button b1;
private Panel panel;
+ @Override
public void init() {
Window w = new Window(getClass().getName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java index aacdfad8aa..e8a2bb3f04 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2021.java @@ -26,6 +26,7 @@ public class Ticket2021 extends Application { private OrderedLayout orderedLayout;
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
w.setLayout(new GridLayout(2, 2));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java b/src/com/itmill/toolkit/tests/tickets/Ticket2022.java index 1e133f8b4b..3bffd0a281 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2022.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2022 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java b/src/com/itmill/toolkit/tests/tickets/Ticket2023.java index 5f2a7c4a37..ebcfd50448 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2023.java @@ -11,6 +11,7 @@ public class Ticket2023 extends com.itmill.toolkit.Application implements AbstractComponent c = new Button(); + @Override public void init() { Window main = new Window(); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java b/src/com/itmill/toolkit/tests/tickets/Ticket2024.java index 97aeafc87e..cbc19fdbc9 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2024.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2024 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java b/src/com/itmill/toolkit/tests/tickets/Ticket2026.java index e4fd0f1b74..bc79cddce4 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2026.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2026 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java index bd4f4bb407..98c80cdd53 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2029.java @@ -19,6 +19,7 @@ public class Ticket2029 extends Application { int DIM1, DIM2;
Random r = new Random();
+ @Override
public void init() {
COMPONENTS = 5;
DIM1 = 504;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java b/src/com/itmill/toolkit/tests/tickets/Ticket2032.java index be0098a884..e0bb9e9407 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2032.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2032 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java b/src/com/itmill/toolkit/tests/tickets/Ticket2033.java index b1d2aae2a7..25dc8a6a33 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2033.java @@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2033 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java b/src/com/itmill/toolkit/tests/tickets/Ticket2037.java index 0392bd99c4..fa8c440a1d 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2037.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket2037 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
Window main = new Window();
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java b/src/com/itmill/toolkit/tests/tickets/Ticket2038.java index b598405acf..34ad22f272 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2038.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window.Notification; public class Ticket2038 extends Application { + @Override public void init() { final Window w = new Window("Testing for #2038"); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java b/src/com/itmill/toolkit/tests/tickets/Ticket2040.java index 0b38ceb734..1a5e96da2b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2040.java @@ -9,6 +9,7 @@ public class Ticket2040 extends com.itmill.toolkit.Application { TextField f = new TextField();
+ @Override
public void init() {
Window main = new Window();
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java b/src/com/itmill/toolkit/tests/tickets/Ticket2042.java index 033e313265..dc81de7614 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2042.java @@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window.Notification; public class Ticket2042 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java b/src/com/itmill/toolkit/tests/tickets/Ticket2043.java index ba2f00fc98..e81fd9aea3 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2043.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2043 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java b/src/com/itmill/toolkit/tests/tickets/Ticket2048.java index 85c63b2446..4ca741edd2 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2048.java @@ -22,6 +22,7 @@ public class Ticket2048 extends Application { private GridLayout gridLayout;
private OrderedLayout orderedLayout;
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java b/src/com/itmill/toolkit/tests/tickets/Ticket2051.java index 8a3014afa0..804b666b70 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2051.java @@ -16,6 +16,7 @@ public class Ticket2051 extends Application { private static final Object P1 = new Object();
private static final Object P2 = new Object();
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java b/src/com/itmill/toolkit/tests/tickets/Ticket2060.java index 604edaf5b4..4fc1089225 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2060.java @@ -14,6 +14,7 @@ public class Ticket2060 extends Application { private Button button2;
private Button button3;
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java b/src/com/itmill/toolkit/tests/tickets/Ticket2062.java index 6545a5d1df..1bb2b285b5 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2062.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2062 extends Application {
private static final Object P1 = new Object();
+ @Override
public void init() {
setMainWindow(new Window("Ticket2062"));
getMainWindow().setSizeFull();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java b/src/com/itmill/toolkit/tests/tickets/Ticket2083.java index 0a415bb498..735fe41677 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2083.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2083 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java index d0d471b190..02cb34b0c2 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2095.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2095 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java b/src/com/itmill/toolkit/tests/tickets/Ticket2098.java index ec19fecd04..1b3b8c82b7 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2098.java @@ -9,6 +9,7 @@ public class Ticket2098 extends Application { private static final String info = "First tab hidden, second should initially be selected";
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java b/src/com/itmill/toolkit/tests/tickets/Ticket2099.java index bf621de657..bf1f654eca 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2099.java @@ -16,6 +16,7 @@ public class Ticket2099 extends Application { private OrderedLayout ol1, ol2, ol3;
private Window popup;
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java b/src/com/itmill/toolkit/tests/tickets/Ticket2101.java index 431572f5a8..c6046b5ca0 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2101.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2101 extends Application {
+ @Override
public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java b/src/com/itmill/toolkit/tests/tickets/Ticket2103.java index 3ea1757ad6..13d45c7aa2 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2103.java @@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2103 extends Application { private Window mainWindow; + @Override public void init() { mainWindow = new Window(getClass().getSimpleName()); mainWindow.setLayout(new ExpandLayout()); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java b/src/com/itmill/toolkit/tests/tickets/Ticket2104.java index 7ed504c891..b4fe9ce7e9 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2104.java @@ -22,6 +22,7 @@ public class Ticket2104 extends Application { Tree tree = new Tree(); Table table = new Table(); + @Override public void init() { Window main = new Window(); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java b/src/com/itmill/toolkit/tests/tickets/Ticket2106.java index 743aaf0969..667454c4c2 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2106.java @@ -22,6 +22,7 @@ public class Ticket2106 extends Application { return msgs; } + @Override public void init() { setMainWindow(new Window("#2106")); getMainWindow().addComponent( diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java b/src/com/itmill/toolkit/tests/tickets/Ticket2107.java index adba8aed27..765c3c274e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2107.java @@ -11,6 +11,7 @@ import com.itmill.toolkit.ui.Window.Notification; public class Ticket2107 extends Application { + @Override public void init() { final Window w = new Window("Testing for #2107"); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java b/src/com/itmill/toolkit/tests/tickets/Ticket2117.java index 2bde267080..dd069b6ed4 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2117.java @@ -7,10 +7,12 @@ import com.itmill.toolkit.ui.Window; public class Ticket2117 extends Application { + @Override public void init() { setMainWindow(createWindow()); } + @Override public Window getWindow(String name) { // If we already have the requested window, use it diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java b/src/com/itmill/toolkit/tests/tickets/Ticket2119.java index 144b631ea4..6e24541b77 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2119.java @@ -18,6 +18,7 @@ public class Ticket2119 extends Application { private ObjectProperty globalValue; + @Override public void init() { globalValue = new ObjectProperty(null, String.class); Window main = createWindow(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java b/src/com/itmill/toolkit/tests/tickets/Ticket2125.java index 46ad984084..e98b34de32 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2125.java @@ -12,6 +12,7 @@ import com.itmill.toolkit.ui.Table.ColumnGenerator; public class Ticket2125 extends Application { + @Override public void init() { setMainWindow(new MainWindow("Ticket2125")); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java b/src/com/itmill/toolkit/tests/tickets/Ticket2126.java index 11dfeddd15..47988502f0 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2126.java @@ -19,6 +19,7 @@ public class Ticket2126 extends com.itmill.toolkit.Application { Window main = new Window();
Table table = new Table();
+ @Override
public void init() {
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java b/src/com/itmill/toolkit/tests/tickets/Ticket2151.java index 52fbe2a9de..908ef2a35a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2151.java @@ -12,6 +12,7 @@ public class Ticket2151 extends Application { private Label status; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java b/src/com/itmill/toolkit/tests/tickets/Ticket2157.java index 2fd4aef8a2..313a38532c 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2157.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2157 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java b/src/com/itmill/toolkit/tests/tickets/Ticket2178.java index 29bbdad04c..d64bbea790 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2178.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2178 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java b/src/com/itmill/toolkit/tests/tickets/Ticket2181.java index cef4aa2f8d..ec58671105 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2181.java @@ -38,6 +38,7 @@ public class Ticket2181 extends Application implements Button.ClickListener { icons.add("icons/64/arrow-up.png"); } + @Override public void init() { setMainWindow(main); OrderedLayout ol; diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java b/src/com/itmill/toolkit/tests/tickets/Ticket2186.java index 463a356363..82d0574533 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2186.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2186 extends Application { + @Override public void init() { Window main = new Window("Quick test"); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java index 32f0546a56..02d53c4704 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2204.java @@ -38,6 +38,7 @@ public class Ticket2204 extends Application { private final List<Class<? extends Component>> classes = new ArrayList<Class<? extends Component>>(); protected RichTextArea formTextArea; + @Override public void init() { classes.add(OrderedLayout.class); classes.add(GridLayout.class); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java b/src/com/itmill/toolkit/tests/tickets/Ticket2221.java index c830b541fd..3f1d60d30d 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2221.java @@ -14,6 +14,7 @@ import com.itmill.toolkit.ui.Button.ClickListener; public class Ticket2221 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java b/src/com/itmill/toolkit/tests/tickets/Ticket2222.java index 628f793351..4cb71e5503 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2222.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2222 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java b/src/com/itmill/toolkit/tests/tickets/Ticket2231.java index 5d993b739d..5958d6f79b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2231.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2231 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java b/src/com/itmill/toolkit/tests/tickets/Ticket2234.java index 97f51c6af7..32febb1e40 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2234.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2234 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java b/src/com/itmill/toolkit/tests/tickets/Ticket2235.java index bd557d98e0..2a0b508fae 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2235.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2235 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java b/src/com/itmill/toolkit/tests/tickets/Ticket2240.java index a016b2ca1b..c5e7dd9f9b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2240.java @@ -23,6 +23,7 @@ public class Ticket2240 extends Application { + " (and state) between several browser windows (the latter is most useful" + " for read-only views).</p><br/><p>This is the end.</p>"; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java b/src/com/itmill/toolkit/tests/tickets/Ticket2242.java index cd5f75dd98..398b95a367 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2242.java @@ -20,6 +20,7 @@ public class Ticket2242 extends Application implements ValueChangeListener { private String valueDataSource = "-"; private ObjectProperty prop; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java b/src/com/itmill/toolkit/tests/tickets/Ticket2244.java index 4b03e9f87c..aa3c38182b 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2244.java @@ -14,6 +14,7 @@ public class Ticket2244 extends Application { Form form; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java b/src/com/itmill/toolkit/tests/tickets/Ticket2267.java index 54eb73a560..85502a01af 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2267.java @@ -12,6 +12,7 @@ public class Ticket2267 extends Application { Label l = new Label("0"); + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java b/src/com/itmill/toolkit/tests/tickets/Ticket2271.java index d338d9f52a..93fec7c053 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2271.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2271 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java b/src/com/itmill/toolkit/tests/tickets/Ticket2279.java index b6c71a6f72..530ee035d0 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2279.java @@ -57,6 +57,7 @@ public class Ticket2279 extends Application { } + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java b/src/com/itmill/toolkit/tests/tickets/Ticket2282.java index 0b0426aa9b..45025bb947 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2282.java @@ -12,6 +12,7 @@ public class Ticket2282 extends Application { private FormLayout layout1; private FormLayout layout2; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java index 7eddbc983e..56c542ceaf 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2287.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2287 extends Ticket2292 {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java b/src/com/itmill/toolkit/tests/tickets/Ticket2289.java index 10e1fba679..abce7f512f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2289.java @@ -17,6 +17,7 @@ public class Ticket2289 extends Application { TabSheet ts = null; Accordion acc = null; + @Override public void init() { Window w = new Window(); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java index c77ee155b5..8ee96c8827 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2294.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Layout.AlignmentHandler; public class Ticket2294 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java b/src/com/itmill/toolkit/tests/tickets/Ticket2296.java index cddc2116a2..99d61acc79 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2296.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2296 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java index 48584a9a30..c8e91d6e2a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2297.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2297 extends Ticket2292 {
+ @Override
public void init() {
final Window main = new Window(getClass().getName().substring(
getClass().getName().lastIndexOf(".") + 1));
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java b/src/com/itmill/toolkit/tests/tickets/Ticket2304.java index 8ae9ea6b1f..2a5e4a31e1 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2304.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2304 extends Application { + @Override public void init() { final Window main = new Window(getClass().getName().substring( getClass().getName().lastIndexOf(".") + 1)); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java b/src/com/itmill/toolkit/tests/tickets/Ticket2310.java index a640b94af4..d00a63ea3a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2310.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket2310 extends Application { + @Override public void init() { final Window main = new Window(getClass().getName().substring( getClass().getName().lastIndexOf(".") + 1)); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java b/src/com/itmill/toolkit/tests/tickets/Ticket2323.java index 2347f418d4..e1dd789b9e 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2323.java @@ -6,6 +6,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2323 extends Application { + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java b/src/com/itmill/toolkit/tests/tickets/Ticket2325.java index 5fa5eb50b8..e4b57e2cbb 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2325.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2325 extends Application { + @Override public void init() { Window main = new Window("Testing...."); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java b/src/com/itmill/toolkit/tests/tickets/Ticket2329.java index b03ebc2715..5ca919cc6f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2329.java @@ -12,6 +12,7 @@ public class Ticket2329 extends Application { private Table table; private VerticalLayout mainLo; + @Override public void init() { Window mainw = new Window(); setMainWindow(mainw); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java b/src/com/itmill/toolkit/tests/tickets/Ticket2337.java index 6747968482..648c88a391 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2337.java @@ -11,6 +11,7 @@ public class Ticket2337 extends Application { GridLayout gl = new GridLayout(3, 1); + @Override public void init() { Window w = new Window(); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java b/src/com/itmill/toolkit/tests/tickets/Ticket2339.java index e6aace8c2c..f9b3ee4d5a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2339.java @@ -10,6 +10,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2339 extends Application { + @Override public void init() { final Window mainWin = new Window(getClass().getSimpleName()); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java b/src/com/itmill/toolkit/tests/tickets/Ticket2341.java index be795549d9..0bc40e51cf 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2341.java @@ -7,6 +7,7 @@ import com.itmill.toolkit.ui.Table; import com.itmill.toolkit.ui.Window; public class Ticket2341 extends com.itmill.toolkit.Application { + @Override public void init() { Window main = new Window(); setMainWindow(main); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java b/src/com/itmill/toolkit/tests/tickets/Ticket2344.java index 892ece1a78..ec4bb14a86 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2344.java @@ -13,6 +13,7 @@ public class Ticket2344 extends Application { private Panel p; + @Override public void init() { Window main = new Window("Quick test"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java b/src/com/itmill/toolkit/tests/tickets/Ticket2347.java index 1b5a6c34bd..6a0ccbea7d 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2347.java @@ -12,6 +12,7 @@ public class Ticket2347 extends Application { private Button b1; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java b/src/com/itmill/toolkit/tests/tickets/Ticket2364.java index 5be2e34d73..814f424fa4 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2364.java @@ -8,6 +8,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket2364 extends Application { + @Override public void init() { Window main = new Window("The Main Window!!!"); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java b/src/com/itmill/toolkit/tests/tickets/Ticket2365.java index c37d5a8495..e02a6636f5 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2365.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Button.ClickEvent; public class Ticket2365 extends Application { + @Override public void init() { final Window mainWin = new Window(getClass().getSimpleName()); diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java b/src/com/itmill/toolkit/tests/tickets/Ticket2406.java index 4f33b59a1b..e2239a92e8 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2406.java @@ -11,6 +11,7 @@ public class Ticket2406 extends Application { private Window w; + @Override public void init() { Window w = new Window(getClass().getSimpleName()); setMainWindow(w); @@ -39,7 +40,7 @@ public class Ticket2406 extends Application { l.addComponent(b); for (int i = 0; i < 5; i++) { - b = new Button("Button number "+(i+2)); + b = new Button("Button number " + (i + 2)); b.setSizeFull(); l.addComponent(b); } diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java index b0f194ceb7..ee8c090f47 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2407.java @@ -1,13 +1,13 @@ package com.itmill.toolkit.tests.tickets;
import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
import com.itmill.toolkit.ui.TextField;
import com.itmill.toolkit.ui.VerticalLayout;
import com.itmill.toolkit.ui.Window;
public class Ticket2407 extends com.itmill.toolkit.Application {
+ @Override
public void init() {
final Window main = new Window("Ticket2407");
setMainWindow(main);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java b/src/com/itmill/toolkit/tests/tickets/Ticket2411.java index edf4ee0798..b7690c375f 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket2411.java @@ -11,15 +11,16 @@ public class Ticket2411 extends Application { public void init() {
Window w = new Window(getClass().getSimpleName());
setMainWindow(w);
-
-// VerticalLayout l = new VerticalLayout();
+
+ // VerticalLayout l = new VerticalLayout();
GridLayout l = new GridLayout();
w.setLayout(l);
-
+
l.setHeight("504px");
-
- for (int i=1; i <= 5; i++) {
- Button b = new Button("Button "+i+" should be 100px or 101px high");
+
+ for (int i = 1; i <= 5; i++) {
+ Button b = new Button("Button " + i
+ + " should be 100px or 101px high");
b.setHeight("100%");
l.addComponent(b);
}
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket677.java b/src/com/itmill/toolkit/tests/tickets/Ticket677.java index 7f542f395f..bba928173a 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket677.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket677.java @@ -38,6 +38,7 @@ public class Ticket677 extends Application { Form form;
Table table;
+ @Override
public void init() {
Window main = new Window();
setMainWindow(main);
@@ -110,6 +111,7 @@ public class Ticket677 extends Application { form.setCaption("Enabled");
form.setFieldFactory(new BaseFieldFactory() {
+ @Override
public Field createField(Item item, Object propertyId,
Component uiContext) {
Field f = super.createField(item, propertyId, uiContext);
@@ -132,6 +134,7 @@ public class Ticket677 extends Application { table.setFieldFactory(new BaseFieldFactory() {
+ @Override
public Field createField(Container container, Object itemId,
Object propertyId, Component uiContext) {
Field f = super.createField(container, itemId, propertyId,
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket736.java b/src/com/itmill/toolkit/tests/tickets/Ticket736.java index ecdd86f61c..8c4993f7ae 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket736.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket736.java @@ -18,6 +18,7 @@ public class Ticket736 extends Application { Address address = new Address(); + @Override public void init() { final Window mainWin = new Window("Test app for #736"); @@ -139,6 +140,7 @@ public class Ticket736 extends Application { this.country = country; } + @Override public String toString() { return name + "; " + street + "; " + city + " " + zip + (state != null ? " " + state : "") + " " + country; diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/itmill/toolkit/tests/tickets/Ticket846.java index ea10dcc020..d7c72b8d86 100644 --- a/src/com/itmill/toolkit/tests/tickets/Ticket846.java +++ b/src/com/itmill/toolkit/tests/tickets/Ticket846.java @@ -9,6 +9,7 @@ import com.itmill.toolkit.ui.Window; public class Ticket846 extends Application { + @Override public void init() { final Window mainWin = new Window("Test app for #846"); diff --git a/src/com/itmill/toolkit/tests/util/LogPrintWriter.java b/src/com/itmill/toolkit/tests/util/LogPrintWriter.java index 80427a995b..3e95060c3f 100644 --- a/src/com/itmill/toolkit/tests/util/LogPrintWriter.java +++ b/src/com/itmill/toolkit/tests/util/LogPrintWriter.java @@ -15,11 +15,13 @@ public class LogPrintWriter extends PrintWriter { super(out); } + @Override public void print(String s) { result.append(s); super.print(s); } + @Override public void write(String s) { result.append(s); super.write(s); diff --git a/src/com/itmill/toolkit/tests/util/RandomComponents.java b/src/com/itmill/toolkit/tests/util/RandomComponents.java index 03555b9ee0..3c61c56f31 100644 --- a/src/com/itmill/toolkit/tests/util/RandomComponents.java +++ b/src/com/itmill/toolkit/tests/util/RandomComponents.java @@ -47,7 +47,7 @@ public class RandomComponents { } public void setRandom(Random rand) { - this.seededRandom = rand; + seededRandom = rand; } /** diff --git a/src/com/itmill/toolkit/ui/AbstractComponentContainer.java b/src/com/itmill/toolkit/ui/AbstractComponentContainer.java index 447623068d..b9e96533e6 100644 --- a/src/com/itmill/toolkit/ui/AbstractComponentContainer.java +++ b/src/com/itmill/toolkit/ui/AbstractComponentContainer.java @@ -71,6 +71,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); @@ -85,6 +86,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent * * @see com.itmill.toolkit.ui.Component#detach() */ + @Override public void detach() { super.detach(); @@ -206,6 +208,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent } } + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (getParent() != null && !getParent().isEnabled()) { diff --git a/src/com/itmill/toolkit/ui/AbstractField.java b/src/com/itmill/toolkit/ui/AbstractField.java index f97eb5e462..c1e266a7b8 100644 --- a/src/com/itmill/toolkit/ui/AbstractField.java +++ b/src/com/itmill/toolkit/ui/AbstractField.java @@ -127,6 +127,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * Paints the field. Don't add a JavaDoc comment here, we use the default * documentation from the implemented interface. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // The tab ordering number @@ -161,6 +162,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * The abstract field is read only also if the data source is in read only * mode. */ + @Override public boolean isReadOnly() { return super.isReadOnly() || (dataSource != null && dataSource.isReadOnly()); @@ -171,6 +173,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean) */ + @Override public void setReadOnly(boolean readOnly) { super.setReadOnly(readOnly); fireReadOnlyStatusChange(); @@ -352,6 +355,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * * @see java.lang.Object#toString() */ + @Override public String toString() { final Object value = getValue(); if (value == null) { @@ -756,6 +760,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * * @see com.itmill.toolkit.ui.AbstractComponent#getErrorMessage() */ + @Override public ErrorMessage getErrorMessage() { // Check validation errors only if automatic validation is enabled. @@ -931,6 +936,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, } } + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); @@ -1024,6 +1030,7 @@ public abstract class AbstractField extends AbstractComponent implements Field, * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); if (delayedFocus) { diff --git a/src/com/itmill/toolkit/ui/AbstractLayout.java b/src/com/itmill/toolkit/ui/AbstractLayout.java index c849c86b39..d250501b46 100644 --- a/src/com/itmill/toolkit/ui/AbstractLayout.java +++ b/src/com/itmill/toolkit/ui/AbstractLayout.java @@ -27,6 +27,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * * @see com.itmill.toolkit.ui.AbstractComponent#getTag() */ + @Override public abstract String getTag(); /* @@ -79,6 +80,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer * com.itmill.toolkit.ui.AbstractComponent#paintContent(com.itmill.toolkit * .terminal.PaintTarget) */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Add margin info. Defaults to false. diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java index 72d0d42249..5fe3d616d9 100644 --- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java +++ b/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java @@ -43,6 +43,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "orderedlayout"; } @@ -54,6 +55,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * @param c * the component to be added. */ + @Override public void addComponent(Component c) { super.addComponent(c); components.add(c); @@ -94,6 +96,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * @param c * the component to be removed. */ + @Override public void removeComponent(Component c) { super.removeComponent(c); components.remove(c); @@ -120,6 +123,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * @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/ui/AbstractSelect.java b/src/com/itmill/toolkit/ui/AbstractSelect.java index 7531132039..61e32e190c 100644 --- a/src/com/itmill/toolkit/ui/AbstractSelect.java +++ b/src/com/itmill/toolkit/ui/AbstractSelect.java @@ -247,6 +247,7 @@ public abstract class AbstractSelect extends AbstractField implements * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Paints field properties @@ -354,6 +355,7 @@ public abstract class AbstractSelect extends AbstractField implements * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); @@ -510,6 +512,7 @@ public abstract class AbstractSelect extends AbstractField implements * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "select"; } @@ -536,6 +539,7 @@ public abstract class AbstractSelect extends AbstractField implements * * @return the Type of the property. */ + @Override public Class getType() { if (isMultiSelect()) { return Set.class; @@ -549,6 +553,7 @@ public abstract class AbstractSelect extends AbstractField implements * * @see com.itmill.toolkit.ui.AbstractField#getValue() */ + @Override public Object getValue() { final Object retValue = super.getValue(); @@ -588,6 +593,7 @@ public abstract class AbstractSelect extends AbstractField implements * the New selected item or collection of selected items. * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object) */ + @Override public void setValue(Object newValue) throws Property.ReadOnlyException, Property.ConversionException { if (newValue == null) { @@ -613,6 +619,7 @@ public abstract class AbstractSelect extends AbstractField implements * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object, * java.lang.Boolean) */ + @Override protected void setValue(Object newValue, boolean repaintIsNotNeeded) throws Property.ReadOnlyException, Property.ConversionException { @@ -1562,6 +1569,7 @@ public abstract class AbstractSelect extends AbstractField implements * * @see com.itmill.toolkit.ui.AbstractField#attach() */ + @Override public void attach() { super.attach(); } @@ -1571,6 +1579,7 @@ public abstract class AbstractSelect extends AbstractField implements * * @see com.itmill.toolkit.ui.AbstractComponent#detach() */ + @Override public void detach() { getCaptionChangeListener().clear(); super.detach(); diff --git a/src/com/itmill/toolkit/ui/Accordion.java b/src/com/itmill/toolkit/ui/Accordion.java index e057bbc6a1..78d9c42743 100644 --- a/src/com/itmill/toolkit/ui/Accordion.java +++ b/src/com/itmill/toolkit/ui/Accordion.java @@ -2,6 +2,7 @@ package com.itmill.toolkit.ui; public class Accordion extends TabSheet { + @Override public String getTag() { return "accordion"; } diff --git a/src/com/itmill/toolkit/ui/BaseFieldFactory.java b/src/com/itmill/toolkit/ui/BaseFieldFactory.java index aa46480261..00e27fdfcc 100644 --- a/src/com/itmill/toolkit/ui/BaseFieldFactory.java +++ b/src/com/itmill/toolkit/ui/BaseFieldFactory.java @@ -13,9 +13,10 @@ import com.itmill.toolkit.data.Property; /** * Default implementation of the the following Field types are used by default: * <p> - * <b>Boolean</b>: Button(switchMode:true).<br/> <b>Date</b>: - * DateField(resolution: day).<br/> <b>Item</b>: Form. <br/> <b>default field - * type</b>: TextField. + * <b>Boolean</b>: Button(switchMode:true).<br/> + * <b>Date</b>: DateField(resolution: day).<br/> + * <b>Item</b>: Form. <br/> + * <b>default field type</b>: TextField. * <p> * * @author IT Mill Ltd. diff --git a/src/com/itmill/toolkit/ui/Button.java b/src/com/itmill/toolkit/ui/Button.java index 2bd0aac48d..e90ac2f12a 100644 --- a/src/com/itmill/toolkit/ui/Button.java +++ b/src/com/itmill/toolkit/ui/Button.java @@ -114,6 +114,7 @@ public class Button extends AbstractField { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "button"; } @@ -128,6 +129,7 @@ public class Button extends AbstractField { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); @@ -144,6 +146,7 @@ public class Button extends AbstractField { * @param source * @param variables */ + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); @@ -222,6 +225,7 @@ public class Button extends AbstractField { * * @see com.itmill.toolkit.ui.AbstractComponent#setImmediate(boolean) */ + @Override public void setImmediate(boolean immediate) { // Push buttons are always immediate super.setImmediate(!isSwitchMode() || immediate); @@ -232,6 +236,7 @@ public class Button extends AbstractField { * * @see com.itmill.toolkit.data.Property#getType() */ + @Override public Class getType() { return Boolean.class; } diff --git a/src/com/itmill/toolkit/ui/CheckBox.java b/src/com/itmill/toolkit/ui/CheckBox.java index cd488b403a..abb8d7bff6 100644 --- a/src/com/itmill/toolkit/ui/CheckBox.java +++ b/src/com/itmill/toolkit/ui/CheckBox.java @@ -89,6 +89,7 @@ public class CheckBox extends Button { super(caption, false); } + @Override public void setSwitchMode(boolean switchMode) throws UnsupportedOperationException { if (this.switchMode && !switchMode) { diff --git a/src/com/itmill/toolkit/ui/ComboBox.java b/src/com/itmill/toolkit/ui/ComboBox.java index 915ad94827..f29b51b7d9 100644 --- a/src/com/itmill/toolkit/ui/ComboBox.java +++ b/src/com/itmill/toolkit/ui/ComboBox.java @@ -43,6 +43,7 @@ public class ComboBox extends Select { setNewItemsAllowed(false);
}
+ @Override
public void setMultiSelect(boolean multiSelect) {
if (multiSelect && !isMultiSelect()) {
throw new UnsupportedOperationException("Multiselect not supported");
diff --git a/src/com/itmill/toolkit/ui/CustomComponent.java b/src/com/itmill/toolkit/ui/CustomComponent.java index dd4b1577c2..b0bc392f26 100644 --- a/src/com/itmill/toolkit/ui/CustomComponent.java +++ b/src/com/itmill/toolkit/ui/CustomComponent.java @@ -102,6 +102,7 @@ public class CustomComponent extends AbstractComponentContainer { /* Basic component features ------------------------------------------ */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (root == null) { throw new IllegalStateException("Composition root must be set to" @@ -140,6 +141,7 @@ public class CustomComponent extends AbstractComponentContainer { this.componentType = componentType; } + @Override public String getTag() { return "customcomponent"; } @@ -180,6 +182,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component) */ + @Override public void addComponent(Component c) { throw new UnsupportedOperationException(); } @@ -189,6 +192,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponentContainer#moveComponentsFrom(com.itmill.toolkit.ui.ComponentContainer) */ + @Override public void moveComponentsFrom(ComponentContainer source) { throw new UnsupportedOperationException(); } @@ -198,6 +202,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeAllComponents() */ + @Override public void removeAllComponents() { throw new UnsupportedOperationException(); } @@ -207,6 +212,7 @@ public class CustomComponent extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component) */ + @Override public void removeComponent(Component c) { throw new UnsupportedOperationException(); } diff --git a/src/com/itmill/toolkit/ui/CustomLayout.java b/src/com/itmill/toolkit/ui/CustomLayout.java index 8b78699c62..826ddfb9b2 100644 --- a/src/com/itmill/toolkit/ui/CustomLayout.java +++ b/src/com/itmill/toolkit/ui/CustomLayout.java @@ -99,6 +99,7 @@ public class CustomLayout extends AbstractLayout { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "customlayout"; } @@ -132,6 +133,7 @@ public class CustomLayout extends AbstractLayout { * @param c * the component to be added. */ + @Override public void addComponent(Component c) { this.addComponent(c, ""); } @@ -142,6 +144,7 @@ public class CustomLayout extends AbstractLayout { * @param c * the component to be removed. */ + @Override public void removeComponent(Component c) { if (c == null) { return; @@ -191,6 +194,7 @@ public class CustomLayout extends AbstractLayout { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); @@ -250,6 +254,7 @@ public class CustomLayout extends AbstractLayout { * @param name * template name */ + @Override public void setStyle(String name) { setTemplateName(name); } @@ -281,6 +286,7 @@ public class CustomLayout extends AbstractLayout { * * @throws UnsupportedOperationException */ + @Override public void setMargin(boolean enabled) { throw new UnsupportedOperationException( "CustomLayout does not support margins."); @@ -293,6 +299,7 @@ public class CustomLayout extends AbstractLayout { * * @throws UnsupportedOperationException */ + @Override public void setMargin(boolean topEnabled, boolean rightEnabled, boolean bottomEnabled, boolean leftEnabled) { throw new UnsupportedOperationException( diff --git a/src/com/itmill/toolkit/ui/DateField.java b/src/com/itmill/toolkit/ui/DateField.java index 7a3d5a00dc..aaa53e3ee1 100644 --- a/src/com/itmill/toolkit/ui/DateField.java +++ b/src/com/itmill/toolkit/ui/DateField.java @@ -179,6 +179,7 @@ public class DateField extends AbstractField { * Paints this component. Don't add a JavaDoc comment here, we use the * default documentation from implemented interface. */ + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); @@ -237,6 +238,7 @@ public class DateField extends AbstractField { * 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 "datefield"; } @@ -246,6 +248,7 @@ public class DateField extends AbstractField { * comment here, we use the default documentation from implemented * interface. */ + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); @@ -333,6 +336,7 @@ public class DateField extends AbstractField { * Gets the edited property's type. Don't add a JavaDoc comment here, we use * the default documentation from implemented interface. */ + @Override public Class getType() { return Date.class; } @@ -342,6 +346,7 @@ public class DateField extends AbstractField { * add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public String toString() { final Date value = (Date) getValue(); if (value != null) { @@ -354,11 +359,13 @@ public class DateField extends AbstractField { * Sets the value of the property. Don't add a JavaDoc comment here, we use * the default documentation from implemented interface. */ + @Override public void setValue(Object newValue) throws Property.ReadOnlyException, Property.ConversionException { setValue(newValue, false); } + @Override public void setValue(Object newValue, boolean repaintIsNotNeeded) throws Property.ReadOnlyException, Property.ConversionException { @@ -383,6 +390,7 @@ public class DateField extends AbstractField { * * @see com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property) */ + @Override public void setPropertyDataSource(Property newDataSource) { if (newDataSource == null || Date.class.isAssignableFrom(newDataSource.getType())) { diff --git a/src/com/itmill/toolkit/ui/Embedded.java b/src/com/itmill/toolkit/ui/Embedded.java index 36a32e1355..cf06205cc1 100644 --- a/src/com/itmill/toolkit/ui/Embedded.java +++ b/src/com/itmill/toolkit/ui/Embedded.java @@ -103,6 +103,7 @@ public class Embedded extends AbstractComponent { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "embedded"; } @@ -110,6 +111,7 @@ public class Embedded extends AbstractComponent { /** * Invoked when the component state should be painted. */ + @Override public void paintContent(PaintTarget target) throws PaintException { switch (type) { diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/itmill/toolkit/ui/Form.java index 6e907b435c..7f431936ed 100644 --- a/src/com/itmill/toolkit/ui/Form.java +++ b/src/com/itmill/toolkit/ui/Form.java @@ -168,11 +168,13 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, } /* Documented in interface */ + @Override public String getTag() { return "form"; } /* Documented in interface */ + @Override public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); layout.paint(target); @@ -191,6 +193,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * the calculation of the error message is separate from validation, because * validation fails also on empty errors. */ + @Override public ErrorMessage getErrorMessage() { // Reimplement the checking of validation error by using @@ -273,6 +276,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Commit changes to the data source Don't add a JavaDoc comment here, we * use the default one from the interface. */ + @Override public void commit() throws Buffered.SourceException { LinkedList problems = null; @@ -327,6 +331,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Discards local changes and refresh values from the data source Don't add * a JavaDoc comment here, we use the default one from the interface. */ + @Override public void discard() throws Buffered.SourceException { LinkedList problems = null; @@ -369,6 +374,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Is the object modified but not committed? Don't add a JavaDoc comment * here, we use the default one from the interface. */ + @Override public boolean isModified() { for (final Iterator i = propertyIds.iterator(); i.hasNext();) { final Field f = (Field) fields.get(i.next()); @@ -384,6 +390,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Is the editor in a read-through mode? Don't add a JavaDoc comment here, * we use the default one from the interface. */ + @Override public boolean isReadThrough() { return readThrough; } @@ -392,6 +399,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Is the editor in a write-through mode? Don't add a JavaDoc comment here, * we use the default one from the interface. */ + @Override public boolean isWriteThrough() { return writeThrough; } @@ -400,6 +408,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Sets the editor's read-through mode to the specified status. Don't add a * JavaDoc comment here, we use the default one from the interface. */ + @Override public void setReadThrough(boolean readThrough) { if (readThrough != this.readThrough) { this.readThrough = readThrough; @@ -413,6 +422,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Sets the editor's read-through mode to the specified status. Don't add a * JavaDoc comment here, we use the default one from the interface. */ + @Override public void setWriteThrough(boolean writeThrough) { if (writeThrough != this.writeThrough) { this.writeThrough = writeThrough; @@ -839,6 +849,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); layout.attach(); @@ -849,6 +860,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.Component#detach() */ + @Override public void detach() { super.detach(); layout.detach(); @@ -859,6 +871,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.data.Validatable#isValid() */ + @Override public boolean isValid() { boolean valid = true; for (final Iterator i = propertyIds.iterator(); i.hasNext();) { @@ -872,6 +885,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.data.Validatable#validate() */ + @Override public void validate() throws InvalidValueException { super.validate(); for (final Iterator i = propertyIds.iterator(); i.hasNext();) { @@ -884,6 +898,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.data.Validatable#isInvalidAllowed() */ + @Override public boolean isInvalidAllowed() { return true; } @@ -893,6 +908,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.data.Validatable#setInvalidAllowed(boolean) */ + @Override public void setInvalidAllowed(boolean invalidValueAllowed) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -903,6 +919,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean) */ + @Override public void setReadOnly(boolean readOnly) { super.setReadOnly(readOnly); for (final Iterator i = propertyIds.iterator(); i.hasNext();) { @@ -939,6 +956,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.AbstractField#getType() */ + @Override public Class getType() { if (getPropertyDataSource() != null) { return getPropertyDataSource().getType(); @@ -953,6 +971,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.AbstractField#setInternalValue(java.lang.Object) */ + @Override protected void setInternalValue(Object newValue) { // Stores the old value final Object oldValue = propertyValue; @@ -1054,6 +1073,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.Component.Focusable#focus() */ + @Override public void focus() { final Field f = getFirstField(); if (f != null) { @@ -1066,6 +1086,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int) */ + @Override public void setTabIndex(int tabIndex) { super.setTabIndex(tabIndex); for (final Iterator i = getItemPropertyIds().iterator(); i.hasNext();) { @@ -1077,6 +1098,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * Setting the form to be immediate also sets all the fields of the form to * the same state. */ + @Override public void setImmediate(boolean immediate) { super.setImmediate(immediate); for (Iterator i = fields.values().iterator(); i.hasNext();) { @@ -1088,6 +1110,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, } /** Form is empty if all of its fields are empty. */ + @Override protected boolean isEmpty() { for (Iterator i = fields.values().iterator(); i.hasNext();) { @@ -1107,6 +1130,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * * Add the validators to form fields instead. */ + @Override public void addValidator(Validator validator) { throw new UnsupportedOperationException(); } @@ -1139,6 +1163,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, formFooter.setParent(this); } + @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); if (getParent() != null && !getParent().isEnabled()) { diff --git a/src/com/itmill/toolkit/ui/FormLayout.java b/src/com/itmill/toolkit/ui/FormLayout.java index d822887fa9..ddff9fa07f 100644 --- a/src/com/itmill/toolkit/ui/FormLayout.java +++ b/src/com/itmill/toolkit/ui/FormLayout.java @@ -27,6 +27,7 @@ public class FormLayout extends OrderedLayout { setMargin(true, false, true, false); } + @Override public String getTag() { return "formlayout"; } diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java index 404955aed4..c2c732a0c0 100644 --- a/src/com/itmill/toolkit/ui/GridLayout.java +++ b/src/com/itmill/toolkit/ui/GridLayout.java @@ -211,7 +211,7 @@ public class GridLayout extends AbstractLayout implements // move one row down, or one row under the area cursorY = (column1 == 0 ? row2 : row1) + 1; } else { - cursorY = row1; + cursorY = row1; } } diff --git a/src/com/itmill/toolkit/ui/Label.java b/src/com/itmill/toolkit/ui/Label.java index 45ec594acd..a58e7027e4 100644 --- a/src/com/itmill/toolkit/ui/Label.java +++ b/src/com/itmill/toolkit/ui/Label.java @@ -148,6 +148,7 @@ public class Label extends AbstractComponent implements Property, * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "label"; } @@ -158,6 +159,7 @@ public class Label extends AbstractComponent implements Property, * @param readOnly * True to enable read-only mode, False to disable it. */ + @Override public void setReadOnly(boolean readOnly) { if (dataSource == null) { throw new IllegalStateException(DATASOURCE_MUST_BE_SET); @@ -171,6 +173,7 @@ public class Label extends AbstractComponent implements Property, * * @return <code>true</code> if the component is in read only mode. */ + @Override public boolean isReadOnly() { if (dataSource == null) { throw new IllegalStateException(DATASOURCE_MUST_BE_SET); @@ -186,6 +189,7 @@ public class Label extends AbstractComponent implements Property, * @throws PaintException * if the Paint Operation fails. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (contentMode != CONTENT_TEXT) { target.addAttribute("mode", CONTENT_MODE_NAME[contentMode]); @@ -244,6 +248,7 @@ public class Label extends AbstractComponent implements Property, /** * @see java.lang.Object#toString() */ + @Override public String toString() { if (dataSource == null) { throw new IllegalStateException(DATASOURCE_MUST_BE_SET); diff --git a/src/com/itmill/toolkit/ui/Link.java b/src/com/itmill/toolkit/ui/Link.java index d9e90c547f..50c1470acd 100644 --- a/src/com/itmill/toolkit/ui/Link.java +++ b/src/com/itmill/toolkit/ui/Link.java @@ -88,6 +88,7 @@ public class Link extends AbstractComponent { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "link"; } @@ -100,6 +101,7 @@ public class Link extends AbstractComponent { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (resource != null) { diff --git a/src/com/itmill/toolkit/ui/ListSelect.java b/src/com/itmill/toolkit/ui/ListSelect.java index 96c7a35b0c..508ac50858 100644 --- a/src/com/itmill/toolkit/ui/ListSelect.java +++ b/src/com/itmill/toolkit/ui/ListSelect.java @@ -79,6 +79,7 @@ public class ListSelect extends AbstractSelect { } } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("type", "list"); // Adds the number of columns diff --git a/src/com/itmill/toolkit/ui/LoginForm.java b/src/com/itmill/toolkit/ui/LoginForm.java index 12c7fdb455..5fab2e1389 100644 --- a/src/com/itmill/toolkit/ui/LoginForm.java +++ b/src/com/itmill/toolkit/ui/LoginForm.java @@ -146,6 +146,7 @@ public class LoginForm extends CustomComponent { .getBytes(); } + @Override public void attach() { super.attach(); getApplication().addResource(loginPage); @@ -153,6 +154,7 @@ public class LoginForm extends CustomComponent { iframe.setSource(loginPage); } + @Override public void detach() { getApplication().removeResource(loginPage); getWindow().removeParameterHandler(paramHandler); diff --git a/src/com/itmill/toolkit/ui/MenuBar.java b/src/com/itmill/toolkit/ui/MenuBar.java index 38162cf6fd..af8d6d7752 100644 --- a/src/com/itmill/toolkit/ui/MenuBar.java +++ b/src/com/itmill/toolkit/ui/MenuBar.java @@ -29,11 +29,13 @@ public class MenuBar extends AbstractComponent { private MenuItem moreItem; /** Tag is the UIDL element name for client-server communications. */ + @Override public java.lang.String getTag() { return "menubar"; } /** Paint (serialize) the component for the client. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Superclass writes any common attributes in the paint target. @@ -108,6 +110,7 @@ public class MenuBar extends AbstractComponent { } /** Deserialize changes received from client. */ + @Override public void changeVariables(Object source, Map variables) { Stack items = new Stack(); boolean found = false; diff --git a/src/com/itmill/toolkit/ui/NativeSelect.java b/src/com/itmill/toolkit/ui/NativeSelect.java index c87deb38f4..2cd78ac699 100644 --- a/src/com/itmill/toolkit/ui/NativeSelect.java +++ b/src/com/itmill/toolkit/ui/NativeSelect.java @@ -59,6 +59,7 @@ public class NativeSelect extends AbstractSelect { return columns; } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("type", "native"); // Adds the number of columns @@ -69,6 +70,7 @@ public class NativeSelect extends AbstractSelect { super.paintContent(target); } + @Override public void setMultiSelect(boolean multiSelect) throws UnsupportedOperationException { if (multiSelect == true) { @@ -76,6 +78,7 @@ public class NativeSelect extends AbstractSelect { } } + @Override public void setNewItemsAllowed(boolean allowNewOptions) throws UnsupportedOperationException { if (allowNewOptions == true) { diff --git a/src/com/itmill/toolkit/ui/OptionGroup.java b/src/com/itmill/toolkit/ui/OptionGroup.java index e7e5b515d9..2ebaaea3ea 100644 --- a/src/com/itmill/toolkit/ui/OptionGroup.java +++ b/src/com/itmill/toolkit/ui/OptionGroup.java @@ -31,6 +31,7 @@ public class OptionGroup extends AbstractSelect { super(caption); } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("type", "optiongroup"); super.paintContent(target); diff --git a/src/com/itmill/toolkit/ui/PopupView.java b/src/com/itmill/toolkit/ui/PopupView.java index 99c29902d4..1847e4eada 100644 --- a/src/com/itmill/toolkit/ui/PopupView.java +++ b/src/com/itmill/toolkit/ui/PopupView.java @@ -146,6 +146,7 @@ public class PopupView extends AbstractComponentContainer { * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeAllComponents() * @throws UnsupportedOperationException */ + @Override public void removeAllComponents() { throw new UnsupportedOperationException(); } @@ -156,6 +157,7 @@ public class PopupView extends AbstractComponentContainer { * @see com.itmill.toolkit.ui.AbstractComponentContainer#moveComponentsFrom(com.itmill.toolkit.ui.ComponentContainer) * @throws UnsupportedOperationException */ + @Override public void moveComponentsFrom(ComponentContainer source) throws UnsupportedOperationException { @@ -168,6 +170,7 @@ public class PopupView extends AbstractComponentContainer { * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component) * @throws UnsupportedOperationException */ + @Override public void addComponent(Component c) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -191,6 +194,7 @@ public class PopupView extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component) */ + @Override public void removeComponent(Component c) throws UnsupportedOperationException { throw new UnsupportedOperationException(); @@ -204,6 +208,7 @@ public class PopupView extends AbstractComponentContainer { /** * @see com.itmill.toolkit.ui.AbstractComponent#getTag() */ + @Override public java.lang.String getTag() { return "popupview"; } @@ -213,6 +218,7 @@ public class PopupView extends AbstractComponentContainer { * * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(com.itmill.toolkit.terminal.PaintTarget) */ + @Override public void paintContent(PaintTarget target) throws PaintException { // Superclass writes any common attributes in the paint target. super.paintContent(target); @@ -256,6 +262,7 @@ public class PopupView extends AbstractComponentContainer { * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { if (variables.containsKey("popupVisibility")) { diff --git a/src/com/itmill/toolkit/ui/ProgressIndicator.java b/src/com/itmill/toolkit/ui/ProgressIndicator.java index 4b7104251c..ea788ac0b2 100644 --- a/src/com/itmill/toolkit/ui/ProgressIndicator.java +++ b/src/com/itmill/toolkit/ui/ProgressIndicator.java @@ -74,6 +74,7 @@ public class ProgressIndicator extends AbstractField implements Property, * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "progressindicator"; } @@ -85,6 +86,7 @@ public class ProgressIndicator extends AbstractField implements Property, * @param readOnly * True to enable read-only mode, False to disable it. */ + @Override public void setReadOnly(boolean readOnly) { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -98,6 +100,7 @@ public class ProgressIndicator extends AbstractField implements Property, * * @return True if the component is in read only mode. */ + @Override public boolean isReadOnly() { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -113,6 +116,7 @@ public class ProgressIndicator extends AbstractField implements Property, * @throws PaintException * if the Paint Operation fails. */ + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("indeterminate", indeterminate); target.addAttribute("pollinginterval", pollingInterval); @@ -126,6 +130,7 @@ public class ProgressIndicator extends AbstractField implements Property, * @return the Value of the ProgressIndicator. * @see com.itmill.toolkit.ui.AbstractField#getValue() */ + @Override public Object getValue() { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -141,6 +146,7 @@ public class ProgressIndicator extends AbstractField implements Property, * the New value of the ProgressIndicator. * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object) */ + @Override public void setValue(Object newValue) { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -151,6 +157,7 @@ public class ProgressIndicator extends AbstractField implements Property, /** * @see com.itmill.toolkit.ui.AbstractField#toString() */ + @Override public String toString() { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -161,6 +168,7 @@ public class ProgressIndicator extends AbstractField implements Property, /** * @see com.itmill.toolkit.ui.AbstractField#getType() */ + @Override public Class getType() { if (dataSource == null) { throw new IllegalStateException("Datasource must be se"); @@ -174,6 +182,7 @@ public class ProgressIndicator extends AbstractField implements Property, * @return the datasource. * @see com.itmill.toolkit.ui.AbstractField#getPropertyDataSource() */ + @Override public Property getPropertyDataSource() { return dataSource; } @@ -185,6 +194,7 @@ public class ProgressIndicator extends AbstractField implements Property, * the new data source. * @see com.itmill.toolkit.ui.AbstractField#setPropertyDataSource(com.itmill.toolkit.data.Property) */ + @Override public void setPropertyDataSource(Property newDataSource) { // Stops listening the old data source changes if (dataSource != null diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java index 48a1217fdd..a778155b75 100644 --- a/src/com/itmill/toolkit/ui/Select.java +++ b/src/com/itmill/toolkit/ui/Select.java @@ -86,6 +86,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (isMultiSelect()) { // background compatibility hack. This object shouldn't be used for @@ -326,6 +327,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { // Selection change @@ -406,6 +408,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { } + @Override public void requestRepaint() { super.requestRepaint(); optionRequest = false; @@ -422,6 +425,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "select"; } @@ -447,6 +451,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { * @param columns * the number of columns to set. */ + @Deprecated public void setColumns(int columns) { if (columns < 0) { columns = 0; @@ -462,6 +467,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering { * @deprecated see setter function * @return */ + @Deprecated public int getColumns() { return columns; } diff --git a/src/com/itmill/toolkit/ui/Slider.java b/src/com/itmill/toolkit/ui/Slider.java index 5123232097..aaefc21163 100644 --- a/src/com/itmill/toolkit/ui/Slider.java +++ b/src/com/itmill/toolkit/ui/Slider.java @@ -81,6 +81,7 @@ public class Slider extends AbstractField { *
* @deprecated
*/
+ @Deprecated
private int size = -1;
/**
@@ -326,6 +327,7 @@ public class Slider extends AbstractField { * @return size in pixels or -1 for auto sizing.
* @deprecated use standard getWidth/getHeight instead
*/
+ @Deprecated
public int getSize() {
return size;
}
@@ -337,6 +339,7 @@ public class Slider extends AbstractField { * in pixels, or -1 auto sizing.
* @deprecated use standard setWidth/setHeight instead
*/
+ @Deprecated
public void setSize(int size) {
this.size = size;
switch (orientation) {
@@ -395,10 +398,12 @@ public class Slider extends AbstractField { * public boolean isArrowsVisible() { return arrows; }
*/
+ @Override
public String getTag() {
return "slider";
}
+ @Override
public void paintContent(PaintTarget target) throws PaintException {
super.paintContent(target);
@@ -444,6 +449,7 @@ public class Slider extends AbstractField { * @param source
* @param variables
*/
+ @Override
public void changeVariables(Object source, Map variables) {
super.changeVariables(source, variables);
if (variables.containsKey("value")) {
@@ -499,6 +505,7 @@ public class Slider extends AbstractField { }
+ @Override
public Class getType() {
return Double.class;
}
diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/itmill/toolkit/ui/TabSheet.java index f334761766..b35e683adf 100644 --- a/src/com/itmill/toolkit/ui/TabSheet.java +++ b/src/com/itmill/toolkit/ui/TabSheet.java @@ -71,6 +71,7 @@ public class TabSheet extends AbstractComponentContainer implements * @param c * the component to be removed. */ + @Override public void removeComponent(Component c) { if (c != null && tabs.contains(c)) { super.removeComponent(c); @@ -95,6 +96,7 @@ public class TabSheet extends AbstractComponentContainer implements * @param c * the component to be added. */ + @Override public void addComponent(Component c) { addTab(c); } @@ -147,6 +149,7 @@ public class TabSheet extends AbstractComponentContainer implements * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "tabsheet"; } @@ -158,6 +161,7 @@ public class TabSheet extends AbstractComponentContainer implements * @param source * the container components are removed from. */ + @Override public void moveComponentsFrom(ComponentContainer source) { for (final Iterator i = source.getComponentIterator(); i.hasNext();) { final Component c = (Component) i.next(); @@ -181,6 +185,7 @@ public class TabSheet extends AbstractComponentContainer implements * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { if (areTabsHidden()) { @@ -343,6 +348,7 @@ public class TabSheet extends AbstractComponentContainer implements * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { if (variables.containsKey("selected")) { setSelectedTab((Component) keyMapper.get((String) variables @@ -523,6 +529,7 @@ public class TabSheet extends AbstractComponentContainer implements } } + @Override public void detach() { super.detach(); paintedTabs.clear(); diff --git a/src/com/itmill/toolkit/ui/Tree.java b/src/com/itmill/toolkit/ui/Tree.java index 2def948c5a..c43033da9c 100644 --- a/src/com/itmill/toolkit/ui/Tree.java +++ b/src/com/itmill/toolkit/ui/Tree.java @@ -189,6 +189,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, return true; } + @Override public void requestRepaint() { super.requestRepaint(); partialUpdate = false; @@ -320,6 +321,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.itmill.toolkit.ui.AbstractComponent#getTag() */ + @Override public String getTag() { return "tree"; } @@ -331,6 +333,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(Object * source, Map variables) */ + @Override public void changeVariables(Object source, Map variables) { if (clickListenerCount > 0 && variables.containsKey("clickedKey")) { @@ -404,6 +407,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(PaintTarget) */ + @Override public void paintContent(PaintTarget target) throws PaintException { initialPaint = false; @@ -677,6 +681,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container) */ + @Override public void setContainerDataSource(Container newDataSource) { if (newDataSource == null) { // Note: using wrapped IndexedContainer to match constructor (super @@ -926,6 +931,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.itmill.toolkit.ui.Select#getVisibleItemIds() */ + @Override public Collection getVisibleItemIds() { final LinkedList visible = new LinkedList(); @@ -969,6 +975,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @see com.itmill.toolkit.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object) */ + @Override public void setNullSelectionItemId(Object nullSelectionItemId) throws UnsupportedOperationException { if (nullSelectionItemId != null) { @@ -984,6 +991,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * if set to true. * @see com.itmill.toolkit.ui.Select#setNewItemsAllowed(boolean) */ + @Override public void setNewItemsAllowed(boolean allowNewOptions) throws UnsupportedOperationException { if (allowNewOptions) { @@ -998,6 +1006,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * if invoked. * @see com.itmill.toolkit.ui.AbstractField#focus() */ + @Override public void focus() throws UnsupportedOperationException { throw new UnsupportedOperationException(); } diff --git a/src/com/itmill/toolkit/ui/TwinColSelect.java b/src/com/itmill/toolkit/ui/TwinColSelect.java index ec0a1ab7bd..0876ec81d8 100644 --- a/src/com/itmill/toolkit/ui/TwinColSelect.java +++ b/src/com/itmill/toolkit/ui/TwinColSelect.java @@ -97,6 +97,7 @@ public class TwinColSelect extends AbstractSelect { setMultiSelect(true); } + @Override public void paintContent(PaintTarget target) throws PaintException { target.addAttribute("type", "twincol"); // Adds the number of columns diff --git a/src/com/itmill/toolkit/ui/Upload.java b/src/com/itmill/toolkit/ui/Upload.java index 43b9274ec5..a6fe4df873 100644 --- a/src/com/itmill/toolkit/ui/Upload.java +++ b/src/com/itmill/toolkit/ui/Upload.java @@ -103,6 +103,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * * @return Component type as string. */ + @Override public String getTag() { return "upload"; } @@ -190,6 +191,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { // NOP @@ -203,6 +205,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * @throws PaintException * if the paint operation failed. */ + @Override public void paintContent(PaintTarget target) throws PaintException { // The field should be focused if (focus) { @@ -943,6 +946,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * @deprecated Use addListener(ProgressListener) instead. * @param progressListener */ + @Deprecated public void setProgressListener(ProgressListener progressListener) { this.progressListener = progressListener; } @@ -954,6 +958,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * @return listener * */ + @Deprecated public ProgressListener getProgressListener() { return progressListener; } @@ -996,6 +1001,7 @@ public class Upload extends AbstractComponent implements Component.Focusable { * * @see com.itmill.toolkit.ui.Component#attach() */ + @Override public void attach() { super.attach(); if (delayedFocus) { diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java index f255d717d2..fd8e9ce902 100644 --- a/src/com/itmill/toolkit/ui/Window.java +++ b/src/com/itmill/toolkit/ui/Window.java @@ -201,6 +201,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * * @return the parent window of the component. */ + @Override public final Window getWindow() { return this; } @@ -212,6 +213,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * * @return the parent application of the component. */ + @Override public final Application getApplication() { if (getParent() == null) { return application; @@ -235,6 +237,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * * @return the Value of property parent. */ + @Override public final Component getParent() { return super.getParent(); } @@ -250,6 +253,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * @param parent * the New value of property parent. */ + @Override public void setParent(Component parent) { super.setParent(parent); } @@ -259,6 +263,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * * @return the Component UIDL tag as string. */ + @Override public String getTag() { return "window"; } @@ -467,6 +472,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * @throws PaintException * if the paint operation failed. */ + @Override public synchronized void paintContent(PaintTarget target) throws PaintException { @@ -846,6 +852,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(java.lang.Object, * java.util.Map) */ + @Override public void changeVariables(Object source, Map variables) { super.changeVariables(source, variables); @@ -1411,6 +1418,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * @deprecated Use {@link #getDescription()} instead. * @return */ + @Deprecated public String getMessage() { return description; } @@ -1419,6 +1427,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * @deprecated Use {@link #setDescription(String)} instead. * @param description */ + @Deprecated public void setMessage(String description) { this.description = description; } |