diff options
Diffstat (limited to 'src/com/itmill/toolkit/terminal')
37 files changed, 97 insertions, 7 deletions
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(); } |