You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2015/09/06 17:14:28 UTC
[2/2] ant-ivy git commit: java 5 typing
java 5 typing
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/3fd058c0
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/3fd058c0
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/3fd058c0
Branch: refs/heads/master
Commit: 3fd058c02a1f8881110409be33ad56d3af6386f6
Parents: 8e0e1c3
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Sep 6 17:11:11 2015 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Sep 6 17:11:11 2015 +0200
----------------------------------------------------------------------
.../ivy/core/module/status/StatusManager.java | 23 ++++++++++----------
1 file changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3fd058c0/src/java/org/apache/ivy/core/module/status/StatusManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/module/status/StatusManager.java b/src/java/org/apache/ivy/core/module/status/StatusManager.java
index cb45b7f..53fc382 100644
--- a/src/java/org/apache/ivy/core/module/status/StatusManager.java
+++ b/src/java/org/apache/ivy/core/module/status/StatusManager.java
@@ -42,14 +42,14 @@ public class StatusManager {
return IvyContext.getContext().getSettings().getStatusManager();
}
- private List status = new ArrayList();
+ private List<Status> status = new ArrayList<Status>();
private String defaultStatus;
// for easier querying only
- private Map statusPriorityMap;
+ private Map<String, Integer> statusPriorityMap;
- private Map statusIntegrationMap;
+ private Map<String, Boolean> statusIntegrationMap;
private String deliveryStatusListString;
@@ -71,7 +71,7 @@ public class StatusManager {
this.defaultStatus = defaultStatus;
}
- public List getStatuses() {
+ public List<Status> getStatuses() {
return status;
}
@@ -79,14 +79,14 @@ public class StatusManager {
if (status.isEmpty()) {
throw new IllegalStateException("badly configured statuses: no status found");
}
- statusPriorityMap = new HashMap();
- for (ListIterator iter = status.listIterator(); iter.hasNext();) {
- Status status = (Status) iter.next();
+ statusPriorityMap = new HashMap<String, Integer>();
+ for (ListIterator<Status> iter = status.listIterator(); iter.hasNext();) {
+ Status status = iter.next();
statusPriorityMap.put(status.getName(), new Integer(iter.previousIndex()));
}
- statusIntegrationMap = new HashMap();
- for (Iterator iter = status.iterator(); iter.hasNext();) {
- Status status = (Status) iter.next();
+ statusIntegrationMap = new HashMap<String, Boolean>();
+ for (Iterator<Status> iter = status.iterator(); iter.hasNext();) {
+ Status status = iter.next();
statusIntegrationMap.put(status.getName(), Boolean.valueOf(status.isIntegration()));
}
}
@@ -125,8 +125,7 @@ public class StatusManager {
public String getDeliveryStatusListString() {
if (deliveryStatusListString == null) {
StringBuffer ret = new StringBuffer();
- for (Iterator iter = status.iterator(); iter.hasNext();) {
- Status status = (Status) iter.next();
+ for (Status status : this.status) {
if (!status.isIntegration()) {
ret.append(status.getName()).append(",");
}