diff options
Diffstat (limited to 'src/com/vaadin/event')
19 files changed, 40 insertions, 6 deletions
diff --git a/src/com/vaadin/event/ActionManager.java b/src/com/vaadin/event/ActionManager.java index 08e9c85043..64fdeea69b 100644 --- a/src/com/vaadin/event/ActionManager.java +++ b/src/com/vaadin/event/ActionManager.java @@ -75,6 +75,7 @@ public class ActionManager implements Action.Container, Action.Handler, requestRepaint(); // this goes to the new viewer } + @Override public <T extends Action & Action.Listener> void addAction(T action) { if (ownActions == null) { ownActions = new HashSet<Action>(); @@ -84,6 +85,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public <T extends Action & Action.Listener> void removeAction(T action) { if (ownActions != null) { if (ownActions.remove(action)) { @@ -92,6 +94,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public void addActionHandler(Handler actionHandler) { if (actionHandler == this) { // don't add the actionHandler to itself @@ -109,6 +112,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public void removeActionHandler(Action.Handler actionHandler) { if (actionHandlers != null && actionHandlers.contains(actionHandler)) { @@ -206,6 +210,7 @@ public class ActionManager implements Action.Container, Action.Handler, } } + @Override public Action[] getActions(Object target, Object sender) { HashSet<Action> actions = new HashSet<Action>(); if (ownActions != null) { @@ -226,6 +231,7 @@ public class ActionManager implements Action.Container, Action.Handler, return actions.toArray(new Action[actions.size()]); } + @Override public void handleAction(Action action, Object sender, Object target) { if (actionHandlers != null) { Handler[] array = actionHandlers.toArray(new Handler[actionHandlers diff --git a/src/com/vaadin/event/EventRouter.java b/src/com/vaadin/event/EventRouter.java index 49b29de9bb..90c080b860 100644 --- a/src/com/vaadin/event/EventRouter.java +++ b/src/com/vaadin/event/EventRouter.java @@ -35,6 +35,7 @@ public class EventRouter implements MethodEventSource { * events generated by this component. Don't add a JavaDoc comment here, we * use the default documentation from implemented interface. */ + @Override public void addListener(Class<?> eventType, Object object, Method method) { if (listenerList == null) { listenerList = new LinkedHashSet<ListenerMethod>(); @@ -47,6 +48,7 @@ public class EventRouter implements MethodEventSource { * listen events generated by this component. Don't add a JavaDoc comment * here, we use the default documentation from implemented interface. */ + @Override public void addListener(Class<?> eventType, Object object, String methodName) { if (listenerList == null) { listenerList = new LinkedHashSet<ListenerMethod>(); @@ -59,6 +61,7 @@ public class EventRouter implements MethodEventSource { * a JavaDoc comment here, we use the default documentation from implemented * interface. */ + @Override public void removeListener(Class<?> eventType, Object target) { if (listenerList != null) { final Iterator<ListenerMethod> i = listenerList.iterator(); @@ -77,6 +80,7 @@ public class EventRouter implements MethodEventSource { * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void removeListener(Class<?> eventType, Object target, Method method) { if (listenerList != null) { final Iterator<ListenerMethod> i = listenerList.iterator(); @@ -95,6 +99,7 @@ public class EventRouter implements MethodEventSource { * Don't add a JavaDoc comment here, we use the default documentation from * implemented interface. */ + @Override public void removeListener(Class<?> eventType, Object target, String methodName) { diff --git a/src/com/vaadin/event/FieldEvents.java b/src/com/vaadin/event/FieldEvents.java index 20e9fabb36..8f101c1913 100644 --- a/src/com/vaadin/event/FieldEvents.java +++ b/src/com/vaadin/event/FieldEvents.java @@ -7,8 +7,8 @@ package com.vaadin.event; import java.io.Serializable; import java.lang.reflect.Method; -import com.vaadin.terminal.gwt.client.EventId; -import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerRpc; +import com.vaadin.shared.EventId; +import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.Component; import com.vaadin.ui.Component.Event; @@ -261,10 +261,12 @@ public interface FieldEvents { protected abstract void fireEvent(Event event); + @Override public void blur() { fireEvent(new BlurEvent(component)); } + @Override public void focus() { fireEvent(new FocusEvent(component)); } diff --git a/src/com/vaadin/event/ItemClickEvent.java b/src/com/vaadin/event/ItemClickEvent.java index bb41398e8d..0aa0e106c5 100644 --- a/src/com/vaadin/event/ItemClickEvent.java +++ b/src/com/vaadin/event/ItemClickEvent.java @@ -9,7 +9,7 @@ import java.lang.reflect.Method; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.event.MouseEvents.ClickEvent; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.Component; /** diff --git a/src/com/vaadin/event/LayoutEvents.java b/src/com/vaadin/event/LayoutEvents.java index 960fff00c0..602440ea07 100644 --- a/src/com/vaadin/event/LayoutEvents.java +++ b/src/com/vaadin/event/LayoutEvents.java @@ -7,8 +7,8 @@ import java.io.Serializable; import java.lang.reflect.Method; import com.vaadin.event.MouseEvents.ClickEvent; -import com.vaadin.terminal.gwt.client.Connector; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.Connector; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; diff --git a/src/com/vaadin/event/MouseEvents.java b/src/com/vaadin/event/MouseEvents.java index 2327b78f64..fafd44be89 100644 --- a/src/com/vaadin/event/MouseEvents.java +++ b/src/com/vaadin/event/MouseEvents.java @@ -6,7 +6,7 @@ package com.vaadin.event; import java.lang.reflect.Method; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.Component; diff --git a/src/com/vaadin/event/ShortcutListener.java b/src/com/vaadin/event/ShortcutListener.java index 0656ed0e1f..b760cfabe6 100644 --- a/src/com/vaadin/event/ShortcutListener.java +++ b/src/com/vaadin/event/ShortcutListener.java @@ -28,5 +28,6 @@ public abstract class ShortcutListener extends ShortcutAction implements super(shorthandCaption); } + @Override abstract public void handleAction(Object sender, Object target); } diff --git a/src/com/vaadin/event/TransferableImpl.java b/src/com/vaadin/event/TransferableImpl.java index 621ea95bc1..4c973571f7 100644 --- a/src/com/vaadin/event/TransferableImpl.java +++ b/src/com/vaadin/event/TransferableImpl.java @@ -24,18 +24,22 @@ public class TransferableImpl implements Transferable { this.rawVariables = rawVariables; } + @Override public Component getSourceComponent() { return sourceComponent; } + @Override public Object getData(String dataFlavor) { return rawVariables.get(dataFlavor); } + @Override public void setData(String dataFlavor, Object value) { rawVariables.put(dataFlavor, value); } + @Override public Collection<String> getDataFlavors() { return rawVariables.keySet(); } diff --git a/src/com/vaadin/event/dd/TargetDetailsImpl.java b/src/com/vaadin/event/dd/TargetDetailsImpl.java index 27afc32680..4a459777ed 100644 --- a/src/com/vaadin/event/dd/TargetDetailsImpl.java +++ b/src/com/vaadin/event/dd/TargetDetailsImpl.java @@ -29,6 +29,7 @@ public class TargetDetailsImpl implements TargetDetails { this.dropTarget = dropTarget; } + @Override public Object getData(String key) { return data.get(key); } @@ -37,6 +38,7 @@ public class TargetDetailsImpl implements TargetDetails { return data.put(key, value); } + @Override public DropTarget getTarget() { return dropTarget; } diff --git a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java index 52ffab9263..1457ea9df3 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java +++ b/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java @@ -29,6 +29,7 @@ public final class AcceptAll extends ClientSideCriterion { return singleton; } + @Override public boolean accept(DragAndDropEvent dragEvent) { return true; } diff --git a/src/com/vaadin/event/dd/acceptcriteria/And.java b/src/com/vaadin/event/dd/acceptcriteria/And.java index a0340a9cdb..4122d67160 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/And.java +++ b/src/com/vaadin/event/dd/acceptcriteria/And.java @@ -41,6 +41,7 @@ public class And extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { for (ClientSideCriterion crit : criteria) { if (!crit.accept(dragEvent)) { diff --git a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java index 0f4ae2990c..7d2c42ecb0 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java @@ -33,10 +33,12 @@ public abstract class ClientSideCriterion implements Serializable, * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#isClientSideVerifiable * () */ + @Override public final boolean isClientSideVerifiable() { return true; } + @Override public void paint(PaintTarget target) throws PaintException { target.startTag("-ac"); target.addAttribute("name", getIdentifier()); @@ -51,6 +53,7 @@ public abstract class ClientSideCriterion implements Serializable, return getClass().getCanonicalName(); } + @Override public final void paintResponse(PaintTarget target) throws PaintException { // NOP, nothing to do as this is client side verified criterion } diff --git a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 7eb04d9647..4c52698a4a 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -39,6 +39,7 @@ public class ContainsDataFlavor extends ClientSideCriterion { target.addAttribute("p", dataFlavorId); } + @Override public boolean accept(DragAndDropEvent dragEvent) { return dragEvent.getTransferable().getDataFlavors() .contains(dataFlavorId); diff --git a/src/com/vaadin/event/dd/acceptcriteria/Not.java b/src/com/vaadin/event/dd/acceptcriteria/Not.java index 85ff7e9bc9..1ed40a324d 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Not.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Not.java @@ -31,6 +31,7 @@ public class Not extends ClientSideCriterion { acceptCriterion.paint(target); } + @Override public boolean accept(DragAndDropEvent dragEvent) { return !acceptCriterion.accept(dragEvent); } diff --git a/src/com/vaadin/event/dd/acceptcriteria/Or.java b/src/com/vaadin/event/dd/acceptcriteria/Or.java index 077e9114d8..6ad45c54af 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/Or.java +++ b/src/com/vaadin/event/dd/acceptcriteria/Or.java @@ -39,6 +39,7 @@ public class Or extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { for (AcceptCriterion crit : criteria) { if (crit.accept(dragEvent)) { diff --git a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java index 77840bc94f..47f06d434c 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java @@ -31,10 +31,12 @@ public abstract class ServerSideCriterion implements Serializable, private static final long serialVersionUID = 2128510128911628902L; + @Override public final boolean isClientSideVerifiable() { return false; } + @Override public void paint(PaintTarget target) throws PaintException { target.startTag("-ac"); target.addAttribute("name", getIdentifier()); @@ -45,6 +47,7 @@ public abstract class ServerSideCriterion implements Serializable, public void paintContent(PaintTarget target) { } + @Override public void paintResponse(PaintTarget target) throws PaintException { } diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java index d7c47dc915..d4fd20c952 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java +++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java @@ -49,6 +49,7 @@ public class SourceIs extends ClientSideCriterion { target.addAttribute("c", paintedComponents); } + @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java index 454159b3da..a644b858e2 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java +++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java @@ -33,6 +33,7 @@ public class SourceIsTarget extends ClientSideCriterion { private SourceIsTarget() { } + @Override public boolean accept(DragAndDropEvent dragEvent) { if (dragEvent.getTransferable() instanceof TransferableImpl) { Component sourceComponent = ((TransferableImpl) dragEvent diff --git a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java index 641fddc3ea..5df8f3f618 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java +++ b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java @@ -58,6 +58,7 @@ public class TargetDetailIs extends ClientSideCriterion { } } + @Override public boolean accept(DragAndDropEvent dragEvent) { Object data = dragEvent.getTargetDetails().getData(propertyName); return value.equals(data); |