Convert nested data model event classes to static where possible.

7 files changed, 13 insertions, 13 deletions

diff --git a/src/com/vaadin/data/util/AbstractProperty.java b/src/com/vaadin/data/util/AbstractProperty.java
index bc421755a9..15015337c1 100644
--- a/src/com/vaadin/data/util/AbstractProperty.java
+++ b/src/com/vaadin/data/util/AbstractProperty.java
@@ -91,8 +91,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
      * An <code>Event</code> object specifying the Property whose read-only
      * status has been changed.
      */
-    protected class ReadOnlyStatusChangeEvent extends java.util.EventObject
-            implements Property.ReadOnlyStatusChangeEvent {
+    protected static class ReadOnlyStatusChangeEvent extends
+            java.util.EventObject implements Property.ReadOnlyStatusChangeEvent {
 
         /**
          * Constructs a new read-only status change event for this object.
@@ -159,8 +159,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
      * An <code>Event</code> object specifying the Property whose value has been
      * changed.
      */
-    private class ValueChangeEvent extends java.util.EventObject implements
-            Property.ValueChangeEvent {
+    private static class ValueChangeEvent extends java.util.EventObject
+            implements Property.ValueChangeEvent {
 
         /**
          * Constructs a new value change event for this object.
diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index b7e72c3467..1655238358 100644
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -425,7 +425,7 @@ public class IndexedContainer extends
      * @VERSION@
      * @since 3.0
      */
-    public class ItemSetChangeEvent extends BaseItemSetChangeEvent {
+    public static class ItemSetChangeEvent extends BaseItemSetChangeEvent {
 
         private final int addedItemIndex;
 
@@ -455,7 +455,7 @@ public class IndexedContainer extends
      * @VERSION@
      * @since 3.0
      */
-    private class PropertyValueChangeEvent extends EventObject implements
+    private static class PropertyValueChangeEvent extends EventObject implements
             Property.ValueChangeEvent, Serializable {
 
         private PropertyValueChangeEvent(Property source) {
@@ -786,7 +786,7 @@ public class IndexedContainer extends
      * @VERSION@
      * @since 3.0
      */
-    private class IndexedContainerProperty implements Property,
+    private class IndexedContainerProperty implements Property<Object>,
             Property.ValueChangeNotifier {
 
         /**
diff --git a/src/com/vaadin/data/util/PropertysetItem.java b/src/com/vaadin/data/util/PropertysetItem.java
index 321342eb64..6cef452653 100644
--- a/src/com/vaadin/data/util/PropertysetItem.java
+++ b/src/com/vaadin/data/util/PropertysetItem.java
@@ -163,7 +163,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
      * @VERSION@
      * @since 3.0
      */
-    private class PropertySetChangeEvent extends EventObject implements
+    private static class PropertySetChangeEvent extends EventObject implements
             Item.PropertySetChangeEvent {
 
         private PropertySetChangeEvent(Item source) {
diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 110fd32913..66639a7579 100644
--- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -1435,7 +1435,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * Simple ItemSetChangeEvent implementation.
      */
     @SuppressWarnings("serial")
-    public class ItemSetChangeEvent extends EventObject implements
+    public static class ItemSetChangeEvent extends EventObject implements
             Container.ItemSetChangeEvent {
 
         private ItemSetChangeEvent(SQLContainer source) {
diff --git a/src/com/vaadin/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index 0f209ce04d..bde34c979c 100644
--- a/src/com/vaadin/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -981,8 +981,8 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * @VERSION@
      * @since 3.0
      */
-    public class ReadOnlyStatusChangeEvent extends Component.Event implements
-            Property.ReadOnlyStatusChangeEvent, Serializable {
+    public static class ReadOnlyStatusChangeEvent extends Component.Event
+            implements Property.ReadOnlyStatusChangeEvent, Serializable {
 
         /**
          * New instance of text change event.
diff --git a/src/com/vaadin/ui/Field.java b/src/com/vaadin/ui/Field.java
index 5cc81a9e92..b4fb6047a7 100644
--- a/src/com/vaadin/ui/Field.java
+++ b/src/com/vaadin/ui/Field.java
@@ -69,7 +69,7 @@ public interface Field<T> extends Component, BufferedValidatable, Property<T>,
      * @since 3.0
      */
     @SuppressWarnings("serial")
-    public class ValueChangeEvent extends Component.Event implements
+    public static class ValueChangeEvent extends Component.Event implements
             Property.ValueChangeEvent {
 
         /**
diff --git a/src/com/vaadin/ui/Label.java b/src/com/vaadin/ui/Label.java
index 9bae47dbae..5397875e60 100644
--- a/src/com/vaadin/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -418,7 +418,7 @@ public class Label extends AbstractComponent implements Property,
      * @VERSION@
      * @since 3.0
      */
-    public class ValueChangeEvent extends Component.Event implements
+    public static class ValueChangeEvent extends Component.Event implements
             Property.ValueChangeEvent {
 
         /**