Replace Vector with List and ArrayList

Change-Id: I80b73b653e97904605dc62484a7448f3bfbf7228

diff --git a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
index de6f5d0a9a67ea721c9178ce4f5be0116856848b..129000b3bb19cf8d21727b17f807a892571565ea 100644 (file)
--- a/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
+++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
@@ -24,7 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
-import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -197,7 +196,7 @@ public class ComponentSizeValidator implements Serializable {
         private final boolean invalidHeight;
         private final boolean invalidWidth;
 
-        private final Vector<InvalidLayout> subErrors = new Vector<>();
+        private final List<InvalidLayout> subErrors = new ArrayList<>();
 
         public InvalidLayout(Component component, boolean height,
                 boolean width) {

diff --git a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
index d5276aefaf9c5d4d8ea83fb4ad2e8f01d114c9e1..3d0b7393e64fad05fc4be9fd462dfdee12e44845 100644 (file)
--- a/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
@@ -25,13 +25,14 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
-import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomLayout;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * User Interface Description Language Target.
@@ -728,11 +729,11 @@ public class JsonPaintTarget implements PaintTarget {
     class JsonTag implements Serializable {
         boolean firstField = false;
 
-        Vector<Object> variables = new Vector<>();
+        List<Object> variables = new ArrayList<>();
 
-        Vector<Object> children = new Vector<>();
+        List<Object> children = new ArrayList<>();
 
-        Vector<Object> attr = new Vector<>();
+        List<Object> attr = new ArrayList<>();
 
         StringBuilder data = new StringBuilder();