Fixed compile warnings
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 3e0c828..231ffd0 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.MacroInstance;
+
import org.eclipse.ant.internal.core.IAntCoreConstants;
import org.eclipse.ant.internal.launching.debug.model.DebugMessageIds;
@@ -33,8 +34,8 @@
private static final String fgAntCallTaskName = "antcall"; //$NON-NLS-1$
private IDebugBuildLogger fLogger;
- private Stack<Task> fTasks = new Stack<Task>();
- private Map<Task, Object> fTaskToProxies = new HashMap<Task, Object>();
+ private Stack<Task> fTasks = new Stack<>();
+ private Map<Task, Object> fTaskToProxies = new HashMap<>();
private Task fCurrentTask;
private Task fStepOverTask;
private Task fStepIntoTask;
@@ -46,8 +47,8 @@
private Map<Project, Vector<?>> fProjectToTargetNames = null;
private Map<Project, Map<Target, Vector<Target>>> fProjectToMapOfTargetToBuildSequence = null;
- private Stack<Target> fTargetsToExecute = new Stack<Target>();
- private Stack<Target> fTargetsExecuting = new Stack<Target>();
+ private Stack<Target> fTargetsToExecute = new Stack<>();
+ private Stack<Target> fTargetsExecuting = new Stack<>();
private boolean fConsiderTargetBreakpoints = false;
private boolean fShouldSuspend;
@@ -60,8 +61,8 @@
}
public void buildStarted() {
- fProjectToTargetNames = new HashMap<Project, Vector<?>>();
- fProjectToMapOfTargetToBuildSequence = new HashMap<Project, Map<Target, Vector<Target>>>();
+ fProjectToTargetNames = new HashMap<>();
+ fProjectToMapOfTargetToBuildSequence = new HashMap<>();
}
/**
@@ -299,7 +300,7 @@
Object ref = eventProject.getReference(IAntCoreConstants.TARGET_VECTOR_NAME);
if (ref != null) {
fProjectToTargetNames.put(eventProject, (Vector<?>) ref);
- 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);
}
@@ -548,7 +549,7 @@
private Target initializeBuildSequenceInformation(BuildEvent event, Map<Target, Vector<Target>> targetToBuildSequence) {
Project antProject = event.getProject();
- Vector<String> targets = (Vector<String>) antProject.getReference(IAntCoreConstants.TARGET_VECTOR_NAME);
+ Vector<String> targets = antProject.getReference(IAntCoreConstants.TARGET_VECTOR_NAME);
if (targets == null || targets.size() < 1) {
return null;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelProject.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelProject.java
index 0d11caf..c1adfaa 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelProject.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelProject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
* Portions Copyright 2000-2004 The Apache Software Foundation
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Apache Software License v2.0 which
@@ -28,6 +28,7 @@
import org.apache.tools.ant.PropertyHelper;
import org.apache.tools.ant.UnknownElement;
import org.apache.tools.ant.types.Path;
+
import org.eclipse.ant.internal.core.IAntCoreConstants;
/**
@@ -168,6 +169,7 @@
*
* @see org.apache.tools.ant.Project#getReference(java.lang.String)
*/
+ @SuppressWarnings("unchecked")
@Override
public <T> T getReference(String key) {
T ref = super.getReference(key);/* references.get(key); */
@@ -224,7 +226,7 @@
public AntClassLoader createClassLoader(Path path) {
synchronized (loaderLock) {
if (loaders == null) {
- loaders = new Hashtable<String, AntClassLoader>(8);
+ loaders = new Hashtable<>(8);
}
Path p = path;
if (p == null) {
