Use isEmpty() instead of size()==0 where possible
Change-Id: Ide5283f6f8632e606b7898fede4becbd55fc66a8
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceChangeEvent.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceChangeEvent.java
index 17cbbb8..b13d62a 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceChangeEvent.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/ResourceChangeEvent.java
@@ -57,7 +57,7 @@
return NO_MARKER_DELTAS;
//Map of IPath -> MarkerSet containing MarkerDelta objects
Map<IPath, MarkerSet> markerDeltas = info.getMarkerDeltas();
- if (markerDeltas == null || markerDeltas.size() == 0)
+ if (markerDeltas == null || markerDeltas.isEmpty())
return NO_MARKER_DELTAS;
ArrayList<IMarkerDelta> matching = new ArrayList<>();
Iterator<MarkerSet> deltaSets = markerDeltas.values().iterator();
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
index 67b4e3a..3f3a61c 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
@@ -68,7 +68,7 @@
// First, try the canonical version of the inputLocation.
// If the inputLocation is different from the canonical version, it will be tried second
ArrayList<IPath> results = allPathsForLocationNonCanonical(canonicalLocation);
- if (results.size() == 0 && canonicalLocation != inputLocation) {
+ if (results.isEmpty() && canonicalLocation != inputLocation) {
results = allPathsForLocationNonCanonical(inputLocation);
}
return results;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
index 5bf8e22..c7e2054 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/AliasManager.java
@@ -275,7 +275,7 @@
@SuppressWarnings("unchecked")
ArrayList<IResource> list = (ArrayList<IResource>) oldValue;
boolean wasRemoved = list.remove(resource);
- if (list.size() == 0)
+ if (list.isEmpty())
map.remove(location);
return wasRemoved;
}
@@ -712,7 +712,7 @@
internalComputeAliases(resource, location);
else
computeDeepAliases(resource, location);
- if (aliases.size() == 0)
+ if (aliases.isEmpty())
return;
FileSystemResourceManager localManager = workspace.getFileSystemManager();
HashSet<IResource> aliasesCopy = (HashSet<IResource>) aliases.clone();
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerManager.java
index c92e92a..8615812 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/MarkerManager.java
@@ -269,7 +269,7 @@
public IMarker[] findMarkers(IResource target, final String type, final boolean includeSubtypes, int depth) {
ArrayList<IMarker> result = new ArrayList<>();
doFindMarkers(target, result, type, includeSubtypes, depth);
- if (result.size() == 0)
+ if (result.isEmpty())
return NO_MARKERS;
return result.toArray(new IMarker[result.size()]);
}
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/PathVariableManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/PathVariableManager.java
index 03c5cbd..b162abc 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/PathVariableManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/PathVariableManager.java
@@ -104,7 +104,7 @@
}
private void fireVariableChangeEvent(Collection<IPathVariableChangeListener> list, String name, IPath value, int type) {
- if (list.size() == 0)
+ if (list.isEmpty())
return;
// use a separate collection to avoid interference of simultaneous additions/removals
IPathVariableChangeListener[] listenerArray = list.toArray(new IPathVariableChangeListener[list.size()]);
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescription.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescription.java
index bd81623..e58fdfb 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescription.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescription.java
@@ -724,7 +724,7 @@
//not actually changed anything
return false;
}
- linkDescriptions = newMap.size() == 0 ? null : newMap;
+ linkDescriptions = newMap.isEmpty() ? null : newMap;
}
return true;
}
@@ -754,9 +754,9 @@
LinkedList<FilterDescription> descList = filterDescriptions.get(path);
if (descList != null) {
descList.remove(description);
- if (descList.size() == 0) {
+ if (descList.isEmpty()) {
filterDescriptions.remove(path);
- if (filterDescriptions.size() == 0)
+ if (filterDescriptions.isEmpty())
filterDescriptions = null;
}
}
@@ -797,7 +797,7 @@
//not actually changed anything
return false;
}
- variableDescriptions = newMap.size() == 0 ? null : newMap;
+ variableDescriptions = newMap.isEmpty() ? null : newMap;
}
return true;
}
@@ -828,7 +828,7 @@
//not actually changed anything
return false;
}
- if (filterDescriptions.size() == 0)
+ if (filterDescriptions.isEmpty())
filterDescriptions = null;
}
return true;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescriptionReader.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescriptionReader.java
index f8906e2..c249209 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescriptionReader.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ProjectDescriptionReader.java
@@ -794,7 +794,7 @@
// Pop the array list of natures off the stack
ArrayList<String> natures = (ArrayList<String>) objectStack.pop();
state = S_PROJECT_DESC;
- if (natures.size() == 0)
+ if (natures.isEmpty())
return;
String[] natureNames = natures.toArray(new String[natures.size()]);
projectDescription.setNatureIds(natureNames);
@@ -807,7 +807,7 @@
private void endProjectsElement(String elementName) {
// Pop the array list that contains all the referenced project names
ArrayList<String> referencedProjects = (ArrayList<String>) objectStack.pop();
- if (referencedProjects.size() == 0)
+ if (referencedProjects.isEmpty())
// Don't bother adding an empty group of referenced projects to the
// project descriptor.
return;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/mapping/ProposedResourceDelta.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/mapping/ProposedResourceDelta.java
index 2e47157..0455cc4 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/mapping/ProposedResourceDelta.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/mapping/ProposedResourceDelta.java
@@ -59,7 +59,7 @@
* @param delta
*/
protected void add(ProposedResourceDelta delta) {
- if (children.size() == 0 && status == 0)
+ if (children.isEmpty() && status == 0)
setKind(IResourceDelta.CHANGED);
children.put(delta.getResource().getName(), delta);
}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java
index 1f2910e..9ceea21 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java
@@ -133,14 +133,14 @@
IProject[][] oldOrder = ws.computePrerequisiteOrder(projects);
List<IProject> x = Arrays.asList(oldOrder[0]);
assertTrue("1.1", oldOrder[1].length == 0);
- assertTrue("1.2", x.size() == 0);
+ assertTrue("1.2", x.isEmpty());
// no projects
IWorkspace.ProjectOrder order = ws.computeProjectOrder(projects);
x = Arrays.asList(order.projects);
assertTrue("1.3", !order.hasCycles);
assertTrue("1.4", order.knots.length == 0);
- assertTrue("1.5", x.size() == 0);
+ assertTrue("1.5", x.isEmpty());
// 1 project
try {
@@ -167,26 +167,26 @@
oldOrder = ws.computePrerequisiteOrder(projects);
x = Arrays.asList(oldOrder[0]);
assertTrue("1.6,8", oldOrder[1].length == 0);
- assertTrue("1.6.9", x.size() == 0);
+ assertTrue("1.6.9", x.isEmpty());
order = ws.computeProjectOrder(projects);
x = Arrays.asList(order.projects);
assertTrue("1.6.10", !order.hasCycles);
assertTrue("1.6.11", order.knots.length == 0);
- assertTrue("1.6.12", x.size() == 0);
+ assertTrue("1.6.12", x.isEmpty());
// non-existent projects do not show up either
projects = new IProject[] {p0, p1};
oldOrder = ws.computePrerequisiteOrder(projects);
x = Arrays.asList(oldOrder[0]);
assertTrue("1.6.13", oldOrder[1].length == 0);
- assertTrue("1.6.14", x.size() == 0);
+ assertTrue("1.6.14", x.isEmpty());
order = ws.computeProjectOrder(projects);
x = Arrays.asList(order.projects);
assertTrue("1.6.15", !order.hasCycles);
assertTrue("1.6.16", order.knots.length == 0);
- assertTrue("1.6.17", x.size() == 0);
+ assertTrue("1.6.17", x.isEmpty());
p0.delete(IResource.ALWAYS_DELETE_PROJECT_CONTENT, null);
} catch (CoreException e) {
@@ -338,7 +338,7 @@
x = Arrays.asList(oldOrder[0]);
List<IProject> unordered = Arrays.asList(oldOrder[1]);
assertTrue("1.10.1", oldOrder[1].length == 2);
- assertTrue("1.10.2", x.size() == 0);
+ assertTrue("1.10.2", x.isEmpty());
assertTrue("1.10.3", unordered.size() == 2);
assertTrue("1.10.4", unordered.indexOf(p0) >= 0);
assertTrue("1.10.5", unordered.indexOf(p1) >= 0);
@@ -392,7 +392,7 @@
x = Arrays.asList(oldOrder[0]);
unordered = Arrays.asList(oldOrder[1]);
assertTrue("1.10.28", oldOrder[1].length == 2);
- assertTrue("1.10.29", x.size() == 0);
+ assertTrue("1.10.29", x.isEmpty());
assertTrue("1.10.30", unordered.size() == 2);
assertTrue("1.10.31", unordered.indexOf(p0) >= 0);
assertTrue("1.10.32", unordered.indexOf(p1) >= 0);
