diff options
author | Sergey Prigogin | 2015-08-23 23:59:06 +0000 |
---|---|---|
committer | Sergey Prigogin | 2015-08-23 23:59:06 +0000 |
commit | 8d5319b4d3316a0316ee8c194cf04b7bcc382eef (patch) | |
tree | 62dfe92214a8c9a0db0f9e8e36ced434ec192dca | |
parent | ae67854e69a5ccdc12ea04f5244513ef47dcbb0e (diff) | |
download | eclipse.platform.resources-8d5319b4d3316a0316ee8c194cf04b7bcc382eef.tar.gz eclipse.platform.resources-8d5319b4d3316a0316ee8c194cf04b7bcc382eef.tar.xz eclipse.platform.resources-8d5319b4d3316a0316ee8c194cf04b7bcc382eef.zip |
Bug 472553 - Move o.e.c.resources and o.e.c.filesystem plugins to
JavaSE-1.7 BREE
Removed redundant type parameters and enabled warnings for them.
Change-Id: I3169cbc5c1dfebcbd1f8272045a2eaa861475383
57 files changed, 169 insertions, 269 deletions
diff --git a/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs index fe93d679c..b83be05d7 100644 --- a/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.core.filesystem/.settings/org.eclipse.jdt.core.prefs @@ -86,7 +86,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/InternalFileSystemCore.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/InternalFileSystemCore.java index 17671aca8..171377f4c 100644 --- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/InternalFileSystemCore.java +++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/InternalFileSystemCore.java @@ -113,7 +113,7 @@ public class InternalFileSystemCore implements IRegistryChangeListener { */ private synchronized HashMap<String, Object> getFileSystemRegistry() { if (fileSystems == null) { - fileSystems = new HashMap<String, Object>(); + fileSystems = new HashMap<>(); IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(EFS.PI_FILE_SYSTEM, EFS.PT_FILE_SYSTEMS); IExtension[] extensions = point.getExtensions(); for (int i = 0; i < extensions.length; i++) { @@ -130,10 +130,6 @@ public class InternalFileSystemCore implements IRegistryChangeListener { return fileSystems; } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent) - */ @Override public void registryChanged(IRegistryChangeEvent event) { IExtensionDelta[] changes = event.getExtensionDeltas(EFS.PI_FILE_SYSTEM, EFS.PT_FILE_SYSTEMS); diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java index 136232b29..8ed7fa5a7 100644 --- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java +++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java @@ -41,19 +41,19 @@ public class UnifiedTree { /** special node to mark the beginning of a level in the tree */ protected static final UnifiedTreeNode levelMarker = new UnifiedTreeNode(null, null, null, null, false); - private static final IFileInfo[] NO_CHILDREN = new IFileInfo[0]; + private static final IFileInfo[] NO_CHILDREN = {}; /** Singleton to indicate no local children */ - private static final IResource[] NO_RESOURCES = new IResource[0]; + private static final IResource[] NO_RESOURCES = {}; /** * True if the level of the children of the current node are valid according * to the requested refresh depth, false otherwise */ - protected boolean childLevelValid = false; + protected boolean childLevelValid; /** an IFileTree which can be used to build a unified tree*/ - protected IFileTree fileTree = null; + protected IFileTree fileTree; /** Spare node objects available for reuse */ protected ArrayList<UnifiedTreeNode> freeNodes = new ArrayList<>(); diff --git a/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs index 7c6587d71..f97927496 100644 --- a/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.core.tests.resources/.settings/org.eclipse.jdt.core.prefs @@ -82,7 +82,7 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ConfigurationBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ConfigurationBuilder.java index 8e0b01902..e2a31da17 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ConfigurationBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ConfigurationBuilder.java @@ -23,9 +23,9 @@ public class ConfigurationBuilder extends TestBuilder { public static final String BUILDER_NAME = "org.eclipse.core.tests.resources.configbuilder"; /** Stores IBuildConfiguration -> ConfigurationBuilder */ - private static HashMap<IBuildConfiguration, ConfigurationBuilder> builders = new HashMap<IBuildConfiguration, ConfigurationBuilder>(); + private static HashMap<IBuildConfiguration, ConfigurationBuilder> builders = new HashMap<>(); /** Order in which builders have been run */ - static List<IBuildConfiguration> buildOrder = new ArrayList<IBuildConfiguration>(); + static List<IBuildConfiguration> buildOrder = new ArrayList<>(); // Per builder instance stats int triggerForLastBuild; @@ -40,7 +40,7 @@ public class ConfigurationBuilder extends TestBuilder { } public static void clearBuildOrder() { - buildOrder = new ArrayList<IBuildConfiguration>(); + buildOrder = new ArrayList<>(); } public static void clearStats() { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ContextBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ContextBuilder.java index c266674d6..cba0744ad 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ContextBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ContextBuilder.java @@ -23,7 +23,7 @@ public class ContextBuilder extends TestBuilder { public static final String BUILDER_NAME = "org.eclipse.core.tests.resources.contextbuilder"; /** Stores IBuildConfiguration -> ContextBuilder */ - private static HashMap<IBuildConfiguration, ContextBuilder> builders = new HashMap<IBuildConfiguration, ContextBuilder>(); + private static HashMap<IBuildConfiguration, ContextBuilder> builders = new HashMap<>(); /** The context information for the last run of this builder */ IBuildContext contextForLastBuild = null; /** The trigger for the last run of this builder */ diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/DeltaVerifierBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/DeltaVerifierBuilder.java index 5432544f8..bfd31f502 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/DeltaVerifierBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/DeltaVerifierBuilder.java @@ -42,9 +42,9 @@ public class DeltaVerifierBuilder extends TestBuilder { */ protected boolean deltaWasEmpty = false; /** The empty deltas that were received */ - protected ArrayList<IProject> emptyDeltas = new ArrayList<IProject>(); + protected ArrayList<IProject> emptyDeltas = new ArrayList<>(); /** The deltas that were actually received */ - protected ArrayList<IProject> receivedDeltas = new ArrayList<IProject>(); + protected ArrayList<IProject> receivedDeltas = new ArrayList<>(); /** The projects to request deltas for (may be null) */ protected IProject[] requestedDeltas; /** diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java index 5faeca89d..1cc2c2270 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java @@ -143,7 +143,7 @@ public class MultiProjectBuildTest extends AbstractBuilderTest { //hold onto the set of requested projects here final IProject[][] previousRequest = new IProject[][] {new IProject[] {project1}}; //hold onto projects that have been modified since the last time the builder was run. - final HashSet<IProject> previouslyModified = new HashSet<IProject>(); + final HashSet<IProject> previouslyModified = new HashSet<>(); new TestPerformer("testDeltas") { @Override public Object[] interestingOldState(Object[] args) throws Exception { @@ -177,10 +177,10 @@ public class MultiProjectBuildTest extends AbstractBuilderTest { @Override public boolean wasSuccess(Object[] args, Object result, Object[] oldState) throws Exception { - HashSet<IProject> requested = new HashSet<IProject>(Arrays.asList((IProject[]) result)); - HashSet<IProject> modified = new HashSet<IProject>(Arrays.asList((IProject[]) args[1])); + HashSet<IProject> requested = new HashSet<>(Arrays.asList((IProject[]) result)); + HashSet<IProject> modified = new HashSet<>(Arrays.asList((IProject[]) args[1])); modified.addAll(previouslyModified); - HashSet<IProject> obtained = new HashSet<IProject>(); + HashSet<IProject> obtained = new HashSet<>(); if (!builder.getReceivedDeltas().isEmpty()) obtained.addAll(builder.getReceivedDeltas()); ArrayList<IProject> emptyDeltas = builder.getEmptyDeltas(); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java index f54f0ff6d..96008d9e8 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java @@ -217,7 +217,7 @@ public class RelaxedSchedRuleBuilderTest extends AbstractBuilderTest { } HashSet<ISchedulingRule> getRulesAsSet(ISchedulingRule rule) { - HashSet<ISchedulingRule> rules = new HashSet<ISchedulingRule>(); + HashSet<ISchedulingRule> rules = new HashSet<>(); if (rule == null) return rules; if (rule instanceof MultiRule) diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/SortBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/SortBuilder.java index 541007637..b5f69e78a 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/SortBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/SortBuilder.java @@ -36,7 +36,7 @@ public class SortBuilder extends TestBuilder { /** * All instances. */ - protected static final ArrayList<SortBuilder> allInstances = new ArrayList<SortBuilder>(); + protected static final ArrayList<SortBuilder> allInstances = new ArrayList<>(); /** * Build command parameters. @@ -66,7 +66,7 @@ public class SortBuilder extends TestBuilder { /** * List of the resources that were in the last delta, if any. */ - protected final ArrayList<IResource> changedResources = new ArrayList<IResource>(); + protected final ArrayList<IResource> changedResources = new ArrayList<>(); private boolean requestForgetState = false; /** diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/TestBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/TestBuilder.java index b87d4cf3c..60ede1f05 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/TestBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/TestBuilder.java @@ -76,8 +76,8 @@ public abstract class TestBuilder extends IncrementalProjectBuilder { /** * These are static because we want one event set for all builder instances. */ - private static final ArrayList<String> expectedEvents = new ArrayList<String>(); - private static final ArrayList<String> actualEvents = new ArrayList<String>(); + private static final ArrayList<String> expectedEvents = new ArrayList<>(); + private static final ArrayList<String> actualEvents = new ArrayList<>(); /** * Logs the given plug-in lifecycle event for this builder's plugin. diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java index 94dc1c24b..54ff644b2 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/ram/MemoryTree.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IPath; */ public class MemoryTree { static class DirNode extends Node { - private final ArrayList<Node> children = new ArrayList<Node>(); + private final ArrayList<Node> children = new ArrayList<>(); DirNode(Node parent, String name) { super(parent, name); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java index 4d001383d..457955b70 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java @@ -78,7 +78,7 @@ public class BucketTreeTests extends ResourceTest { @Override protected Object readEntryValue(DataInputStream source) throws IOException { int length = source.readUnsignedShort(); - Map<String, String> value = new HashMap<String, String>(length); + Map<String, String> value = new HashMap<>(length); for (int j = 0; j < length; j++) value.put(source.readUTF(), source.readUTF()); return value; @@ -90,7 +90,7 @@ public class BucketTreeTests extends ResourceTest { Map<String, String> existing = (Map<String, String>) getEntryValue(pathAsString); if (existing == null) { if (value != null) { - existing = new HashMap<String, String>(); + existing = new HashMap<>(); existing.put(key, value); setEntryValue(pathAsString, existing); } @@ -178,7 +178,7 @@ public class BucketTreeTests extends ResourceTest { } public void verify(BucketTree tree, final String tag, IPath root, int depth, final Collection<IPath> expected) { - final Set<IPath> visited = new HashSet<IPath>(); + final Set<IPath> visited = new HashSet<>(); SimpleBucket.Visitor verifier = new SimpleBucket.Visitor() { @Override public int visit(org.eclipse.core.internal.localstore.Bucket.Entry entry) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java index 9288e4af2..434c85824 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java @@ -31,8 +31,8 @@ import org.eclipse.core.tests.resources.ResourceTest; public class HistoryStoreTest extends ResourceTest { class LogListenerVerifier implements ILogListener { - List<Integer> actual = new ArrayList<Integer>(); - List<Integer> expected = new ArrayList<Integer>(); + List<Integer> actual = new ArrayList<>(); + List<Integer> expected = new ArrayList<>(); void addExpected(int statusCode) { expected.add(new Integer(statusCode)); @@ -49,17 +49,14 @@ public class HistoryStoreTest extends ResourceTest { return buffer.toString(); } - /** - * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String) - */ @Override public void logging(IStatus status, String plugin) { actual.add(new Integer(status.getCode())); } void reset() { - expected = new ArrayList<Integer>(); - actual = new ArrayList<Integer>(); + expected = new ArrayList<>(); + actual = new ArrayList<>(); } void verify() throws VerificationFailedException { @@ -77,7 +74,6 @@ public class HistoryStoreTest extends ResourceTest { } } } - } class VerificationFailedException extends Exception { @@ -204,7 +200,6 @@ public class HistoryStoreTest extends ResourceTest { * 15. Check file states. There should be none left. */ public void testAddStateAndPolicies() { - /* Create common objects. */ IProject project = getWorkspace().getRoot().getProject("Project"); IFile file = project.getFile("file.txt"); @@ -459,7 +454,6 @@ public class HistoryStoreTest extends ResourceTest { * */ public void testClean() { - /* Create common objects. */ IProject project = getWorkspace().getRoot().getProject("Project"); IFile file = project.getFile("file.txt"); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java index d5ee458b2..b19b8c357 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java @@ -116,7 +116,7 @@ public class UnifiedTreeTest extends LocalStoreTest { /* Create a hash table to hold all resources the tree should visit. The resources are going to be removed from the hash table as the visitor visits it. */ - final Hashtable<String, String> set = new Hashtable<String, String>(); + final Hashtable<String, String> set = new Hashtable<>(); /* create some workspace structure */ createResourcesInWorkspace(folder, set); @@ -162,7 +162,7 @@ public class UnifiedTreeTest extends LocalStoreTest { /* Create a hash table to hold all resources the tree should visit. The resources are going to be removed from the hash table as the visitor visits it. */ - final Hashtable<String, String> set = new Hashtable<String, String>(); + final Hashtable<String, String> set = new Hashtable<>(); /* create some workspace structure */ createResourcesInWorkspace(folder, set); @@ -219,7 +219,7 @@ public class UnifiedTreeTest extends LocalStoreTest { /* Create a hash table to hold all resources the tree should visit. The resources are going to be removed from the hash table as the visitor visits it. */ - final Hashtable<String, String> set = new Hashtable<String, String>(); + final Hashtable<String, String> set = new Hashtable<>(); /* create some workspace structure */ createResourcesInWorkspace(project, set); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeDescription.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeDescription.java index a0f1c84ca..93d7a8227 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeDescription.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeDescription.java @@ -30,13 +30,13 @@ public class ChangeDescription { public static final String MOVED = "Moved {0}"; public static final String REMOVED = "Removed {0}"; - private List<IResource> addedRoots = new ArrayList<IResource>(); - private List<IResource> changedRoots = new ArrayList<IResource>(); - private List<IResource> closedProjects = new ArrayList<IResource>(); - private List<IResource> copiedRoots = new ArrayList<IResource>(); - private List<Status> errors = new ArrayList<Status>(); - private List<IResource> movedRoots = new ArrayList<IResource>(); - private List<IResource> removedRoots = new ArrayList<IResource>(); + private List<IResource> addedRoots = new ArrayList<>(); + private List<IResource> changedRoots = new ArrayList<>(); + private List<IResource> closedProjects = new ArrayList<>(); + private List<IResource> copiedRoots = new ArrayList<>(); + private List<Status> errors = new ArrayList<>(); + private List<IResource> movedRoots = new ArrayList<>(); + private List<IResource> removedRoots = new ArrayList<>(); public static String getMessageFor(String messageTemplate, IResource resource) { return NLS.bind(messageTemplate, resource.getFullPath().toString()); @@ -55,7 +55,7 @@ public class ChangeDescription { public IStatus asStatus() { if (errors.isEmpty()) { - List<ModelStatus> result = new ArrayList<ModelStatus>(); + List<ModelStatus> result = new ArrayList<>(); accumulateStatus(addedRoots.toArray(new IResource[addedRoots.size()]), result, ADDED); accumulateStatus(removedRoots.toArray(new IResource[removedRoots.size()]), result, REMOVED); accumulateStatus(movedRoots.toArray(new IResource[movedRoots.size()]), result, MOVED); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java index 892b2bcad..32a2d41cd 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java @@ -33,7 +33,7 @@ public class ChangeValidationTest extends ResourceTest { } private void assertStatusEqual(IStatus status, String[] expectedMessages) { - List<String> actualMessages = new ArrayList<String>(); + List<String> actualMessages = new ArrayList<>(); if (status.isMultiStatus()) { IStatus[] children = status.getChildren(); for (int i = 0; i < children.length; i++) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java index 276a224f4..a604ccd52 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java @@ -483,7 +483,7 @@ public class PropertyManagerTest extends LocalStoreTest { String propValue1 = "this is the property value1"; String propValue2 = "this is the property value2"; String propValue3 = "this is the property value3"; - Vector<StoredProperty> props = new Vector<StoredProperty>(3); + Vector<StoredProperty> props = new Vector<>(3); props.addElement(new StoredProperty(propName1, propValue1)); props.addElement(new StoredProperty(propName2, propValue2)); props.addElement(new StoredProperty(propName3, propValue3)); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/Bug29116Nature.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/Bug29116Nature.java index 1130a0f94..7a4650812 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/Bug29116Nature.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/Bug29116Nature.java @@ -40,7 +40,7 @@ public class Bug29116Nature extends TestNature { System.arraycopy(oldSpec, 0, newSpec, 0, oldSpec.length); ICommand newCommand = desc.newCommand(); newCommand.setBuilderName(SortBuilder.BUILDER_NAME); - HashMap<String, String> args = new HashMap<String, String>(20); + HashMap<String, String> args = new HashMap<>(20); newCommand.setArguments(args); newSpec[oldSpec.length] = newCommand; desc.setBuildSpec(newSpec); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java index 9906b3c18..27e2d41c7 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java @@ -52,7 +52,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { } private HashMap<String, ProjectDescription> buildBaselineDescriptors() { - HashMap<String, ProjectDescription> result = new HashMap<String, ProjectDescription>(); + HashMap<String, ProjectDescription> result = new HashMap<>(); IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); ProjectDescription desc = new ProjectDescription(); @@ -64,7 +64,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { String[] natures = new String[1]; natures[0] = "org.eclipse.jdt.core.javanature"; desc.setNatureIds(natures); - HashMap<IPath, LinkDescription> linkMap = new HashMap<IPath, LinkDescription>(); + HashMap<IPath, LinkDescription> linkMap = new HashMap<>(); LinkDescription link = createLinkDescription("newLink", IResource.FOLDER, "d:/abc/def"); linkMap.put(link.getProjectRelativePath(), link); desc.setLinkDescriptions(linkMap); @@ -84,7 +84,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { natures = new String[1]; natures[0] = "org.eclipse.jdt.core.javanature"; desc.setNatureIds(natures); - linkMap = new HashMap<IPath, LinkDescription>(); + linkMap = new HashMap<>(); link = createLinkDescription("newLink", IResource.FOLDER, "d:/abc/def"); linkMap.put(link.getProjectRelativePath(), link); link = createLinkDescription("link2", IResource.FOLDER, "d:/abc"); @@ -138,7 +138,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { commands[0].setBuilderName("org.eclipse.jdt.core.javabuilder"); commands[1] = desc.newCommand(); commands[1].setBuilderName("org.eclipse.ui.externaltools.ExternalToolBuilder"); - HashMap<String, String> argMap = new HashMap<String, String>(); + HashMap<String, String> argMap = new HashMap<>(); argMap.put("!{tool_show_log}", "true"); argMap.put("!{tool_refresh}", "${none}"); argMap.put("!{tool_name}", "org.eclipse.ant.core extra builder"); @@ -265,101 +265,16 @@ public class ModelObjectReaderWriterTest extends ResourceTest { } private String getLongDescription() { - return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<projectDescription>" + "<name>org.eclipse.help.ui</name>" + "<comment></comment>" + "<charset>UTF-8</charset>" + " <projects>" + " <project>org.eclipse.core.boot</project>" + " <project>org.eclipse.core.resources</project>" + " <project>org.eclipse.core.runtime</project>" + " <project>org.eclipse.help</project>" + " <project>org.eclipse.help.appserver</project>" + " <project>org.eclipse.search</project>" + " <project>org.eclipse.ui</project>" + " </projects>" + " <buildSpec>" + " <buildCommand>" + " <name>org.eclipse.jdt.core.javabuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.ManifestBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" - + " <buildCommand>" + " <name>org.eclipse.pde.SchemaBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " </buildSpec>" + " <natures>" + " <nature>org.eclipse.jdt.core.javanature</nature>" + " <nature>org.eclipse.pde.PluginNature</nature>" + " </natures>" + " <linkedResources>" + " <link>" + " <name>contexts.xml</name>" + " <type>1</type>" + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>doc</name>" - + " <type>2</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>icons</name>" - + " <type>2</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>preferences.ini</name>" - + " <type>1</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>.options</name>" - + " <type>1</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>plugin.properties</name>" - + " <type>1</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" - + " <name>plugin.xml</name>" - + " <type>1</type>" - + " <location>" - + LONG_LOCATION - + "</location>" - + " </link>" - + " <link>" + " <name>about.html</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>helpworkbench.jar</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + "</linkedResources>" + "</projectDescription>"; + return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<projectDescription>" + "<name>org.eclipse.help.ui</name>" + "<comment></comment>" + "<charset>UTF-8</charset>" + " <projects>" + " <project>org.eclipse.core.boot</project>" + " <project>org.eclipse.core.resources</project>" + " <project>org.eclipse.core.runtime</project>" + " <project>org.eclipse.help</project>" + " <project>org.eclipse.help.appserver</project>" + " <project>org.eclipse.search</project>" + " <project>org.eclipse.ui</project>" + " </projects>" + " <buildSpec>" + " <buildCommand>" + " <name>org.eclipse.jdt.core.javabuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.ManifestBuilder</name>" + " <arguments>" + + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.SchemaBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " </buildSpec>" + " <natures>" + " <nature>org.eclipse.jdt.core.javanature</nature>" + " <nature>org.eclipse.pde.PluginNature</nature>" + " </natures>" + " <linkedResources>" + " <link>" + " <name>contexts.xml</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>doc</name>" + " <type>2</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>icons</name>" + " <type>2</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>preferences.ini</name>" + + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>.options</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>plugin.properties</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>plugin.xml</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>about.html</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + " <link>" + " <name>helpworkbench.jar</name>" + " <type>1</type>" + " <location>" + LONG_LOCATION + "</location>" + " </link>" + "</linkedResources>" + "</projectDescription>"; } private String getLongDescriptionURI() { - return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<projectDescription>" + "<name>org.eclipse.help.ui</name>" + "<comment></comment>" + "<charset>UTF-8</charset>" + " <projects>" + " <project>org.eclipse.core.boot</project>" + " <project>org.eclipse.core.resources</project>" + " <project>org.eclipse.core.runtime</project>" + " <project>org.eclipse.help</project>" + " <project>org.eclipse.help.appserver</project>" + " <project>org.eclipse.search</project>" + " <project>org.eclipse.ui</project>" + " </projects>" + " <buildSpec>" + " <buildCommand>" + " <name>org.eclipse.jdt.core.javabuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.ManifestBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" - + " <buildCommand>" + " <name>org.eclipse.pde.SchemaBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " </buildSpec>" + " <natures>" + " <nature>org.eclipse.jdt.core.javanature</nature>" + " <nature>org.eclipse.pde.PluginNature</nature>" + " </natures>" + " <linkedResources>" + " <link>" + " <name>contexts.xml</name>" + " <type>1</type>" + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>doc</name>" - + " <type>2</type>" - + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>icons</name>" - + " <type>2</type>" - + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>preferences.ini</name>" - + " <type>1</type>" - + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>.options</name>" - + " <type>1</type>" - + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>plugin.properties</name>" - + " <type>1</type>" - + " <locationURI>" - + LONG_LOCATION_URI - + "</locationURI>" - + " </link>" - + " <link>" - + " <name>plugin.xml</name>" - + " <type>1</type>" - + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>about.html</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>helpworkbench.jar</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + "</linkedResources>" + "</projectDescription>"; + return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<projectDescription>" + "<name>org.eclipse.help.ui</name>" + "<comment></comment>" + "<charset>UTF-8</charset>" + " <projects>" + " <project>org.eclipse.core.boot</project>" + " <project>org.eclipse.core.resources</project>" + " <project>org.eclipse.core.runtime</project>" + " <project>org.eclipse.help</project>" + " <project>org.eclipse.help.appserver</project>" + " <project>org.eclipse.search</project>" + " <project>org.eclipse.ui</project>" + " </projects>" + " <buildSpec>" + " <buildCommand>" + " <name>org.eclipse.jdt.core.javabuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.ManifestBuilder</name>" + " <arguments>" + + " </arguments>" + " </buildCommand>" + " <buildCommand>" + " <name>org.eclipse.pde.SchemaBuilder</name>" + " <arguments>" + " </arguments>" + " </buildCommand>" + " </buildSpec>" + " <natures>" + " <nature>org.eclipse.jdt.core.javanature</nature>" + " <nature>org.eclipse.pde.PluginNature</nature>" + " </natures>" + " <linkedResources>" + " <link>" + " <name>contexts.xml</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>doc</name>" + " <type>2</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>icons</name>" + " <type>2</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + + " <name>preferences.ini</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>.options</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>plugin.properties</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>plugin.xml</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>about.html</name>" + " <type>1</type>" + " <locationURI>" + LONG_LOCATION_URI + "</locationURI>" + " </link>" + " <link>" + " <name>helpworkbench.jar</name>" + " <type>1</type>" + " <locationURI>" + + LONG_LOCATION_URI + "</locationURI>" + " </link>" + "</linkedResources>" + "</projectDescription>"; } /** @@ -388,8 +303,8 @@ public class ModelObjectReaderWriterTest extends ResourceTest { String locationA = getTempDir().append("testPath1").toPortableString(); String locationB = getTempDir().append("testPath1").toPortableString(); String newline = System.getProperty("line.separator"); - String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + newline + "<projectDescription>" + newline + " <name>MyProjectDescription</name>" + newline + " <comment></comment>" + newline + " <projects>" + newline + " </projects>" + newline + " <buildSpec>" + newline + " <buildCommand>" + newline + " <name>MyCommand</name>" + newline + " <arguments>" + newline + " <dictionary>" + newline + " <key>aA</key>" + newline + " <value>2 x ARGH!</value>" + newline + " </dictionary>" + newline + " <dictionary>" + newline + " <key>b</key>" + newline + " <value>ARGH!</value>" + newline + " </dictionary>" + newline + " </arguments>" + newline + " </buildCommand>" + newline + " </buildSpec>" + newline + " <natures>" + newline + " </natures>" + newline - + " <linkedResources>" + newline + " <link>" + newline + " <name>pathA</name>" + newline + " <type>2</type>" + newline + " <location>" + locationA + "</location>" + newline + " </link>" + newline + " <link>" + newline + " <name>pathB</name>" + newline + " <type>2</type>" + newline + " <location>" + locationB + "</location>" + newline + " </link>" + newline + " </linkedResources>" + newline + "</projectDescription>" + newline; + String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + newline + "<projectDescription>" + newline + " <name>MyProjectDescription</name>" + newline + " <comment></comment>" + newline + " <projects>" + newline + " </projects>" + newline + " <buildSpec>" + newline + " <buildCommand>" + newline + " <name>MyCommand</name>" + newline + " <arguments>" + newline + " <dictionary>" + newline + " <key>aA</key>" + newline + " <value>2 x ARGH!</value>" + newline + " </dictionary>" + newline + " <dictionary>" + newline + " <key>b</key>" + newline + " <value>ARGH!</value>" + newline + " </dictionary>" + newline + + " </arguments>" + newline + " </buildCommand>" + newline + " </buildSpec>" + newline + " <natures>" + newline + " </natures>" + newline + " <linkedResources>" + newline + " <link>" + newline + " <name>pathA</name>" + newline + " <type>2</type>" + newline + " <location>" + locationA + "</location>" + newline + " </link>" + newline + " <link>" + newline + " <name>pathB</name>" + newline + " <type>2</type>" + newline + " <location>" + locationB + "</location>" + newline + " </link>" + newline + " </linkedResources>" + newline + "</projectDescription>" + newline; IFileStore tempStore = getTempStore(); URI location = tempStore.toURI(); @@ -397,7 +312,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { ProjectDescription description = new ProjectDescription(); description.setLocationURI(location); description.setName("MyProjectDescription"); - HashMap<String, String> args = new HashMap<String, String>(2); + HashMap<String, String> args = new HashMap<>(2); // key values are important args.put("b", "ARGH!"); args.put("aA", "2 x ARGH!"); @@ -406,7 +321,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { commands[0].setBuilderName("MyCommand"); commands[0].setArguments(args); description.setBuildSpec(commands); - HashMap<IPath, LinkDescription> linkDescriptions = new HashMap<IPath, LinkDescription>(2); + HashMap<IPath, LinkDescription> linkDescriptions = new HashMap<>(2); LinkDescription link = createLinkDescription("pathB", IResource.FOLDER, locationB); // key values are important linkDescriptions.put(link.getProjectRelativePath(), link); @@ -583,11 +498,11 @@ public class ModelObjectReaderWriterTest extends ResourceTest { } public void testMultiLineCharFields() throws Throwable { - String multiLineProjectDescription = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<projectDescription>\n" + " <name>\n" + " abc\n" + " </name>\n" + " <charset>\n" + " ISO-8859-1\n" + " </charset>\n" + " <comment>This is the comment.</comment>\n" + " <projects>\n" + " <project>\n" + " org.eclipse.core.boot\n" + " </project>\n" + " </projects>\n" + " <buildSpec>\n" + " <buildCommand>\n" + " <name>\n" + " org.eclipse.jdt.core.javabuilder\n" + " </name>\n" + " <arguments>\n" + " <key>thisIsTheKey</key>\n" + " <value>thisIsTheValue</value>\n" + " </arguments>\n" + " </buildCommand>\n" + " </buildSpec>\n" + " <natures>\n" + " <nature>\n" + " org.eclipse.jdt.core.javanature\n" - + " </nature>\n" + " </natures>\n" + " <linkedResources>\n" + " <link>\n" + " <name>" + "newLink" + "</name>\n" + " <type>\n" + " 2\n" + " </type>\n" + " <location>" + PATH_STRING + "</location>\n" + " </link>\n" + " </linkedResources>\n" + "</projectDescription>"; + String multiLineProjectDescription = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<projectDescription>\n" + " <name>\n" + " abc\n" + " </name>\n" + " <charset>\n" + " ISO-8859-1\n" + " </charset>\n" + " <comment>This is the comment.</comment>\n" + " <projects>\n" + " <project>\n" + " org.eclipse.core.boot\n" + " </project>\n" + " </projects>\n" + " <buildSpec>\n" + " <buildCommand>\n" + " <name>\n" + " org.eclipse.jdt.core.javabuilder\n" + " </name>\n" + " <arguments>\n" + " <key>thisIsTheKey</key>\n" + " <value>thisIsTheValue</value>\n" + " </arguments>\n" + " </buildCommand>\n" + " </buildSpec>\n" + " <natures>\n" + " <nature>\n" + + " org.eclipse.jdt.core.javanature\n" + " </nature>\n" + " </natures>\n" + " <linkedResources>\n" + " <link>\n" + " <name>" + "newLink" + "</name>\n" + " <type>\n" + " 2\n" + " </type>\n" + " <location>" + PATH_STRING + "</location>\n" + " </link>\n" + " </linkedResources>\n" + "</projectDescription>"; - String singleLineProjectDescription = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<projectDescription>\n" + " <name>abc</name>\n" + " <charset>ISO-8859-1</charset>\n" + " <comment>This is the comment.</comment>\n" + " <projects>\n" + " <project>org.eclipse.core.boot</project>\n" + " </projects>\n" + " <buildSpec>\n" + " <buildCommand>\n" + " <name>org.eclipse.jdt.core.javabuilder</name>\n" + " <arguments>\n" + " <key>thisIsTheKey</key>\n" + " <value>thisIsTheValue</value>\n" + " </arguments>\n" + " </buildCommand>\n" + " </buildSpec>\n" + " <natures>\n" + " <nature>org.eclipse.jdt.core.javanature</nature>\n" + " </natures>\n" + " <linkedResources>\n" + " <link>\n" + " <name>newLink</name>\n" + " <type>2</type>\n" + " <location>" - + PATH_STRING + "</location>\n" + " </link>\n" + " </linkedResources>\n" + "</projectDescription>"; + String singleLineProjectDescription = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<projectDescription>\n" + " <name>abc</name>\n" + " <charset>ISO-8859-1</charset>\n" + " <comment>This is the comment.</comment>\n" + " <projects>\n" + " <project>org.eclipse.core.boot</project>\n" + " </projects>\n" + " <buildSpec>\n" + " <buildCommand>\n" + " <name>org.eclipse.jdt.core.javabuilder</name>\n" + " <arguments>\n" + " <key>thisIsTheKey</key>\n" + " <value>thisIsTheValue</value>\n" + " </arguments>\n" + " </buildCommand>\n" + " </buildSpec>\n" + " <natures>\n" + " <nature>org.eclipse.jdt.core.javanature</nature>\n" + " </natures>\n" + " <linkedResources>\n" + " <link>\n" + + " <name>newLink</name>\n" + " <type>2</type>\n" + " <location>" + PATH_STRING + "</location>\n" + " </link>\n" + " </linkedResources>\n" + "</projectDescription>"; IPath root = getWorkspace().getRoot().getLocation(); IPath multiLocation = root.append("multiLineTest.txt"); @@ -640,7 +555,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { ProjectDescription description = new ProjectDescription(); description.setLocationURI(location); description.setName("MyProjectDescription"); - HashMap<String, String> args = new HashMap<String, String>(3); + HashMap<String, String> args = new HashMap<>(3); args.put("ArgOne", "ARGH!"); args.put("ArgTwo", "2 x ARGH!"); args.put("NullArg", null); @@ -687,7 +602,7 @@ public class ModelObjectReaderWriterTest extends ResourceTest { ProjectDescription description = new ProjectDescription(); description.setLocationURI(location); description.setName("MyProjectDescription"); - HashMap<String, String> args = new HashMap<String, String>(3); + HashMap<String, String> args = new HashMap<>(3); args.put("ArgOne", "ARGH!"); ICommand[] commands = new ICommand[1]; commands[0] = description.newCommand(); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java index bede370a9..980365bb4 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java @@ -101,13 +101,13 @@ public class ProjectPreferencesTest extends ResourceTest { IScopeContext instanceContext = InstanceScope.INSTANCE; ensureExistsInWorkspace(project, true); - ArrayList<IScopeContext[]> list = new ArrayList<IScopeContext[]>(); + ArrayList<IScopeContext[]> list = new ArrayList<>(); list.add(null); list.add(new IScopeContext[0]); list.add(new IScopeContext[] {null}); IScopeContext[][] contextsWithoutScope = list.toArray(new IScopeContext[list.size()][]); - list = new ArrayList<IScopeContext[]>(); + list = new ArrayList<>(); list.add(new IScopeContext[] {projectContext}); list.add(new IScopeContext[] {null, projectContext}); IScopeContext[][] contextsWithScope = list.toArray(new IScopeContext[list.size()][]); @@ -761,7 +761,7 @@ public class ProjectPreferencesTest extends ResourceTest { ensureExistsInWorkspace(new IResource[] {project1}, true); Preferences node = new ProjectScope(project1).getNode(ResourcesPlugin.PI_RESOURCES).node("subnode"); - List<String> keys = new ArrayList<String>(); + List<String> keys = new ArrayList<>(); keys.add("z" + getUniqueString()); keys.add("a" + getUniqueString()); keys.add("1" + getUniqueString()); @@ -874,7 +874,7 @@ public class ProjectPreferencesTest extends ResourceTest { try { File folder = new File(project.getLocation().toOSString() + "/.settings"); BufferedReader br = new BufferedReader(new FileReader(folder.getPath() + "/" + nodeName + ".prefs")); - List<String> lines = new ArrayList<String>(); + List<String> lines = new ArrayList<>(); String line = br.readLine(); while (line != null) { if ((!line.startsWith("#")) && (!line.startsWith("eclipse.preferences.version"))) diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/SnowNature.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/SnowNature.java index d6727daf4..b0233ff59 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/SnowNature.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/SnowNature.java @@ -40,7 +40,7 @@ public class SnowNature extends TestNature { System.arraycopy(oldSpec, 0, newSpec, 0, oldSpec.length); ICommand newCommand = desc.newCommand(); newCommand.setBuilderName(SnowBuilder.BUILDER_NAME); - HashMap<String, String> args = new HashMap<String, String>(20); + HashMap<String, String> args = new HashMap<>(20); args.put(TestBuilder.BUILD_ID, SnowBuilder.SNOW_BUILD_EVENT); newCommand.setArguments(args); newSpec[oldSpec.length] = newCommand; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspacePreferencesTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspacePreferencesTest.java index 1fb0136ff..3190744ee 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspacePreferencesTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspacePreferencesTest.java @@ -133,7 +133,7 @@ public class WorkspacePreferencesTest extends ResourceTest { // 8 - PREF_SNAPSHOT_INTERVAL modified.setSnapshotInterval((original.getSnapshotInterval() + 1) * 2); - final List<String> changedProperties = new LinkedList<String>(); + final List<String> changedProperties = new LinkedList<>(); Preferences.IPropertyChangeListener listener = new Preferences.IPropertyChangeListener() { @Override public void propertyChange(Preferences.PropertyChangeEvent event) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java index 7418bd889..af06e2d1f 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/ObjectMapTest.java @@ -51,7 +51,7 @@ public class ObjectMapTest extends ResourceTest { public void testPut() { // create the objects to insert into the map - ObjectMap<Integer, Object> map = new ObjectMap<Integer, Object>(); + ObjectMap<Integer, Object> map = new ObjectMap<>(); int max = 100; Object[] values = new Object[max]; for (int i = 0; i < max; i++) @@ -76,7 +76,7 @@ public class ObjectMapTest extends ResourceTest { } public void testPutEmptyMap() { - ObjectMap<Object, Object> map = new ObjectMap<Object, Object>(new HashMap<Object, Object>()); + ObjectMap<Object, Object> map = new ObjectMap<>(new HashMap<>()); map.put(new Object(), new Object()); } @@ -148,7 +148,7 @@ public class ObjectMapTest extends ResourceTest { private ObjectMap<Integer, Object> populateMap(int max) { // populate the map - ObjectMap<Integer, Object> map = new ObjectMap<Integer, Object>(); + ObjectMap<Integer, Object> map = new ObjectMap<>(); values = new Object[max]; for (int i = 0; i < max; i++) { values[i] = new Long(System.currentTimeMillis()); @@ -162,7 +162,7 @@ public class ObjectMapTest extends ResourceTest { * Bug 62231 - empty ObjectMap.toHashMap() causes NullPointerException */ public void testBug_62231() { - ObjectMap<Object, Object> map = new ObjectMap<Object, Object>(); + ObjectMap<Object, Object> map = new ObjectMap<>(); try { map.entrySet(); } catch (NullPointerException e) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/QueueTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/QueueTest.java index 10f4b4684..2d0c4e133 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/QueueTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/utils/QueueTest.java @@ -29,7 +29,7 @@ public class QueueTest extends TestCase { public void testElements() { /* add elements without removing */ - Queue<String> queue = new Queue<String>(5, false); + Queue<String> queue = new Queue<>(5, false); for (int i = 0; i < 10; i++) queue.add(String.valueOf(i)); @@ -39,7 +39,7 @@ public class QueueTest extends TestCase { assertTrue("1.0", elements.next().equals(String.valueOf(i))); /* add and remove elements */ - queue = new Queue<String>(5, false); + queue = new Queue<>(5, false); for (int i = 0; i < 5; i++) queue.add(String.valueOf(i)); for (int i = 0; i < 4; i++) @@ -57,13 +57,13 @@ public class QueueTest extends TestCase { public void testGrow() { /* add elements without removing */ - Queue<String> queue = new Queue<String>(5, false); + Queue<String> queue = new Queue<>(5, false); for (int i = 0; i < 10; i++) queue.add(String.valueOf(i)); assertTrue("1.0", queue.size() == 10); /* add and remove elements */ - queue = new Queue<String>(5, false); + queue = new Queue<>(5, false); for (int i = 0; i < 5; i++) queue.add(String.valueOf(i)); for (int i = 0; i < 4; i++) @@ -76,7 +76,7 @@ public class QueueTest extends TestCase { public void testRemoveTail() { /* head < tail */ - Queue<String> queue = new Queue<String>(10, false); + Queue<String> queue = new Queue<>(10, false); for (int i = 0; i < 8; i++) queue.add(String.valueOf(i)); assertTrue("1.0", queue.peekTail().equals("7")); @@ -84,7 +84,7 @@ public class QueueTest extends TestCase { assertTrue("1.2", queue.peekTail().equals("6")); /* head > tail */ - queue = new Queue<String>(5, false); + queue = new Queue<>(5, false); for (int i = 0; i < 5; i++) queue.add(String.valueOf(i)); for (int i = 0; i < 4; i++) @@ -98,12 +98,11 @@ public class QueueTest extends TestCase { } public void testReusableElements() { - /**/ class ReusableObject { } /* add elements */ - Queue<ReusableObject> queue = new Queue<ReusableObject>(10, true); + Queue<ReusableObject> queue = new Queue<>(10, true); for (int i = 0; i < 9; i++) { ReusableObject o = new ReusableObject(); queue.add(o); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java index 743da8421..889c7ee25 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/ElementTreeIteratorTest.java @@ -71,7 +71,7 @@ public class ElementTreeIteratorTest extends WatsonTest { baseTree.immutable(); final ElementTree tree = baseTree.newEmptyDelta(); modifyTree(tree); - final ArrayList<Object> elts = new ArrayList<Object>(); + final ArrayList<Object> elts = new ArrayList<>(); final IElementContentVisitor visitor = new IElementContentVisitor() { @Override public boolean visitElement(ElementTree tree, IPathRequestor requestor, Object info) { @@ -113,9 +113,6 @@ public class ElementTreeIteratorTest extends WatsonTest { return suite; } - /** - * - */ @Override protected void tearDown() throws Exception { //ElementTree tests don't use the CoreTest infrastructure @@ -125,7 +122,7 @@ public class ElementTreeIteratorTest extends WatsonTest { ElementTree tree = new ElementTree(); int n = 3; setupElementTree(tree, n); - final ArrayList<IPath> elts = new ArrayList<IPath>(); + final ArrayList<IPath> elts = new ArrayList<>(); IElementContentVisitor elementVisitor = new IElementContentVisitor() { @Override public boolean visitElement(ElementTree tree, IPathRequestor requestor, Object info) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/TestUtil.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/TestUtil.java index b17087881..de886a477 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/TestUtil.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/watson/TestUtil.java @@ -213,7 +213,7 @@ abstract class TestUtil extends WatsonTest implements IPathConstants { * Returns an array of all the intermediary ElementTrees. */ static protected ElementTree[] doManyRoutineOperations(ElementTree tree, IPath path) { - Vector<ElementTree> trees = new Vector<ElementTree>(); + Vector<ElementTree> trees = new Vector<>(); trees.addElement(tree); int repeat = 1; @@ -259,7 +259,7 @@ abstract class TestUtil extends WatsonTest implements IPathConstants { * the given path. Returns an array of all the intermediary elementtrees. */ static protected ElementTree[] doRoutineOperations(ElementTree tree, IPath path) { - Vector<ElementTree> trees = new Vector<ElementTree>(); + Vector<ElementTree> trees = new Vector<>(); trees.addElement(tree); int repeat = 1; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/Comparator.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/Comparator.java index 33ba1b75d..66cb1283f 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/Comparator.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/Comparator.java @@ -134,7 +134,7 @@ public class Comparator { } public static boolean equals(Enumeration<?> e, Object[] obj1, boolean isOrderImportant) { - Vector<Object> v = new Vector<Object>(); + Vector<Object> v = new Vector<>(); while (e.hasMoreElements()) { v.addElement(e.nextElement()); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java index 8e233cbc7..20d0e6bc5 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java @@ -32,14 +32,14 @@ public class IFileTest extends ResourceTest { protected static final Boolean[] TRUE_AND_FALSE = new Boolean[] {Boolean.TRUE, Boolean.FALSE}; public static final String WORKSPACE_ONLY = "WorkspaceOnlyFile"; - ArrayList<IFile> allFiles = new ArrayList<IFile>(); - ArrayList<IFile> existingFiles = new ArrayList<IFile>(); - ArrayList<IFile> localOnlyFiles = new ArrayList<IFile>(); - ArrayList<IFile> nonExistingFiles = new ArrayList<IFile>(); - ArrayList<IFile> outOfSyncFiles = new ArrayList<IFile>(); + ArrayList<IFile> allFiles = new ArrayList<>(); + ArrayList<IFile> existingFiles = new ArrayList<>(); + ArrayList<IFile> localOnlyFiles = new ArrayList<>(); + ArrayList<IFile> nonExistingFiles = new ArrayList<>(); + ArrayList<IFile> outOfSyncFiles = new ArrayList<>(); IProject[] projects = null; - ArrayList<IFile> workspaceOnlyFiles = new ArrayList<IFile>(); + ArrayList<IFile> workspaceOnlyFiles = new ArrayList<>(); /** * Sets up the test suite for this class @@ -177,7 +177,7 @@ public class IFileTest extends ResourceTest { * Returns some interesting input streams */ public InputStream[] interestingStreams() { - ArrayList<InputStream> streams = new ArrayList<InputStream>(); + ArrayList<InputStream> streams = new ArrayList<>(); //empty stream ByteArrayInputStream bis = new ByteArrayInputStream(new byte[0]); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java index a5f7e3943..8dc8a63fd 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java @@ -105,8 +105,8 @@ public class IPathVariableTest extends ResourceTest { } } - List<Event> expected = new ArrayList<Event>(); - List<Event> actual = new ArrayList<Event>(); + List<Event> expected = new ArrayList<>(); + List<Event> actual = new ArrayList<>(); void addExpectedEvent(int type, String name, IPath value) { expected.add(new Event(type, name, value)); @@ -129,8 +129,8 @@ public class IPathVariableTest extends ResourceTest { } void reset() { - expected = new ArrayList<Event>(); - actual = new ArrayList<Event>(); + expected = new ArrayList<>(); + actual = new ArrayList<>(); } @Override diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java index 6e6a66857..6d066b57b 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java @@ -134,7 +134,7 @@ public class IProjectDescriptionTest extends ResourceTest { try { IProjectDescription description = project.getDescription(); ICommand newCommand = description.newCommand(); - Map<String, String> args = new HashMap<String, String>(); + Map<String, String> args = new HashMap<>(); args.put(key, value1); newCommand.setArguments(args); description.setBuildSpec(new ICommand[] {newCommand}); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java index cc7c70f82..21b9178be 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java @@ -2443,7 +2443,7 @@ public class IProjectTest extends ResourceTest { IResource[] resources = buildResources(project, children); ensureExistsInWorkspace(project, true); ensureExistsInWorkspace(resources, true); - Set<IPath> pathsToDelete = new HashSet<IPath>(5); + Set<IPath> pathsToDelete = new HashSet<>(5); try { // move the project content diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java index 9ef262874..011954ab8 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java @@ -27,7 +27,7 @@ public class IResourceTest extends ResourceTest { protected static final Boolean[] FALSE_AND_TRUE = new Boolean[] {Boolean.FALSE, Boolean.TRUE}; protected static IPath[] interestingPaths; protected static IResource[] interestingResources; - protected static Set<IResource> nonExistingResources = new HashSet<IResource>(); + protected static Set<IResource> nonExistingResources = new HashSet<>(); static boolean noSideEffects = false; protected static final IProgressMonitor[] PROGRESS_MONITORS = new IProgressMonitor[] {new FussyProgressMonitor(), new CancelingProgressMonitor(), null}; @@ -69,7 +69,7 @@ public class IResourceTest extends ResourceTest { */ protected static final int S_WORKSPACE_ONLY = 0; protected static final Boolean[] TRUE_AND_FALSE = new Boolean[] {Boolean.TRUE, Boolean.FALSE}; - protected static Set<IResource> unsynchronizedResources = new HashSet<IResource>(); + protected static Set<IResource> unsynchronizedResources = new HashSet<>(); /* the delta verifier */ ResourceDeltaVerifier verifier; @@ -79,7 +79,7 @@ public class IResourceTest extends ResourceTest { * @param dir */ static protected Set<File> getAllFilesForDirectory(File dir) { - Set<File> result = new HashSet<File>(50); + Set<File> result = new HashSet<>(50); String[] members = dir.list(); if (members != null) { for (int i = 0; i < members.length; i++) { @@ -98,7 +98,7 @@ public class IResourceTest extends ResourceTest { * @param resource IResource */ static protected Set<File> getAllFilesForResource(IResource resource, boolean considerUnsyncLocalFiles) throws CoreException { - Set<File> result = new HashSet<File>(50); + Set<File> result = new HashSet<>(50); if (resource.getLocation() != null && (resource.getType() != IResource.PROJECT || ((IProject) resource).isOpen())) { java.io.File file = resource.getLocation().toFile(); if (considerUnsyncLocalFiles) { @@ -130,7 +130,7 @@ public class IResourceTest extends ResourceTest { * @param resource IResource */ static protected Set<IResource> getAllResourcesForResource(IResource resource) throws CoreException { - Set<IResource> result = new HashSet<IResource>(50); + Set<IResource> result = new HashSet<>(50); if (resource.exists()) { result.add(resource); if (resource.getType() != IResource.FILE && resource.isAccessible()) { @@ -273,7 +273,7 @@ public class IResourceTest extends ResourceTest { * Returns an array of all projects in the given resource array. */ protected IProject[] getProjects(IResource[] resources) { - ArrayList<IProject> list = new ArrayList<IProject>(); + ArrayList<IProject> list = new ArrayList<>(); for (int i = 0; i < resources.length; i++) { if (resources[i].getType() == IResource.PROJECT) { list.add((IProject) resources[i]); @@ -396,7 +396,7 @@ public class IResourceTest extends ResourceTest { nonExistingProject.open(null); nonExistingProject.delete(true, null); - Vector<IResource> resources = new Vector<IResource>(); + Vector<IResource> resources = new Vector<>(); resources.addElement(openProject); for (int i = 0; i < resourcesInOpenProject.length; i++) { resources.addElement(resourcesInOpenProject[i]); @@ -543,7 +543,7 @@ public class IResourceTest extends ResourceTest { noSideEffects = true; class LoggingResourceVisitor implements IResourceVisitor { - Vector<IResource> visitedResources = new Vector<IResource>(); + Vector<IResource> visitedResources = new Vector<>(); void clear() { visitedResources.removeAllElements(); @@ -695,7 +695,7 @@ public class IResourceTest extends ResourceTest { IFolder c = b.getFolder("c"); IFile c1 = c.getFile("c1.txt"); IFile c2 = c.getFile("c2.txt"); - final Set<IResource> toVisit = new HashSet<IResource>(); + final Set<IResource> toVisit = new HashSet<>(); final int toVisitCount[] = new int[] {0}; IResourceProxyVisitor visitor = new IResourceProxyVisitor() { @@ -1455,7 +1455,7 @@ public class IResourceTest extends ResourceTest { // setup IResource[] resources = buildResources(getWorkspace().getRoot(), new String[] {"/1/", "/1/1", "/1/2", "/1/3", "/2/", "/2/1"}); - final Map<IPath, Long> table = new HashMap<IPath, Long>(resources.length); + final Map<IPath, Long> table = new HashMap<>(resources.length); for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; @@ -1537,7 +1537,7 @@ public class IResourceTest extends ResourceTest { } // touch all the resources. this will update the modification stamp - final Map<IPath, Long> tempTable = new HashMap<IPath, Long>(resources.length); + final Map<IPath, Long> tempTable = new HashMap<>(resources.length); for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; if (resource.getType() != IResource.ROOT) { @@ -2518,7 +2518,7 @@ public class IResourceTest extends ResourceTest { ensureExistsInWorkspace(new IResource[] {project, a, a1, a2, b, b1, b2}, true); - final List<IResource> actualOrder = new ArrayList<IResource>(); + final List<IResource> actualOrder = new ArrayList<>(); IResourceProxyVisitor visitor = new IResourceProxyVisitor() { @Override public boolean visit(IResourceProxy proxy) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java index f9556ded7..1f0e94064 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java @@ -109,7 +109,7 @@ public class ISynchronizerTest extends ResourceTest { synchronizer.add(qname); // setup the sync bytes - final Hashtable<IPath, byte[]> table = new Hashtable<IPath, byte[]>(10); + final Hashtable<IPath, byte[]> table = new Hashtable<>(10); IResourceVisitor visitor = new IResourceVisitor() { @Override public boolean visit(IResource resource) throws CoreException { @@ -232,7 +232,7 @@ public class ISynchronizerTest extends ResourceTest { synchronizer.add(qname); // setup the sync bytes - final Hashtable<IPath, byte[]> table = new Hashtable<IPath, byte[]>(10); + final Hashtable<IPath, byte[]> table = new Hashtable<>(10); IResourceVisitor visitor = new IResourceVisitor() { @Override public boolean visit(IResource resource) throws CoreException { @@ -515,7 +515,7 @@ public class ISynchronizerTest extends ResourceTest { } public void testSave() { - final Hashtable<IPath, byte[]> table = new Hashtable<IPath, byte[]>(10); + final Hashtable<IPath, byte[]> table = new Hashtable<>(10); final QualifiedName qname = new QualifiedName("org.eclipse.core.tests.resources", "myTarget"); final Synchronizer synchronizer = (Synchronizer) ResourcesPlugin.getWorkspace().getSynchronizer(); @@ -553,7 +553,7 @@ public class ISynchronizerTest extends ResourceTest { fail("1.0", e); } final DataOutputStream output = o1; - final List<QualifiedName> list = new ArrayList<QualifiedName>(5); + final List<QualifiedName> list = new ArrayList<>(5); visitor = new IResourceVisitor() { @Override public boolean visit(final IResource resource) { @@ -655,7 +655,7 @@ public class ISynchronizerTest extends ResourceTest { final Hashtable table = new Hashtable(10); final QualifiedName qname = new QualifiedName("org.eclipse.core.tests.resources", "myTarget"); final Synchronizer synchronizer = (Synchronizer) ResourcesPlugin.getWorkspace().getSynchronizer(); - + // register the sync partner and set the sync info on the resources synchronizer.add(qname); IResourceVisitor visitor = new IResourceVisitor() { @@ -677,7 +677,7 @@ public class ISynchronizerTest extends ResourceTest { } catch (CoreException e) { fail("0.1", e); } - + // write out the data File file = Platform.getLocation().append(".testsyncinfo.snap").toFile(); SafeChunkyOutputStream safeOutput = null; @@ -718,14 +718,14 @@ public class ISynchronizerTest extends ResourceTest { fail("1.4", e); } } - + // flush the sync info in memory try { flushAllSyncInfo(getWorkspace().getRoot()); } catch (CoreException e) { fail("2.0", e); } - + // read in the data try { InputStream safeInput = new SafeChunkyInputStream(file); @@ -756,7 +756,7 @@ public class ISynchronizerTest extends ResourceTest { } catch (CoreException e) { fail("3.4", e); } - + // confirm the sync bytes are the same visitor = new IResourceVisitor() { public boolean visit(IResource resource) throws CoreException { @@ -784,7 +784,7 @@ public class ISynchronizerTest extends ResourceTest { final ISynchronizer synchronizer = ResourcesPlugin.getWorkspace().getSynchronizer(); // setup the sync bytes - final Hashtable<IPath, byte[]> table = new Hashtable<IPath, byte[]>(10); + final Hashtable<IPath, byte[]> table = new Hashtable<>(10); IResourceVisitor visitor = new IResourceVisitor() { @Override public boolean visit(IResource resource) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java index bb955d133..bcfb0afcb 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java @@ -37,7 +37,7 @@ public class LinkedResourceWithPathVariableTest extends LinkedResourceTest { private final static String PROJECT_VARIABLE_NAME = "PROOT"; private final static String PROJECT_RELATIVE_VARIABLE_NAME = "RELATIVE_PROOT"; private final static String PROJECT_RELATIVE_VARIABLE_VALUE = "${PROOT}"; - private final ArrayList<IPath> toDelete = new ArrayList<IPath>(); + private final ArrayList<IPath> toDelete = new ArrayList<>(); private IFileStore toSetWritable = null; public LinkedResourceWithPathVariableTest() { @@ -1350,7 +1350,7 @@ public class LinkedResourceWithPathVariableTest extends LinkedResourceTest { IPathVariableManager pathVariableManager = existingProject.getPathVariableManager(); String[][] table = { // format: {internal-format, user-editable-format [, internal-format-reconverted] - {"C:\\foo\\bar", "C:\\foo\\bar", "C:/foo/bar"}, // + {"C:\\foo\\bar", "C:\\foo\\bar", "C:/foo/bar"}, // {"C:/foo/bar", "C:/foo/bar"}, // {"VAR/foo/bar", "VAR/foo/bar"}, // {"${VAR}/foo/bar", "${VAR}/foo/bar"}, // @@ -1375,7 +1375,7 @@ public class LinkedResourceWithPathVariableTest extends LinkedResourceTest { } String[][] tableLocationFormat = { // format: {internal-format, user-editable-format [, internal-format-reconverted] - {"C:\\foo\\bar", "C:\\foo\\bar", "C:/foo/bar"}, // + {"C:\\foo\\bar", "C:\\foo\\bar", "C:/foo/bar"}, // {"C:/foo/bar", "C:/foo/bar"}, // {"VAR/foo/bar", "VAR/foo/bar"}, // {"${VAR}/../foo/bar", "${VAR}/../foo/bar", "PARENT-1-VAR/foo/bar"}, // diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java index 133358709..2cafd6667 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerAttributeChangeListener.java @@ -25,7 +25,7 @@ import org.junit.Assert; */ public class MarkerAttributeChangeListener extends Assert implements IResourceChangeListener { //Map of (Long(id) -> Map of (String(attribute key) -> Object(attribute value))) - private Map<Long, Map<String, Object>> attributeMap = new HashMap<Long, Map<String, Object>>(); + private Map<Long, Map<String, Object>> attributeMap = new HashMap<>(); //cache the exception because it can't be thrown from a listener private AssertionFailedError error; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java index 44e714aba..717f3737e 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java @@ -353,7 +353,7 @@ public class MarkerTest extends ResourceTest { } public IResource[] createLargeHierarchy() { - ArrayList<String> result = new ArrayList<String>(); + ArrayList<String> result = new ArrayList<>(); result.add("/"); new MarkerTest().addChildren(result, Path.ROOT, 3, 4); String[] names = result.toArray(new String[result.size()]); @@ -650,7 +650,7 @@ public class MarkerTest extends ResourceTest { } // add more markers and do a search on all marker types - Vector<IMarker> allMarkers = new Vector<IMarker>(markers.length * 3); + Vector<IMarker> allMarkers = new Vector<>(markers.length * 3); for (int i = 0; i < markers.length; i++) allMarkers.add(markers[i]); try { @@ -1088,7 +1088,7 @@ public class MarkerTest extends ResourceTest { try { // create markers on all the non-project resources - final Hashtable<IResource, IMarker> table = new Hashtable<IResource, IMarker>(1); + final Hashtable<IResource, IMarker> table = new Hashtable<>(1); final int[] count = new int[1]; count[0] = 0; IWorkspaceRunnable body = new IWorkspaceRunnable() { @@ -1446,7 +1446,7 @@ public class MarkerTest extends ResourceTest { try { // create markers on all the resources - final Hashtable<IResource, IMarker> table = new Hashtable<IResource, IMarker>(1); + final Hashtable<IResource, IMarker> table = new Hashtable<>(1); final int[] count = new int[1]; count[0] = 0; IWorkspaceRunnable body = new IWorkspaceRunnable() { @@ -1548,7 +1548,7 @@ public class MarkerTest extends ResourceTest { fail("2.0", e); } final DataOutputStream output = o1; - final List<String> list = new ArrayList<String>(5); + final List<String> list = new ArrayList<>(5); IResourceVisitor visitor = new IResourceVisitor() { @Override public boolean visit(final IResource resource) { @@ -1643,7 +1643,7 @@ public class MarkerTest extends ResourceTest { // create the markers on the resources. create both transient // and persistent markers. - final ArrayList<IMarker> persistentMarkers = new ArrayList<IMarker>(); + final ArrayList<IMarker> persistentMarkers = new ArrayList<>(); IResourceVisitor visitor = new IResourceVisitor() { @Override public boolean visit(IResource resource) throws CoreException { @@ -1685,7 +1685,7 @@ public class MarkerTest extends ResourceTest { fail("2.0", e); } final DataOutputStream output = o1; - final List<String> list = new ArrayList<String>(5); + final List<String> list = new ArrayList<>(5); visitor = new IResourceVisitor() { @Override public boolean visit(final IResource resource) { @@ -1946,7 +1946,7 @@ public class MarkerTest extends ResourceTest { // expected } try { - HashMap<String, String> attributes = new HashMap<String, String>(); + HashMap<String, String> attributes = new HashMap<>(); attributes.put(IMarker.MESSAGE, "Hello"); marker.setAttributes(attributes); fail("5.3"); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java index 693a7ada8..53aac0686 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkersChangeListener.java @@ -35,7 +35,7 @@ public class MarkersChangeListener implements IResourceChangeListener { IPath path = resource == null ? Path.ROOT : resource.getFullPath(); Vector<IMarkerDelta> v = changes.get(path); if (v == null) - v = new Vector<IMarkerDelta>(); + v = new Vector<>(); int numChanges = (added == null ? 0 : added.length) + (removed == null ? 0 : removed.length) + (changed == null ? 0 : changed.length); if (numChanges != v.size()) return false; @@ -82,7 +82,7 @@ public class MarkersChangeListener implements IResourceChangeListener { } public void reset() { - changes = new Hashtable<IPath, Vector<IMarkerDelta>>(11); + changes = new Hashtable<>(11); } /** @@ -103,7 +103,7 @@ public class MarkersChangeListener implements IResourceChangeListener { IPath path = delta.getFullPath(); Vector<IMarkerDelta> v = changes.get(path); if (v == null) { - v = new Vector<IMarkerDelta>(); + v = new Vector<>(); changes.put(path, v); } IMarkerDelta[] markerDeltas = delta.getMarkerDeltas(); 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 3e8fb3096..ff8b3b836 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 @@ -50,7 +50,7 @@ public class ProjectOrderTest extends ResourceTest { try { IProjectDescription pd = source.getDescription(); IProject[] a = pd.getReferencedProjects(); - Set<IProject> x = new HashSet<IProject>(); + Set<IProject> x = new HashSet<>(); x.addAll(Arrays.asList(a)); x.add(target); IProject[] r = new IProject[x.size()]; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceDeltaVerifier.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceDeltaVerifier.java index 17fb24618..3125db41a 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceDeltaVerifier.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceDeltaVerifier.java @@ -94,7 +94,7 @@ public class ResourceDeltaVerifier extends Assert implements IResourceChangeList /** * Table of IPath -> ExpectedChange */ - private Hashtable<IPath, ExpectedChange> fExpectedChanges = new Hashtable<IPath, ExpectedChange>(); + private Hashtable<IPath, ExpectedChange> fExpectedChanges = new Hashtable<>(); boolean fIsDeltaValid = true; private StringBuffer fMessage = new StringBuffer(); /** @@ -243,7 +243,7 @@ public class ResourceDeltaVerifier extends Assert implements IResourceChangeList IResourceDelta[] changedChildren = delta.getAffectedChildren(IResourceDelta.CHANGED, IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS | IContainer.INCLUDE_HIDDEN); IResourceDelta[] removedChildren = delta.getAffectedChildren(IResourceDelta.REMOVED, IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS | IContainer.INCLUDE_HIDDEN); - Hashtable<IResource, IResourceDelta> h = new Hashtable<IResource, IResourceDelta>(affectedChildren.length + 1); + Hashtable<IResource, IResourceDelta> h = new Hashtable<>(affectedChildren.length + 1); for (int i = 0; i < addedChildren.length; ++i) { IResourceDelta childDelta1 = addedChildren[i]; @@ -440,7 +440,7 @@ public class ResourceDeltaVerifier extends Assert implements IResourceChangeList * are met after iterating over a resource delta. */ private void finishVerification() { - HashSet<IPath> resourcePaths = new HashSet<IPath>(fExpectedChanges.keySet()); + HashSet<IPath> resourcePaths = new HashSet<>(fExpectedChanges.keySet()); for (IPath resourcePath : resourcePaths) { fMessage.append("Checking expectations for "); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java index 380c115ae..734ff9416 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java @@ -69,7 +69,7 @@ public abstract class ResourceTest extends CoreTest { * test is complete * @see #getTempStore */ - private final Set<IFileStore> storesToDelete = new HashSet<IFileStore>(); + private final Set<IFileStore> storesToDelete = new HashSet<>(); /** * Does some garbage collections to free unused resources @@ -717,7 +717,7 @@ public abstract class ResourceTest extends CoreTest { * Returns invalid sets of natures */ protected String[][] getInvalidNatureSets() { - return new String[][] { {NATURE_SNOW}, //missing water pre-req + return new String[][] {{NATURE_SNOW}, //missing water pre-req {NATURE_WATER, NATURE_EARTH}, //duplicates from state-set {NATURE_WATER, NATURE_MUD}, //missing earth pre-req {NATURE_WATER, NATURE_EARTH, NATURE_MUD}, //duplicates from state-set @@ -791,7 +791,7 @@ public abstract class ResourceTest extends CoreTest { * Returns valid sets of natures */ protected String[][] getValidNatureSets() { - return new String[][] { {}, {NATURE_SIMPLE}, {NATURE_SNOW, NATURE_WATER}, {NATURE_EARTH}, {NATURE_WATER, NATURE_SIMPLE, NATURE_SNOW},}; + return new String[][] {{}, {NATURE_SIMPLE}, {NATURE_SNOW, NATURE_WATER}, {NATURE_EARTH}, {NATURE_WATER, NATURE_SIMPLE, NATURE_SNOW},}; } /** diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceVisitorVerifier.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceVisitorVerifier.java index b882fa16a..4bace8624 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceVisitorVerifier.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceVisitorVerifier.java @@ -72,7 +72,7 @@ public class ResourceVisitorVerifier extends Assert implements IResourceVisitor } public void reset() { - expected = new HashSet<IResource>(); + expected = new HashSet<>(); message = new StringBuffer(); verified = false; } diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java index 15180ccc0..94f1b857e 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java @@ -31,7 +31,7 @@ import org.osgi.service.prefs.Preferences; public class IContentTypeManagerTest extends ContentTypeTest { private static class ContentTypeChangeTracer implements IContentTypeManager.IContentTypeChangeListener { - private final Set<IContentType> changed = new HashSet<IContentType>(); + private final Set<IContentType> changed = new HashSet<>(); public ContentTypeChangeTracer() { } @@ -393,7 +393,7 @@ public class IContentTypeManagerTest extends ContentTypeTest { /** * See bug 90218. */ - public void testContentAndNameMatching() throws IOException /* not really */{ + public void testContentAndNameMatching() throws IOException /* not really */ { IContentTypeManager manager = Platform.getContentTypeManager(); byte[][] contents0 = {{0x0A, 0x0B, 0x0E, 0x10}}; @@ -595,7 +595,7 @@ public class IContentTypeManagerTest extends ContentTypeTest { assertEquals("5.1", appropriateSpecific1, finder.findContentTypeFor(getInputStream(MINIMAL_XML), null)); } - public void testDefaultProperties() throws IOException /* never actually thrown */{ + public void testDefaultProperties() throws IOException /* never actually thrown */ { IContentTypeManager contentTypeManager = Platform.getContentTypeManager(); IContentType mytext = contentTypeManager.getContentType(PI_RESOURCES_TESTS + '.' + "mytext"); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/LocalSelectionPolicy.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/LocalSelectionPolicy.java index 8b355b684..4d8bdfa48 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/LocalSelectionPolicy.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/LocalSelectionPolicy.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.content.IContentTypeManager.ISelectionPolicy; public class LocalSelectionPolicy implements ISelectionPolicy { @Override public IContentType[] select(IContentType[] candidates, boolean fileName, boolean content) { - List<IContentType> result = new ArrayList<IContentType>(candidates.length); + List<IContentType> result = new ArrayList<>(candidates.length); for (int i = 0; i < candidates.length; i++) { String namespace = getNamespace(candidates[i].getId()); if (namespace.equals(ContentTypeTest.PI_RESOURCES_TESTS) || namespace.equals(Platform.PI_RUNTIME)) diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/SubsetSelectionPolicy.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/SubsetSelectionPolicy.java index 51832f7f2..67cfc9c09 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/SubsetSelectionPolicy.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/SubsetSelectionPolicy.java @@ -18,12 +18,12 @@ public class SubsetSelectionPolicy implements ISelectionPolicy { private Set<IContentType> subset; public SubsetSelectionPolicy(IContentType[] subset) { - this.subset = new HashSet<IContentType>(Arrays.asList(subset)); + this.subset = new HashSet<>(Arrays.asList(subset)); } @Override public IContentType[] select(IContentType[] candidates, boolean fileName, boolean content) { - List<IContentType> result = new ArrayList<IContentType>(candidates.length); + List<IContentType> result = new ArrayList<>(candidates.length); for (int i = 0; i < candidates.length; i++) if (subset.contains(candidates[i])) result.add(candidates[i]); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchElementTree.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchElementTree.java index 825a9aa27..99436428b 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchElementTree.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchElementTree.java @@ -163,7 +163,7 @@ public class BenchElementTree extends OldCorePerformanceTest { * Returns an array of all the intermediary element trees. */ private ElementTree[] buildDeltaChain(ElementTree tree) { - Vector<ElementTree> trees = new Vector<ElementTree>(); + Vector<ElementTree> trees = new Vector<>(); trees.addElement(tree); int repeat = 1; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java index 749a4db0a..4786851bc 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java @@ -51,7 +51,7 @@ public class PropertyManagerPerformanceTest extends ResourceTest { folders[2] = folders[0].getFolder("folder3"); folders[3] = folders[2].getFolder("folder4"); folders[4] = folders[3].getFolder("folder5"); - List<IResource> resources = new ArrayList<IResource>(filesPerFolder * folders.length); + List<IResource> resources = new ArrayList<>(filesPerFolder * folders.length); for (int i = 0; i < folders.length; i++) resources.add(folders[i]); ensureExistsInWorkspace(folders, true); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/TestRefreshProvider.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/TestRefreshProvider.java index bbbceb069..9e24c8231 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/TestRefreshProvider.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/TestRefreshProvider.java @@ -21,8 +21,8 @@ import org.eclipse.core.resources.refresh.*; * */ public class TestRefreshProvider extends RefreshProvider implements IRefreshMonitor { - private final ArrayList<AssertionFailedError> failures = new ArrayList<AssertionFailedError>(); - private final HashSet<IResource> monitoredResources = new HashSet<IResource>(); + private final ArrayList<AssertionFailedError> failures = new ArrayList<>(); + private final HashSet<IResource> monitoredResources = new HashSet<>(); private static TestRefreshProvider instance; public static TestRefreshProvider getInstance() { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java index a085b595b..4d5413c8f 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java @@ -41,7 +41,7 @@ public class Bug_029851 extends ResourceTest { } private Collection<String> createChildren(int breadth, int depth, IPath prefix) { - ArrayList<String> result = new ArrayList<String>(); + ArrayList<String> result = new ArrayList<>(); for (int i = 0; i < breadth; i++) { IPath child = prefix.append(Integer.toString(i)).addTrailingSeparator(); result.add(child.toString()); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_097608.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_097608.java index b20bf7b40..4c923a180 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_097608.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_097608.java @@ -74,7 +74,7 @@ public class Bug_097608 extends ResourceTest { Arrays.fill(chars, 'a'); String value = new String(chars); - Map<String, String> markerAttributes = new HashMap<String, String>(); + Map<String, String> markerAttributes = new HashMap<>(); markerAttributes.put(IMarker.MESSAGE, value); IMarker marker = null; diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java index 76bf98fa8..b56af8cc1 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java @@ -59,7 +59,7 @@ public class Bug_192631 extends ResourceTest { URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, -1, FOLDER_A, null, null);
URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_B, -1, FOLDER_B, null, null);
- final Set<URI> toVisit = new HashSet<URI>();
+ final Set<URI> toVisit = new HashSet<>();
final int toVisitCount[] = new int[] {0};
IResourceVisitor visitor = new IResourceVisitor() {
@Override
@@ -107,7 +107,7 @@ public class Bug_192631 extends ResourceTest { URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_A, HOST_A, -1, FOLDER_A, null, null);
URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_B, HOST_A, -1, FOLDER_B, null, null);
- final Set<URI> toVisit = new HashSet<URI>();
+ final Set<URI> toVisit = new HashSet<>();
final int toVisitCount[] = new int[] {0};
IResourceVisitor visitor = new IResourceVisitor() {
@Override
@@ -155,7 +155,7 @@ public class Bug_192631 extends ResourceTest { URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_A, FOLDER_A, null, null);
URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_B, FOLDER_B, null, null);
- final Set<URI> toVisit = new HashSet<URI>();
+ final Set<URI> toVisit = new HashSet<>();
final int toVisitCount[] = new int[] {0};
IResourceVisitor visitor = new IResourceVisitor() {
@Override
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java index 313213e52..4dcbc61e1 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java @@ -24,8 +24,8 @@ import org.eclipse.core.tests.resources.ResourceTest; public class Bug_265810 extends ResourceTest { protected final static String VARIABLE_NAME = "ROOT"; - private final ArrayList<IPath> toDelete = new ArrayList<IPath>(); - List<IResourceDelta> resourceDeltas = new ArrayList<IResourceDelta>(); + private final ArrayList<IPath> toDelete = new ArrayList<>(); + List<IResourceDelta> resourceDeltas = new ArrayList<>(); /** * Constructor for Bug_265810. @@ -116,7 +116,7 @@ public class Bug_265810 extends ResourceTest { byte[] dotProject2 = storeDotProject(project); try { - resourceDeltas = new ArrayList<IResourceDelta>(); + resourceDeltas = new ArrayList<>(); getWorkspace().addResourceChangeListener(ll); // restore .project [1] @@ -137,7 +137,7 @@ public class Bug_265810 extends ResourceTest { } try { - resourceDeltas = new ArrayList<IResourceDelta>(); + resourceDeltas = new ArrayList<>(); getWorkspace().addResourceChangeListener(ll); // restore .project [2] diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java index 3f02b15b3..c35b82ee4 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java @@ -58,7 +58,7 @@ public class NLTest extends ResourceTest { } public String[] getFileNames(String language) { - List<String> names = new ArrayList<String>(20); + List<String> names = new ArrayList<>(20); if (language.equalsIgnoreCase("en")) { // English getFileNames(names, '\u0041', '\u005A'); // A - Z getFileNames(names, '\u0061', '\u007A'); // a - z diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java index 00f42ec16..e3fe89bc4 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java @@ -214,7 +214,7 @@ public class IProjectTest extends IResourceTest { ICommand command = desc.newCommand(); command.setBuilderName("org.eclipse.core.tests.buildername"); ICommand[] commands = new ICommand[] {command}; - Hashtable<String, String> arguments = new Hashtable<String, String>(2); + Hashtable<String, String> arguments = new Hashtable<>(2); arguments.put("param0", "arg0"); command.setArguments(arguments); // Add buildspec to project diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/SignaledBuilder.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/SignaledBuilder.java index bb7184fd1..628fdbd69 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/SignaledBuilder.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/SignaledBuilder.java @@ -19,14 +19,13 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; public class SignaledBuilder extends IncrementalProjectBuilder { - /** contants */ public static final String BUILDER_ID = "org.eclipse.core.tests.resources.sigbuilder"; /** * associate IProject->SignaledBuilder */ - private static HashMap<IProject, SignaledBuilder> instances = new HashMap<IProject, SignaledBuilder>(10); + private static HashMap<IProject, SignaledBuilder> instances = new HashMap<>(10); protected boolean wasExecuted; public static SignaledBuilder getInstance(IProject project) { diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java index dddbea378..63423ac1b 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java @@ -34,7 +34,7 @@ public class Snapshot2Test extends SnapshotTest { } protected static String[] defineHierarchy1() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); String[] old = Snapshot1Test.defineHierarchy1(); for (int i = 0; i < old.length; i++) result.add(old[i]); diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java index b109ce27f..fb060fd0f 100644 --- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java +++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java @@ -30,7 +30,7 @@ public class Snapshot4Test extends SnapshotTest { } protected static String[] defineHierarchy1() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); String[] old = Snapshot3Test.defineHierarchy1(); for (int i = 0; i < old.length; i++) result.add(old[i]); |