Make private nested class constructor visibility public or package to prevent the...

svn changeset:14080/svn branch:6.4

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 61df7c9f9abfce3ab2d842e5decdc7fd2129def1..872bdc99bac518d8f2673f03063f791d5ea30ba7 100644 (file)
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -1347,7 +1347,7 @@ public abstract class Application implements URIHandler,
         /**
          * Use {@link CustomizedSystemMessages} to customize
          */
-        private SystemMessages() {
+        SystemMessages() {
 
         }
 

diff --git a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 4dca5cf52bb61216ca2ccd6a724773c68395843e..f429cdc256f42b7a68ac33921b83f9922394508b 100644 (file)
--- a/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -67,7 +67,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
             Comparator<Object>, Serializable {
         private final Collection<?> itemIds;
 
-        private ListedItemsFirstComparator(Collection<?> itemIds) {
+        public ListedItemsFirstComparator(Collection<?> itemIds) {
             this.itemIds = itemIds;
         }
 

diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java
index 1c9671d52d63c2ffc4713da37319625f9dfcb040..7460a84b7f742c75fb03728c527b74d9869d135b 100644 (file)
--- a/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/src/com/vaadin/data/util/FilesystemContainer.java
@@ -596,7 +596,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Constructs a FileItem from a existing file.
          */
-        private FileItem(File file) {
+        FileItem(File file) {
             this.file = file;
         }
 

diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index 2f6bae98512cf5ebb4a01e8d8f6fb7e914f093da..e4dd54e276bda98361b5b471b4782fdb78c12890 100644 (file)
--- a/src/com/vaadin/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -747,7 +747,7 @@ public class IndexedContainer implements Container.Indexed,
     private class PropertySetChangeEvent extends EventObject implements
             Container.PropertySetChangeEvent, Serializable {
 
-        private PropertySetChangeEvent(IndexedContainer source) {
+        public PropertySetChangeEvent(IndexedContainer source) {
             super(source);
         }
 
@@ -813,7 +813,7 @@ public class IndexedContainer implements Container.Indexed,
     private class PropertyValueChangeEvent extends EventObject implements
             Property.ValueChangeEvent, Serializable {
 
-        private PropertyValueChangeEvent(Property source) {
+        public PropertyValueChangeEvent(Property source) {
             super(source);
         }
 
@@ -1068,7 +1068,7 @@ public class IndexedContainer implements Container.Indexed,
          * @param itemId
          *            the Item ID of the new Item.
          */
-        private IndexedContainerItem(Object itemId) {
+        IndexedContainerItem(Object itemId) {
 
             // Gets the item contents from the host
             if (itemId == null) {
@@ -1212,7 +1212,7 @@ public class IndexedContainer implements Container.Indexed,
          *            the list that contains the Item to contain the new
          *            Property.
          */
-        private IndexedContainerProperty(Object itemId, Object propertyId) {
+        public IndexedContainerProperty(Object itemId, Object propertyId) {
             if (itemId == null || propertyId == null) {
                 // Null ids are not accepted
                 throw new NullPointerException(

diff --git a/src/com/vaadin/data/util/PropertysetItem.java b/src/com/vaadin/data/util/PropertysetItem.java
index 83eb15b6ad3942b7429682bf5b4c37f9b41f4e72..825934c831c9b876c9b053015bb6e9eab38e35de 100644 (file)
--- a/src/com/vaadin/data/util/PropertysetItem.java
+++ b/src/com/vaadin/data/util/PropertysetItem.java
@@ -166,7 +166,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
     private class PropertySetChangeEvent extends EventObject implements
             Item.PropertySetChangeEvent {
 
-        private PropertySetChangeEvent(Item source) {
+        public PropertySetChangeEvent(Item source) {
             super(source);
         }
 

diff --git a/src/com/vaadin/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java
index 96788947a915e2fd748acb175d5b181ee78e1e3c..351d4af6971f5b46b0eafe73f9fa1947d528ede8 100644 (file)
--- a/src/com/vaadin/data/util/QueryContainer.java
+++ b/src/com/vaadin/data/util/QueryContainer.java
@@ -498,7 +498,7 @@ public class QueryContainer implements Container, Container.Ordered,
 
         Object id;
 
-        private Row(Object rowId) {
+        Row(Object rowId) {
             id = rowId;
         }
 

diff --git a/src/com/vaadin/event/ListenerMethod.java b/src/com/vaadin/event/ListenerMethod.java
index b294dbf86d5e7614e6f438ea94e4783c48384e51..ec7ee6a2cf919f8f4771f6f1bfa3d4551c9344e4 100644 (file)
--- a/src/com/vaadin/event/ListenerMethod.java
+++ b/src/com/vaadin/event/ListenerMethod.java
@@ -596,7 +596,7 @@ public class ListenerMethod implements EventListener, Serializable {
 
         private String message;
 
-        private MethodException(String message, Throwable cause) {
+        MethodException(String message, Throwable cause) {
             super(message);
             this.cause = cause;
         }

diff --git a/src/com/vaadin/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 510536a12b62b285f72e73ddc2fcf9db830d4b45..80a3a2f91c8a4116680cce4c6fbe4724ea415cb1 100644 (file)
--- a/src/com/vaadin/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -1891,7 +1891,7 @@ public abstract class AbstractSelect extends AbstractField implements
         public static VerticalLocationIs MIDDLE = new VerticalLocationIs(
                 VerticalDropLocation.MIDDLE);
 
-        private VerticalLocationIs(VerticalDropLocation l) {
+        VerticalLocationIs(VerticalDropLocation l) {
             super("detail", l.name());
         }
     }

diff --git a/src/com/vaadin/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java
index e06fb321e3366cae5fbff31fa4c7b3f4a59b04cb..25f829145cde4f0cfe9880d2b01f1b20dda7f126 100644 (file)
--- a/src/com/vaadin/ui/CustomComponent.java
+++ b/src/com/vaadin/ui/CustomComponent.java
@@ -156,6 +156,11 @@ public class CustomComponent extends AbstractComponentContainer {
             Serializable {
         boolean first = getCompositionRoot() != null;
 
+        public ComponentIterator() {
+            // needed to prevent generation of non-serializable access
+            // constructor classes as this nested class is private
+        }
+
         public boolean hasNext() {
             return first;
         }

diff --git a/src/com/vaadin/ui/SplitPanel.java b/src/com/vaadin/ui/SplitPanel.java
index d38dc06f9e1299141aa92d06047dc213859c3876..3385376e79e2ea63e4f113f5ffb682c688a704ab 100644 (file)
--- a/src/com/vaadin/ui/SplitPanel.java
+++ b/src/com/vaadin/ui/SplitPanel.java
@@ -73,6 +73,11 @@ public class SplitPanel extends AbstractLayout {
 
         int i = 0;
 
+        public ComponentIterator() {
+            // needed to prevent generation of non-serializable access
+            // constructor classes as this nested class is private
+        }
+
         public boolean hasNext() {
             if (i < (firstComponent == null ? 0 : 1)
                     + (secondComponent == null ? 0 : 1)) {

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 866c2d0c3437c37ede8e5c8e1e200aa51960c855..bb5dc89238ee8f4ee81fa65a46bc96f9d251fbd4 100644 (file)
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -994,7 +994,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
          * @param border
          *            The border style of the target window
          */
-        private OpenResource(Resource resource, String name, int width,
+        public OpenResource(Resource resource, String name, int width,
                 int height, int border) {
             this.resource = resource;
             this.name = name;