@@ -678,7 +678,7 @@ public class TableQuery implements QueryDelegate, | |||
/** | |||
* Simple RowIdChangeEvent implementation. | |||
*/ | |||
public class RowIdChangeEvent extends EventObject implements | |||
public static class RowIdChangeEvent extends EventObject implements | |||
QueryDelegate.RowIdChangeEvent { | |||
private final RowId oldId; | |||
private final RowId newId; |
@@ -144,7 +144,7 @@ public interface FieldEvents { | |||
* @since 6.2 | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class FocusEvent extends Component.Event { | |||
public static class FocusEvent extends Component.Event { | |||
/** | |||
* Identifier for event that can be used in {@link EventRouter} | |||
@@ -184,7 +184,7 @@ public interface FieldEvents { | |||
* @since 6.2 | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class BlurEvent extends Component.Event { | |||
public static class BlurEvent extends Component.Event { | |||
/** | |||
* Identifier for event that can be used in {@link EventRouter} | |||
@@ -243,6 +243,7 @@ public interface FieldEvents { | |||
* @since 6.5 | |||
*/ | |||
public static abstract class TextChangeEvent extends Component.Event { | |||
public TextChangeEvent(Component source) { | |||
super(source); | |||
} |
@@ -43,7 +43,7 @@ public interface MouseEvents { | |||
* @see ClickListener | |||
* @since 6.2 | |||
*/ | |||
public class ClickEvent extends Component.Event { | |||
public static class ClickEvent extends Component.Event { | |||
public static final int BUTTON_LEFT = MouseEventDetails.BUTTON_LEFT; | |||
public static final int BUTTON_MIDDLE = MouseEventDetails.BUTTON_MIDDLE; | |||
public static final int BUTTON_RIGHT = MouseEventDetails.BUTTON_RIGHT; | |||
@@ -202,7 +202,7 @@ public interface MouseEvents { | |||
* @author Vaadin Ltd. | |||
* @since 6.2 | |||
*/ | |||
public class DoubleClickEvent extends Component.Event { | |||
public static class DoubleClickEvent extends Component.Event { | |||
public DoubleClickEvent(Component source) { | |||
super(source); |
@@ -54,7 +54,7 @@ public class Page implements Serializable { | |||
/** | |||
* Event that is fired when a browser window containing a uI is resized. | |||
*/ | |||
public class BrowserWindowResizeEvent extends EventObject { | |||
public static class BrowserWindowResizeEvent extends EventObject { | |||
private final int width; | |||
private final int height; | |||
@@ -233,7 +233,7 @@ public class Page implements Serializable { | |||
/** | |||
* Event fired when uri fragment changes. | |||
*/ | |||
public class FragmentChangedEvent extends EventObject { | |||
public static class FragmentChangedEvent extends EventObject { | |||
/** | |||
* The new uri fragment |
@@ -19,6 +19,7 @@ package com.vaadin.ui; | |||
import java.io.Serializable; | |||
import java.util.Collection; | |||
import java.util.Collections; | |||
import java.util.EventObject; | |||
import java.util.HashMap; | |||
import java.util.HashSet; | |||
import java.util.Iterator; | |||
@@ -1612,7 +1613,8 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
protected void firePropertySetChange() { | |||
if (propertySetEventListeners != null | |||
&& !propertySetEventListeners.isEmpty()) { | |||
final Container.PropertySetChangeEvent event = new PropertySetChangeEvent(); | |||
final Container.PropertySetChangeEvent event = new PropertySetChangeEvent( | |||
this); | |||
final Object[] listeners = propertySetEventListeners.toArray(); | |||
for (int i = 0; i < listeners.length; i++) { | |||
((Container.PropertySetChangeListener) listeners[i]) | |||
@@ -1627,7 +1629,8 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
*/ | |||
protected void fireItemSetChange() { | |||
if (itemSetEventListeners != null && !itemSetEventListeners.isEmpty()) { | |||
final Container.ItemSetChangeEvent event = new ItemSetChangeEvent(); | |||
final Container.ItemSetChangeEvent event = new ItemSetChangeEvent( | |||
this); | |||
final Object[] listeners = itemSetEventListeners.toArray(); | |||
for (int i = 0; i < listeners.length; i++) { | |||
((Container.ItemSetChangeListener) listeners[i]) | |||
@@ -1640,8 +1643,12 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
/** | |||
* Implementation of item set change event. | |||
*/ | |||
private class ItemSetChangeEvent implements Serializable, | |||
Container.ItemSetChangeEvent { | |||
private static class ItemSetChangeEvent extends EventObject implements | |||
Serializable, Container.ItemSetChangeEvent { | |||
private ItemSetChangeEvent(Container source) { | |||
super(source); | |||
} | |||
/** | |||
* Gets the Property where the event occurred. | |||
@@ -1650,7 +1657,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
*/ | |||
@Override | |||
public Container getContainer() { | |||
return AbstractSelect.this; | |||
return (Container) getSource(); | |||
} | |||
} | |||
@@ -1658,9 +1665,13 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
/** | |||
* Implementation of property set change event. | |||
*/ | |||
private class PropertySetChangeEvent implements | |||
private static class PropertySetChangeEvent extends EventObject implements | |||
Container.PropertySetChangeEvent, Serializable { | |||
private PropertySetChangeEvent(Container source) { | |||
super(source); | |||
} | |||
/** | |||
* Retrieves the Container whose contents have been modified. | |||
* | |||
@@ -1668,7 +1679,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
*/ | |||
@Override | |||
public Container getContainer() { | |||
return AbstractSelect.this; | |||
return (Container) getSource(); | |||
} | |||
} |
@@ -392,8 +392,8 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { | |||
* Allowed units are UNITS_PERCENTAGE and UNITS_PIXELS | |||
*/ | |||
public void setMaxSplitPosition(float pos, Unit unit) { | |||
setSplitPositionLimits(getSplitterState().minPosition, posMinUnit, | |||
pos, unit); | |||
setSplitPositionLimits(getSplitterState().minPosition, posMinUnit, pos, | |||
unit); | |||
} | |||
/** | |||
@@ -492,7 +492,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { | |||
public void splitterClick(SplitterClickEvent event); | |||
} | |||
public class SplitterClickEvent extends ClickEvent { | |||
public static class SplitterClickEvent extends ClickEvent { | |||
public SplitterClickEvent(Component source, | |||
MouseEventDetails mouseEventDetails) { |
@@ -570,7 +570,7 @@ public abstract class AbstractTextField extends AbstractField<String> implements | |||
return textChangeEventTimeout; | |||
} | |||
public class TextChangeEventImpl extends TextChangeEvent { | |||
public static class TextChangeEventImpl extends TextChangeEvent { | |||
private String curText; | |||
private int cursorPosition; | |||
@@ -108,7 +108,7 @@ public class Button extends AbstractComponent implements | |||
* @author Vaadin Ltd. | |||
* @since 3.0 | |||
*/ | |||
public class ClickEvent extends Component.Event { | |||
public static class ClickEvent extends Component.Event { | |||
private final MouseEventDetails details; | |||
@@ -670,7 +670,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { | |||
* @see Component.Listener | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class Event extends EventObject { | |||
public static class Event extends EventObject { | |||
/** | |||
* Constructs a new event with the specified source component. | |||
@@ -860,7 +860,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { | |||
* </p> | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class ErrorEvent extends Event { | |||
public static class ErrorEvent extends Event { | |||
private final ErrorMessage message; | |||
@@ -174,7 +174,7 @@ public interface ComponentContainer extends HasComponents { | |||
* Component attach event sent when a component is attached to container. | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class ComponentAttachEvent extends Component.Event { | |||
public static class ComponentAttachEvent extends Component.Event { | |||
private final Component component; | |||
@@ -218,7 +218,7 @@ public interface ComponentContainer extends HasComponents { | |||
* Component detach event sent when a component is detached from container. | |||
*/ | |||
@SuppressWarnings("serial") | |||
public class ComponentDetachEvent extends Component.Event { | |||
public static class ComponentDetachEvent extends Component.Event { | |||
private final Component component; | |||
@@ -108,7 +108,7 @@ public class LoginForm extends CustomComponent { | |||
String value = (parameters.get(key))[0]; | |||
params.put(key, value); | |||
} | |||
LoginEvent event = new LoginEvent(params); | |||
LoginEvent event = new LoginEvent(LoginForm.this, params); | |||
fireEvent(event); | |||
return true; | |||
} | |||
@@ -200,12 +200,12 @@ public class LoginForm extends CustomComponent { | |||
/** | |||
* This event is sent when login form is submitted. | |||
*/ | |||
public class LoginEvent extends Event { | |||
public static class LoginEvent extends Event { | |||
private Map<String, String> params; | |||
private LoginEvent(Map<String, String> params) { | |||
super(LoginForm.this); | |||
private LoginEvent(Component source, Map<String, String> params) { | |||
super(source); | |||
this.params = params; | |||
} | |||
@@ -20,10 +20,10 @@ import java.lang.reflect.Method; | |||
import java.util.Iterator; | |||
import java.util.Map; | |||
import com.vaadin.server.LegacyComponent; | |||
import com.vaadin.server.LegacyPaint; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.LegacyComponent; | |||
/** | |||
* | |||
@@ -421,7 +421,7 @@ public class PopupView extends AbstractComponentContainer implements | |||
* event with {@link #getPopupView()}. | |||
* | |||
*/ | |||
public class PopupVisibilityEvent extends Event { | |||
public static class PopupVisibilityEvent extends Event { | |||
public PopupVisibilityEvent(PopupView source) { | |||
super(source); |
@@ -32,11 +32,11 @@ import com.vaadin.event.FieldEvents.FocusListener; | |||
import com.vaadin.event.FieldEvents.FocusNotifier; | |||
import com.vaadin.server.ErrorMessage; | |||
import com.vaadin.server.KeyMapper; | |||
import com.vaadin.server.LegacyComponent; | |||
import com.vaadin.server.LegacyPaint; | |||
import com.vaadin.server.PaintException; | |||
import com.vaadin.server.PaintTarget; | |||
import com.vaadin.server.Resource; | |||
import com.vaadin.server.LegacyComponent; | |||
import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; | |||
import com.vaadin.shared.ui.tabsheet.TabsheetConstants; | |||
import com.vaadin.ui.Component.Focusable; | |||
@@ -743,7 +743,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, | |||
* @author Vaadin Ltd. | |||
* @since 3.0 | |||
*/ | |||
public class SelectedTabChangeEvent extends Component.Event { | |||
public static class SelectedTabChangeEvent extends Component.Event { | |||
/** | |||
* New instance of selected tab change event |
@@ -299,7 +299,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, | |||
} | |||
} | |||
public class CloseEvent extends Component.Event { | |||
public static class CloseEvent extends Component.Event { | |||
/** | |||
* | |||
@@ -422,7 +422,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, | |||
* (e.g. the browser window is resized). The frequency may vary across | |||
* browsers. | |||
*/ | |||
public class ResizeEvent extends Component.Event { | |||
public static class ResizeEvent extends Component.Event { | |||
/** | |||
* |
@@ -56,8 +56,7 @@ public class UriFragmentManagerTest extends TestCase { | |||
navigator.navigateTo("test"); | |||
control.replay(); | |||
FragmentChangedEvent event = page.new FragmentChangedEvent(page, | |||
"oldtest"); | |||
FragmentChangedEvent event = new FragmentChangedEvent(page, "oldtest"); | |||
manager.fragmentChanged(event); | |||
} | |||
} |