aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/itmill/toolkit/ui')
-rw-r--r--src/com/itmill/toolkit/ui/AbstractComponentContainer.java3
-rw-r--r--src/com/itmill/toolkit/ui/AbstractField.java7
-rw-r--r--src/com/itmill/toolkit/ui/AbstractLayout.java2
-rw-r--r--src/com/itmill/toolkit/ui/AbstractOrderedLayout.java4
-rw-r--r--src/com/itmill/toolkit/ui/AbstractSelect.java9
-rw-r--r--src/com/itmill/toolkit/ui/Accordion.java1
-rw-r--r--src/com/itmill/toolkit/ui/BaseFieldFactory.java7
-rw-r--r--src/com/itmill/toolkit/ui/Button.java5
-rw-r--r--src/com/itmill/toolkit/ui/CheckBox.java1
-rw-r--r--src/com/itmill/toolkit/ui/ComboBox.java1
-rw-r--r--src/com/itmill/toolkit/ui/CustomComponent.java6
-rw-r--r--src/com/itmill/toolkit/ui/CustomLayout.java7
-rw-r--r--src/com/itmill/toolkit/ui/DateField.java8
-rw-r--r--src/com/itmill/toolkit/ui/Embedded.java2
-rw-r--r--src/com/itmill/toolkit/ui/Form.java25
-rw-r--r--src/com/itmill/toolkit/ui/FormLayout.java1
-rw-r--r--src/com/itmill/toolkit/ui/GridLayout.java2
-rw-r--r--src/com/itmill/toolkit/ui/Label.java5
-rw-r--r--src/com/itmill/toolkit/ui/Link.java2
-rw-r--r--src/com/itmill/toolkit/ui/ListSelect.java1
-rw-r--r--src/com/itmill/toolkit/ui/LoginForm.java2
-rw-r--r--src/com/itmill/toolkit/ui/MenuBar.java3
-rw-r--r--src/com/itmill/toolkit/ui/NativeSelect.java3
-rw-r--r--src/com/itmill/toolkit/ui/OptionGroup.java1
-rw-r--r--src/com/itmill/toolkit/ui/PopupView.java7
-rw-r--r--src/com/itmill/toolkit/ui/ProgressIndicator.java10
-rw-r--r--src/com/itmill/toolkit/ui/Select.java6
-rw-r--r--src/com/itmill/toolkit/ui/Slider.java7
-rw-r--r--src/com/itmill/toolkit/ui/TabSheet.java7
-rw-r--r--src/com/itmill/toolkit/ui/Tree.java9
-rw-r--r--src/com/itmill/toolkit/ui/TwinColSelect.java1
-rw-r--r--src/com/itmill/toolkit/ui/Upload.java6
-rw-r--r--src/com/itmill/toolkit/ui/Window.java9
33 files changed, 166 insertions, 4 deletions
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;
}