backwards-compatible introduction of generics
diff --git a/src/main/org/apache/ant/compress/resources/SevenZResource.java b/src/main/org/apache/ant/compress/resources/SevenZResource.java
index d6410c7..9a5d25d 100644
--- a/src/main/org/apache/ant/compress/resources/SevenZResource.java
+++ b/src/main/org/apache/ant/compress/resources/SevenZResource.java
@@ -32,6 +32,7 @@
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
import org.apache.commons.compress.archivers.sevenz.SevenZFile;
+import org.apache.commons.compress.archivers.sevenz.SevenZMethodConfiguration;
/**
* A Resource representation of an entry in a sevenzfile.
@@ -40,7 +41,7 @@
*/
public final class SevenZResource extends CommonsCompressArchiveResource {
- private Iterable/*<? extends SevenZMethodConfiguration>*/ contentMethods;
+ private Iterable<? extends SevenZMethodConfiguration> contentMethods;
/**
* Default constructor.
diff --git a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
index 7dbc44a..74e34fc 100644
--- a/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
+++ b/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
@@ -82,7 +82,7 @@
private EntryBuilder entryBuilder;
private Resource dest;
- private List/*<ResourceCollection>*/ sources = new ArrayList();
+ private List<ResourceCollection> sources = new ArrayList();
private Mode mode = new Mode();
private String encoding;
private boolean filesOnly = true;
@@ -358,8 +358,8 @@
protected Collection/*<ResourceWithFlags>*/ findSources()
throws IOException {
- List/*<ResourceWithFlags>*/ l = new ArrayList/*<ResourceWithFlags>*/();
- Set/*<String>*/ addedNames = new HashSet/*<String>*/();
+ List<ResourceWithFlags> l = new ArrayList<>();
+ Set<String> addedNames = new HashSet<>();
for (Iterator rcs = sources.iterator(); rcs.hasNext(); ) {
ResourceCollection rc = (ResourceCollection) rcs.next();
ResourceCollectionFlags rcFlags = getFlags(rc);
@@ -428,7 +428,7 @@
existingEntries
.getDirectoryScanner(getProject()));
if (outOfDate.length > 0 && Mode.UPDATE.equals(getMode().getValue())) {
- HashSet/*<String>*/ oodNames = new HashSet/*<String>*/();
+ HashSet<String> oodNames = new HashSet<>();
for (int i = 0; i < outOfDate.length; i++) {
oodNames.add(outOfDate[i].getName());
}
@@ -471,7 +471,7 @@
Collection/*<ResourceWithFlags>*/ src)
throws IOException {
- List/*<ResourceWithFlags>*/ l = new ArrayList/*<ResourceWithFlags>*/();
+ List<ResourceWithFlags> l = new ArrayList<>();
ResourceCollectionFlags rcFlags = getFlags(target);
Restrict res = new Restrict();
diff --git a/src/main/org/apache/ant/compress/taskdefs/Pack200.java b/src/main/org/apache/ant/compress/taskdefs/Pack200.java
index 3747785..83e30d3 100644
--- a/src/main/org/apache/ant/compress/taskdefs/Pack200.java
+++ b/src/main/org/apache/ant/compress/taskdefs/Pack200.java
@@ -42,7 +42,7 @@
public final class Pack200 extends PackBase {
private Pack200StrategyEnum strategy = Pack200StrategyEnum.IN_MEMORY;
- private final Map/*<String, String>*/ properties = new HashMap();
+ private final Map<String, String> properties = new HashMap<>();
public Pack200() {
super(new PackBase.ResourceWrapper() {
@@ -115,4 +115,4 @@
return (Pack200Strategy) STRATEGIES.get(getValue());
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
index 5eb08da..d071523 100644
--- a/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
+++ b/src/main/org/apache/ant/compress/taskdefs/Pack200Normalize.java
@@ -46,7 +46,7 @@
public class Pack200Normalize extends Task {
private File src, dest;
private boolean force = false;
- private Map/*<String, String>*/ properties = new HashMap();
+ private Map<String, String> properties = new HashMap();
/**
* The JAR archive to normalize.
diff --git a/src/main/org/apache/ant/compress/taskdefs/SevenZ.java b/src/main/org/apache/ant/compress/taskdefs/SevenZ.java
index 845ca2f..99b72de 100644
--- a/src/main/org/apache/ant/compress/taskdefs/SevenZ.java
+++ b/src/main/org/apache/ant/compress/taskdefs/SevenZ.java
@@ -44,7 +44,7 @@
private boolean keepCompression = false;
private String contentCompression;
- private List/*<SevenZMethodConfiguration>*/ contentMethods;
+ private List<SevenZMethodConfiguration> contentMethods;
public SevenZ() {
setFactory(new SevenZStreamFactory() {
@@ -112,7 +112,7 @@
throw new BuildException("you must not specify contentCompression and nested contentMethod elements at the same time");
}
if (contentMethods == null) {
- contentMethods = new ArrayList/*<SevenZMethodConfiguration>*/();
+ contentMethods = new ArrayList<>();
}
contentMethods.add(asMethodConfiguration(cm));
}
diff --git a/src/main/org/apache/ant/compress/taskdefs/UnPack200.java b/src/main/org/apache/ant/compress/taskdefs/UnPack200.java
index 0d936f3..0877f1d 100644
--- a/src/main/org/apache/ant/compress/taskdefs/UnPack200.java
+++ b/src/main/org/apache/ant/compress/taskdefs/UnPack200.java
@@ -37,7 +37,7 @@
private Pack200.Pack200StrategyEnum strategy =
Pack200.Pack200StrategyEnum.IN_MEMORY;
- private final Map/*<String, String>*/ properties = new HashMap();
+ private final Map<String, String> properties = new HashMap();
public UnPack200() {
super(".pack");
@@ -76,4 +76,4 @@
properties.put(prop.getKey(), prop.getValue());
}
-}
\ No newline at end of file
+}
