Remove redundant type information from ant.launching
Done via JDT cleanup actions
Change-Id: I568b496e127abfe90e8ec57138cd4806c2d6c7ae
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java b/ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
index 20b8395..747f624 100644
--- a/ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
+++ b/ant/org.eclipse.ant.launching/common/org/eclipse/ant/internal/launching/debug/AntDebugState.java
@@ -36,9 +36,9 @@
private IDebugBuildLogger fLogger;
@SuppressWarnings("unused")
- private Stack<Task> fTasks = new Stack<Task>();
+ private Stack<Task> fTasks = new Stack<>();
@SuppressWarnings("unused")
- private Map<Task, Object> fTaskToProxies = new HashMap<Task, Object>();
+ private Map<Task, Object> fTaskToProxies = new HashMap<>();
private Task fCurrentTask;
private Task fStepOverTask;
private Task fStepIntoTask;
@@ -51,9 +51,9 @@
private Map<Project, Vector<?>> fProjectToTargetNames = null;
private Map<Project, Map<Target, Vector<Target>>> fProjectToMapOfTargetToBuildSequence = null;
@SuppressWarnings("unused")
- private Stack<Target> fTargetsToExecute = new Stack<Target>();
+ private Stack<Target> fTargetsToExecute = new Stack<>();
@SuppressWarnings("unused")
- private Stack<Target> fTargetsExecuting = new Stack<Target>();
+ private Stack<Target> fTargetsExecuting = new Stack<>();
private boolean fConsiderTargetBreakpoints = false;
private boolean fShouldSuspend;
@@ -67,8 +67,8 @@
@SuppressWarnings("unused")
public void buildStarted() {
- fProjectToTargetNames = new HashMap<Project, Vector<?>>();
- fProjectToMapOfTargetToBuildSequence = new HashMap<Project, Map<Target, Vector<Target>>>();
+ fProjectToTargetNames = new HashMap<>();
+ fProjectToMapOfTargetToBuildSequence = new HashMap<>();
}
/**
@@ -307,7 +307,7 @@
if (ref != null) {
fProjectToTargetNames.put(eventProject, (Vector<?>) ref);
@SuppressWarnings("unused")
- HashMap<Target, Vector<Target>> targetToBuildSequence = new HashMap<Target, Vector<Target>>();
+ HashMap<Target, Vector<Target>> targetToBuildSequence = new HashMap<>();
setTargetToExecute(initializeBuildSequenceInformation(event, targetToBuildSequence));
fProjectToMapOfTargetToBuildSequence.put(eventProject, targetToBuildSequence);
}
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseDefaultExecutor.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseDefaultExecutor.java
index 5ba304b..ff7cf0c 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseDefaultExecutor.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseDefaultExecutor.java
@@ -28,7 +28,7 @@
@SuppressWarnings("unused")
@Override
public void executeTargets(Project project, String[] targetNames) throws BuildException {
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.addAll(Arrays.asList(targetNames));
project.addReference(IAntCoreConstants.TARGET_VECTOR_NAME, v);
super.executeTargets(project, targetNames);
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseSingleCheckExecutor.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseSingleCheckExecutor.java
index 39f45b0..2d000b0 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseSingleCheckExecutor.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/EclipseSingleCheckExecutor.java
@@ -26,7 +26,7 @@
@SuppressWarnings("unused")
@Override
public void executeTargets(Project project, String[] targetNames) throws BuildException {
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
v.addAll(Arrays.asList(targetNames));
project.addReference(IAntCoreConstants.TARGET_VECTOR_NAME, v);
super.executeTargets(project, targetNames);
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
index 4e8e3cd..58d4032 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
@@ -115,7 +115,7 @@
private boolean scriptExecuted = false;
@SuppressWarnings("unused")
- private List<String> propertyFiles = new ArrayList<String>();
+ private List<String> propertyFiles = new ArrayList<>();
/**
* The Ant InputHandler class. There may be only one input handler.
@@ -160,7 +160,7 @@
// We could be using Arrays.asList() here, but it does not specify
// what kind of list it will return. We need a list that
// implements the method List.remove(Object) and ArrayList does.
- ArrayList<String> result = new ArrayList<String>(args.length);
+ ArrayList<String> result = new ArrayList<>(args.length);
for (String arg : args) {
result.add(arg);
}
@@ -262,9 +262,9 @@
Target currentTarget;
// split the targets in top-level and sub-targets depending
// on the presence of a description
- List<String> topNames = new ArrayList<String>();
- List<String> topDescriptions = new ArrayList<String>();
- List<String> subNames = new ArrayList<String>();
+ List<String> topNames = new ArrayList<>();
+ List<String> topDescriptions = new ArrayList<>();
+ List<String> subNames = new ArrayList<>();
while (ptargets.hasMoreElements()) {
currentTarget = ptargets.nextElement();
@@ -287,13 +287,13 @@
String defaultTargetName = project.getDefaultTarget();
if (defaultTargetName != null && !IAntCoreConstants.EMPTY_STRING.equals(defaultTargetName)) { // shouldn't need to check but...
- List<String> defaultName = new ArrayList<String>(1);
+ List<String> defaultName = new ArrayList<>(1);
List<String> defaultDesc = null;
defaultName.add(defaultTargetName);
int indexOfDefDesc = topNames.indexOf(defaultTargetName);
if (indexOfDefDesc >= 0) {
- defaultDesc = new ArrayList<String>(1);
+ defaultDesc = new ArrayList<>(1);
defaultDesc.add(topDescriptions.get(indexOfDefDesc));
}
printTargets(project, defaultName, defaultDesc, RemoteAntMessages.getString("InternalAntRunner.Default_target__3"), maxLength); //$NON-NLS-1$
@@ -450,7 +450,7 @@
System.setSecurityManager(new AntSecurityManager(originalSM, Thread.currentThread()));
if (targets == null) {
- targets = new Vector<String>(1);
+ targets = new Vector<>(1);
}
if (targets.isEmpty() && getCurrentProject().getDefaultTarget() != null) {
targets.add(getCurrentProject().getDefaultTarget());
@@ -796,7 +796,7 @@
throw new BuildException(RemoteAntMessages.getString("InternalAntRunner.You_must_specify_a_classname_when_using_the_-listener_argument_1")); //$NON-NLS-1$
}
if (buildListeners == null) {
- buildListeners = new ArrayList<String>(1);
+ buildListeners = new ArrayList<>(1);
}
buildListeners.add(arg);
arg = getArgument(commands, "-listener"); //$NON-NLS-1$
@@ -955,7 +955,7 @@
String arg = getArgument(commands, "-eclipseTask"); //$NON-NLS-1$
while (arg != null) {
if (eclipseSpecifiedTasks == null) {
- eclipseSpecifiedTasks = new HashMap<String, String>();
+ eclipseSpecifiedTasks = new HashMap<>();
}
int index = arg.indexOf(',');
if (index != -1) {
@@ -969,7 +969,7 @@
arg = getArgument(commands, "-eclipseType"); //$NON-NLS-1$
while (arg != null) {
if (eclipseSpecifiedTypes == null) {
- eclipseSpecifiedTypes = new HashMap<String, String>();
+ eclipseSpecifiedTypes = new HashMap<>();
}
int index = arg.indexOf(',');
if (index != -1) {
@@ -1019,7 +1019,7 @@
@SuppressWarnings("unused")
private void processTargets(List<String> commands) {
if (targets == null) {
- targets = new Vector<String>(commands.size());
+ targets = new Vector<>(commands.size());
}
for (String string : commands) {
targets.add(string);
@@ -1114,7 +1114,7 @@
continue;
}
if (userProperties == null) {
- userProperties = new HashMap<String, String>();
+ userProperties = new HashMap<>();
}
userProperties.put(name, value);
commands.remove(args[i]);
@@ -1294,7 +1294,7 @@
filename, e.getMessage() });
}
if (userProperties == null) {
- userProperties = new HashMap<String, String>();
+ userProperties = new HashMap<>();
}
Enumeration<?> propertyNames = props.propertyNames();
while (propertyNames.hasMoreElements()) {
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
index a18ccd6..69a8eca 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntBuildLogger.java
@@ -253,7 +253,7 @@
return;
}
if (fEventQueue == null) {
- fEventQueue = new ArrayList<BuildEvent>(10);
+ fEventQueue = new ArrayList<>(10);
}
fEventQueue.add(event);
return;
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
index ea7cbab..19e85cd 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/logger/RemoteAntDebugBuildLogger.java
@@ -335,7 +335,7 @@
@SuppressWarnings("unused")
protected void addBreakpoint(String breakpointRepresentation) {
if (fBreakpoints == null) {
- fBreakpoints = new ArrayList<RemoteAntBreakpoint>();
+ fBreakpoints = new ArrayList<>();
}
RemoteAntBreakpoint newBreakpoint = new RemoteAntBreakpoint(breakpointRepresentation);
if (!fBreakpoints.contains(newBreakpoint)) {
