Remove unneeded .toArray() (#10131)

Use for each loop.

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
index da6ff62b929d6bd030e8a2fe021d4512ef8fdadd..ad995fa20a6e70b3b75d650b50932e6030b5be6f 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
@@ -593,8 +593,7 @@ public class HierarchicalContainer extends IndexedContainer
     public boolean removeItemRecursively(Object itemId) {
         disableContentsChangeEvents();
         try {
-            boolean removeItemRecursively = removeItemRecursively(this, itemId);
-            return removeItemRecursively;
+            return removeItemRecursively(this, itemId);
         } finally {
             enableAndFireContentsChangeEvents();
         }

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
index 98f2deecac00b55deca1bf71a5a0ac35111a7ce2..fd1c768e9f1c6089136ea42aae2ff39057a9f984 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
@@ -550,7 +550,6 @@ public class IndexedContainer
                 }
             }
         }
-
     }
 
     @Override

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java
index ea8fa1c5281445abaae9c8c36e14c0b4b8e3156f..747a0eea51b78562700b601d41ba586492f62bc0 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java
@@ -657,11 +657,10 @@ public class Form extends AbstractField<Object>
      *         (and only if) the return value is <code>true</code>.
      */
     public boolean removeAllProperties() {
-        final Object[] properties = propertyIds.toArray();
         boolean success = true;
 
-        for (int i = 0; i < properties.length; i++) {
-            if (!removeItemProperty(properties[i])) {
+        for (Object property : propertyIds.toArray()) {
+            if (!removeItemProperty(property)) {
                 success = false;
             }
         }
@@ -809,13 +808,12 @@ public class Form extends AbstractField<Object>
 
         // Move fields from previous layout
         if (getLayout() != null) {
-            final Object[] properties = propertyIds.toArray();
-            for (int i = 0; i < properties.length; i++) {
-                Field<?> f = getField(properties[i]);
+            for (Object property : propertyIds) {
+                Field<?> f = getField(property);
                 detachField(f);
                 if (layout instanceof CustomLayout) {
                     ((CustomLayout) layout).addComponent(f,
-                            properties[i].toString());
+                            property.toString());
                 } else {
                     layout.addComponent(f);
                 }

diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index e6c45ae9c320f100f87bd4a3bd085dfd4e29f015..a0f16839b1fcd8c506457376ab36eb391d350bd0 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -51,7 +51,7 @@ public class TreeDragStart extends TestBase {
 
         tree.setContainerDataSource(createTreeContent());
         tree.setItemCaptionMode(Tree.ITEM_CAPTION_MODE_EXPLICIT_DEFAULTS_ID);
-        for (Object item : tree.getItemIds().toArray()) {
+        for (Object item : tree.getItemIds()) {
             tree.setItemCaption(item, (String) ((BeanItem<?>) item)
                     .getItemProperty("name").getValue());
         }