Browse Source

Remove unneeded .toArray() (#10131)

Use for each loop.
tags/8.2.0.alpha3
Ahmed Ashour 6 years ago
parent
commit
28b52d687d

+ 1
- 2
compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java View File

@@ -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();
}

+ 0
- 1
compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java View File

@@ -550,7 +550,6 @@ public class IndexedContainer
}
}
}

}

@Override

+ 5
- 7
compatibility-server/src/main/java/com/vaadin/v7/ui/Form.java View File

@@ -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);
}

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java View File

@@ -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());
}

Loading…
Cancel
Save