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/01/04 19:00:40 UTC
[4/6] ant-ivy git commit: use java 5 constructs
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/CompareFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/CompareFilter.java b/src/java/org/apache/ivy/osgi/filter/CompareFilter.java
index cc8f564..13f33e3 100644
--- a/src/java/org/apache/ivy/osgi/filter/CompareFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/CompareFilter.java
@@ -24,7 +24,7 @@ public class CompareFilter extends OSGiFilter {
public static enum Operator {
EQUALS("="), LOWER_THAN("<"), LOWER_OR_EQUAL("<="), GREATER_THAN(">"), GREATER_OR_EQUAL(
- ">=");
+ ">="), APPROX("~="), PRESENT("=*");
private String op;
@@ -32,6 +32,7 @@ public class CompareFilter extends OSGiFilter {
this.op = op;
}
+ @Override
public String toString() {
return op;
}
@@ -43,10 +44,13 @@ public class CompareFilter extends OSGiFilter {
private final String leftValue;
+ private boolean substring;
+
public CompareFilter(String leftValue, Operator operator, String rightValue) {
this.leftValue = leftValue;
this.rightValue = rightValue;
this.operator = operator;
+ this.substring = operator == Operator.EQUALS && rightValue.contains("*");
}
public String getLeftValue() {
@@ -61,6 +65,7 @@ public class CompareFilter extends OSGiFilter {
return rightValue;
}
+ @Override
public void append(StringBuffer builder) {
builder.append("(");
builder.append(leftValue);
@@ -75,6 +80,17 @@ public class CompareFilter extends OSGiFilter {
if (actualValue == null) {
return false;
}
+ if (operator == Operator.PRESENT) {
+ return true;
+ }
+ if (operator == Operator.APPROX) {
+ // TODO
+ return false;
+ }
+ if (substring) {
+ // TODO
+ return false;
+ }
int diff = rightValue.compareTo(actualValue);
switch (operator) {
case EQUALS:
@@ -92,6 +108,7 @@ public class CompareFilter extends OSGiFilter {
}
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -101,6 +118,7 @@ public class CompareFilter extends OSGiFilter {
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java b/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java
index f407c05..8872d01 100644
--- a/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java
@@ -37,6 +37,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter {
abstract protected char operator();
+ @Override
public void append(StringBuffer builder) {
builder.append('(');
builder.append(operator());
@@ -54,6 +55,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter {
return subFilters;
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -63,6 +65,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter {
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/NotFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/NotFilter.java b/src/java/org/apache/ivy/osgi/filter/NotFilter.java
index fce5cd8..5e436a6 100644
--- a/src/java/org/apache/ivy/osgi/filter/NotFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/NotFilter.java
@@ -25,6 +25,7 @@ public class NotFilter extends UniOperatorFilter {
super(subFilter);
}
+ @Override
protected char operator() {
return '!';
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java b/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java
index e406755..4d0b58a 100644
--- a/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java
@@ -21,6 +21,7 @@ import java.util.Map;
public abstract class OSGiFilter {
+ @Override
public String toString() {
StringBuffer builder = new StringBuffer();
append(builder);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java b/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java
index cd3d6e2..7f21ea6 100644
--- a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java
+++ b/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java
@@ -92,6 +92,15 @@ public class OSGiFilterParser {
if (c != '(') {
throw new ParseException("Expecting '(' as the start of the filter", pos);
}
+ OSGiFilter filter = parseFilterComp();
+ readNext();
+ if (c != ')') {
+ throw new ParseException("Expecting ')' as the end of the filter", pos);
+ }
+ return filter;
+ }
+
+ private OSGiFilter parseFilterComp() throws ParseException {
OSGiFilter filter;
switch (readNext()) {
case '&':
@@ -105,17 +114,13 @@ public class OSGiFilterParser {
break;
default:
unread();
- filter = parseCompare();
+ filter = parseOperation();
break;
}
- readNext();
- if (c != ')') {
- throw new ParseException("Expecting ')' as the end of the filter", pos);
- }
return filter;
}
- private OSGiFilter parseCompare() throws ParseException {
+ private OSGiFilter parseOperation() throws ParseException {
String leftValue = parseCompareValue();
Operator operator = parseCompareOperator();
String rightValue = parseCompareValue();
@@ -137,12 +142,16 @@ public class OSGiFilterParser {
}
private boolean isOperator(char ch) {
- return ch == '=' || ch == '<' || ch == '>';
+ return ch == '=' || ch == '<' || ch == '>' || ch == '~';
}
private Operator parseCompareOperator() throws ParseException {
switch (readNext()) {
case '=':
+ if (readNext() == '*') {
+ return Operator.PRESENT;
+ }
+ unread();
return Operator.EQUALS;
case '>':
if (readNext() == '=') {
@@ -156,25 +165,30 @@ public class OSGiFilterParser {
}
unread();
return Operator.LOWER_THAN;
+ case '~':
+ if (readNext() == '=') {
+ return Operator.LOWER_OR_EQUAL;
+ }
+ unread();
default:
break;
}
- throw new ParseException("Expecting an operator: =, <, <=, > or >=", pos);
+ throw new ParseException("Expecting an operator: =, <, <=, >, >=, ~= or =*", pos);
}
private OSGiFilter parseAnd() throws ParseException {
AndFilter filter = new AndFilter();
- parseMultiOperator(filter);
+ parseFilterList(filter);
return filter;
}
private OSGiFilter parseOr() throws ParseException {
OrFilter filter = new OrFilter();
- parseMultiOperator(filter);
+ parseFilterList(filter);
return filter;
}
- private void parseMultiOperator(MultiOperatorFilter filter) throws ParseException {
+ private void parseFilterList(MultiOperatorFilter filter) throws ParseException {
do {
skipWhiteSpace();
readNext();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/OrFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/OrFilter.java b/src/java/org/apache/ivy/osgi/filter/OrFilter.java
index ef8b126..e7e8031 100644
--- a/src/java/org/apache/ivy/osgi/filter/OrFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/OrFilter.java
@@ -29,6 +29,7 @@ public class OrFilter extends MultiOperatorFilter {
super(filters);
}
+ @Override
protected char operator() {
return '|';
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java b/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java
index 02e7ef5..59c6962 100644
--- a/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java
+++ b/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java
@@ -27,6 +27,7 @@ public abstract class UniOperatorFilter extends OSGiFilter {
abstract protected char operator();
+ @Override
public void append(StringBuffer builder) {
builder.append("(");
builder.append(operator());
@@ -38,6 +39,7 @@ public abstract class UniOperatorFilter extends OSGiFilter {
return subFilter;
}
+ @Override
public int hashCode() {
final int prime = 31;
int result = 1;
@@ -45,6 +47,7 @@ public abstract class UniOperatorFilter extends OSGiFilter {
return result;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java b/src/java/org/apache/ivy/osgi/obr/OBRResolver.java
index 581be3c..f4fb3e5 100644
--- a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java
+++ b/src/java/org/apache/ivy/osgi/obr/OBRResolver.java
@@ -25,7 +25,6 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import java.text.ParseException;
import org.apache.ivy.core.cache.CacheResourceOptions;
import org.apache.ivy.core.event.EventManager;
@@ -62,6 +61,7 @@ public class OBRResolver extends AbstractOSGiResolver {
this.forceMetadataUpdate = forceMetadataUpdate;
}
+ @Override
protected void init() {
if (repoXmlFile != null && repoXmlURL != null) {
throw new RuntimeException("The OBR repository resolver " + getName()
@@ -125,10 +125,6 @@ public class OBRResolver extends AbstractOSGiResolver {
}
try {
setRepoDescriptor(OBRXMLParser.parse(baseUri, in));
- } catch (ParseException e) {
- throw new RuntimeException("The OBR repository resolver " + getName()
- + " couldn't be configured: the file " + sourceLocation
- + " is incorrectly formed (" + e.getMessage() + ")", e);
} catch (IOException e) {
throw new RuntimeException("The OBR repository resolver " + getName()
+ " couldn't be configured: the file " + sourceLocation
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java
index 9353880..3f9088c 100644
--- a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java
+++ b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java
@@ -41,8 +41,8 @@ import org.xml.sax.SAXParseException;
public class OBRXMLParser {
- public static BundleRepoDescriptor parse(URI baseUri, InputStream in) throws ParseException,
- IOException, SAXException {
+ public static BundleRepoDescriptor parse(URI baseUri, InputStream in) throws IOException,
+ SAXException {
RepositoryHandler handler = new RepositoryHandler(baseUri);
try {
XMLHelper.parse(in, null, handler, null);
@@ -68,12 +68,14 @@ public class OBRXMLParser {
super(REPOSITORY);
this.baseUri = baseUri;
addChild(new ResourceHandler(), new ChildElementHandler<ResourceHandler>() {
+ @Override
public void childHanlded(ResourceHandler child) {
repo.addBundle(child.bundleInfo);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
repo = new BundleRepoDescriptor(baseUri,
ExecutionEnvironmentProfileProvider.getInstance());
@@ -109,6 +111,7 @@ public class OBRXMLParser {
// resource
addChild(new ResourceSourceHandler(), new ChildElementHandler<ResourceSourceHandler>() {
+ @Override
public void childHanlded(ResourceSourceHandler child) {
String uri = child.getBufferedChars().trim();
if (!uri.endsWith(".jar")) {
@@ -129,23 +132,27 @@ public class OBRXMLParser {
});
addChild(new ResourceDescriptionHandler(),
new ChildElementHandler<ResourceDescriptionHandler>() {
+ @Override
public void childHanlded(ResourceDescriptionHandler child) {
bundleInfo.setDescription(child.getBufferedChars().trim());
}
});
addChild(new ResourceDocumentationHandler(),
new ChildElementHandler<ResourceDocumentationHandler>() {
+ @Override
public void childHanlded(ResourceDocumentationHandler child) {
bundleInfo.setDocumentation(child.getBufferedChars().trim());
}
});
addChild(new ResourceLicenseHandler(),
new ChildElementHandler<ResourceLicenseHandler>() {
+ @Override
public void childHanlded(ResourceLicenseHandler child) {
bundleInfo.setLicense(child.getBufferedChars().trim());
}
});
addChild(new ResourceSizeHandler(), new ChildElementHandler<ResourceSizeHandler>() {
+ @Override
public void childHanlded(ResourceSizeHandler child) {
String size = child.getBufferedChars().trim();
try {
@@ -158,6 +165,7 @@ public class OBRXMLParser {
}
});
addChild(new CapabilityHandler(), new ChildElementHandler<CapabilityHandler>() {
+ @Override
public void childHanlded(CapabilityHandler child) throws SAXParseException {
try {
@@ -169,6 +177,7 @@ public class OBRXMLParser {
}
});
addChild(new RequireHandler(), new ChildElementHandler<RequireHandler>() {
+ @Override
public void childHanlded(RequireHandler child) throws SAXParseException {
try {
RequirementAdapter.adapt(bundleInfo, child.requirement);
@@ -183,12 +192,14 @@ public class OBRXMLParser {
}
});
addChild(new ExtendHandler(), new ChildElementHandler<ExtendHandler>() {
+ @Override
public void childHanlded(ExtendHandler child) throws SAXParseException {
// TODO handle fragment host
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String symbolicname = atts.getValue(SYMBOLIC_NAME);
if (symbolicname == null) {
@@ -224,6 +235,7 @@ public class OBRXMLParser {
bundleInfo.setId(atts.getValue(ID));
}
+ @Override
protected String getCurrentElementIdentifier() {
return bundleInfo.getSymbolicName() + "/" + bundleInfo.getVersion();
}
@@ -295,6 +307,7 @@ public class OBRXMLParser {
super(CAPABILITY);
addChild(new CapabilityPropertyHandler(),
new ChildElementHandler<CapabilityPropertyHandler>() {
+ @Override
public void childHanlded(CapabilityPropertyHandler child) {
String name = child.name;
String value = child.value;
@@ -305,6 +318,7 @@ public class OBRXMLParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String name = getRequiredAttribute(atts, NAME);
capability = new Capability(name);
@@ -332,6 +346,7 @@ public class OBRXMLParser {
super(CAPABILITY_PROPERTY);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
name = getRequiredAttribute(atts, NAME);
value = getRequiredAttribute(atts, VALUE);
@@ -357,6 +372,7 @@ public class OBRXMLParser {
super(name);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String name = getRequiredAttribute(atts, NAME);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
index 71d4d75..0d3786f 100644
--- a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
@@ -80,6 +80,7 @@ public class P2ArtifactParser implements XMLInputParser {
// }
// });
addChild(new MappingsHandler(), new ChildElementHandler<MappingsHandler>() {
+ @Override
public void childHanlded(MappingsHandler child) {
for (Entry<String, String> entry : child.outputByFilter.entrySet()) {
OSGiFilter filter;
@@ -95,6 +96,7 @@ public class P2ArtifactParser implements XMLInputParser {
});
addChild(new ArtifactsHandler(p2Descriptor, artifactPatterns, repoUrl),
new ChildElementHandler<ArtifactsHandler>() {
+ @Override
public void childHanlded(ArtifactsHandler child) {
// nothing to do
}
@@ -118,12 +120,14 @@ public class P2ArtifactParser implements XMLInputParser {
public MappingsHandler() {
super(MAPPINGS);
addChild(new RuleHandler(), new ChildElementHandler<RuleHandler>() {
+ @Override
public void childHanlded(RuleHandler child) {
outputByFilter.put(child.filter, child.output);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
outputByFilter = new LinkedHashMap<String, String>(size);
@@ -147,6 +151,7 @@ public class P2ArtifactParser implements XMLInputParser {
super(RULE);
}
+ @Override
protected void handleAttributes(Attributes atts) {
filter = atts.getValue(FILTER);
output = atts.getValue(OUTPUT);
@@ -164,6 +169,7 @@ public class P2ArtifactParser implements XMLInputParser {
final Map<OSGiFilter, String> artifactPatterns, final String repoUrl) {
super(ARTIFACTS);
addChild(new ArtifactHandler(), new ChildElementHandler<ArtifactHandler>() {
+ @Override
public void childHanlded(ArtifactHandler child) throws SAXParseException {
String url = getPattern(child.p2Artifact, child.properties);
if (url != null) {
@@ -224,12 +230,14 @@ public class P2ArtifactParser implements XMLInputParser {
public ArtifactHandler() {
super(ARTIFACT);
addChild(new PropertiesHandler(), new ChildElementHandler<PropertiesHandler>() {
+ @Override
public void childHanlded(PropertiesHandler child) {
properties = child.properties;
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String id = atts.getValue(ID);
Version version;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java b/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
index 8b1b041..1a9bf78 100644
--- a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
@@ -66,6 +66,7 @@ public class P2CompositeParser implements XMLInputParser {
public RepositoryHandler() {
super(REPOSITORY);
addChild(new ChildrenHandler(), new ChildElementHandler<ChildrenHandler>() {
+ @Override
public void childHanlded(ChildrenHandler child) {
childLocations = child.childLocations;
}
@@ -89,12 +90,14 @@ public class P2CompositeParser implements XMLInputParser {
public ChildrenHandler() {
super(CHILDREN);
addChild(new ChildHandler(), new ChildElementHandler<ChildHandler>() {
+ @Override
public void childHanlded(ChildHandler child) {
childLocations.add(child.location);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
childLocations = new ArrayList<String>(size);
@@ -114,6 +117,7 @@ public class P2CompositeParser implements XMLInputParser {
super(CHILD);
}
+ @Override
protected void handleAttributes(Attributes atts) {
location = atts.getValue(LOCATION);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
index 1630424..c8a24ad 100644
--- a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java
@@ -93,6 +93,7 @@ public class P2MetadataParser implements XMLInputParser {
// }
// });
addChild(new UnitsHandler(), new ChildElementHandler<UnitsHandler>() {
+ @Override
public void childHanlded(UnitsHandler child) {
for (BundleInfo bundle : child.bundles) {
p2Descriptor.addBundle(bundle);
@@ -100,6 +101,7 @@ public class P2MetadataParser implements XMLInputParser {
}
});
addChild(new ReferencesHandler(), new ChildElementHandler<ReferencesHandler>() {
+ @Override
public void childHanlded(ReferencesHandler child) {
}
});
@@ -126,12 +128,14 @@ public class P2MetadataParser implements XMLInputParser {
super(REFERENCES);
addChild(new RepositoryReferenceHandler(),
new ChildElementHandler<RepositoryReferenceHandler>() {
+ @Override
public void childHanlded(RepositoryReferenceHandler child) {
repositoryUris.add(child.uri);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
int size = Integer.parseInt(atts.getValue(SIZE));
repositoryUris = new ArrayList<URI>(size);
@@ -164,6 +168,7 @@ public class P2MetadataParser implements XMLInputParser {
URI uri;
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
// type = Integer.parseInt(atts.getValue(TYPE));
// options = Integer.parseInt(atts.getValue(OPTIONS));
@@ -202,6 +207,7 @@ public class P2MetadataParser implements XMLInputParser {
public UnitsHandler() {
super(UNITS);
addChild(new UnitHandler(), new ChildElementHandler<UnitHandler>() {
+ @Override
public void childHanlded(UnitHandler child) {
if (child.bundleInfo != null && !child.bundleInfo.getCapabilities().isEmpty()) {
bundles.add(child.bundleInfo);
@@ -210,6 +216,7 @@ public class P2MetadataParser implements XMLInputParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
bundles = new ArrayList<BundleInfo>(size);
@@ -239,6 +246,7 @@ public class P2MetadataParser implements XMLInputParser {
// });
addChild(new PropertiesHandler(CATEGORY_PROPERTY),
new ChildElementHandler<PropertiesHandler>() {
+ @Override
public void childHanlded(PropertiesHandler child) {
String category = child.properties.get(CATEGORY_PROPERTY);
if (category != null && Boolean.valueOf(category).booleanValue()) {
@@ -249,6 +257,7 @@ public class P2MetadataParser implements XMLInputParser {
}
});
addChild(new ProvidesHandler(), new ChildElementHandler<ProvidesHandler>() {
+ @Override
public void childHanlded(ProvidesHandler child) {
if ("source".equals(child.eclipseType)) {
// this is some source of some bundle
@@ -270,10 +279,12 @@ public class P2MetadataParser implements XMLInputParser {
}
});
addChild(new FilterHandler(), new ChildElementHandler<FilterHandler>() {
+ @Override
public void childHanlded(FilterHandler child) {
}
});
addChild(new RequiresHandler(), new ChildElementHandler<RequiresHandler>() {
+ @Override
public void childHanlded(RequiresHandler child) {
for (BundleRequirement requirement : child.requirements) {
bundleInfo.addRequirement(requirement);
@@ -282,15 +293,18 @@ public class P2MetadataParser implements XMLInputParser {
});
addChild(new HostRequirementsHandler(),
new ChildElementHandler<HostRequirementsHandler>() {
+ @Override
public void childHanlded(HostRequirementsHandler child) {
}
});
addChild(new MetaRequirementsHandler(),
new ChildElementHandler<MetaRequirementsHandler>() {
+ @Override
public void childHanlded(MetaRequirementsHandler child) {
}
});
addChild(new ArtifactsHandler(), new ChildElementHandler<ArtifactsHandler>() {
+ @Override
public void childHanlded(ArtifactsHandler child) {
}
});
@@ -299,6 +313,7 @@ public class P2MetadataParser implements XMLInputParser {
// }
// });
addChild(new TouchpointDataHandler(), new ChildElementHandler<TouchpointDataHandler>() {
+ @Override
public void childHanlded(TouchpointDataHandler child) throws SAXParseException {
if (child.zipped != null) {
bundleInfo.setHasInnerClasspath(child.zipped.booleanValue());
@@ -375,6 +390,7 @@ public class P2MetadataParser implements XMLInputParser {
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String id = atts.getValue(ID);
String version = atts.getValue(VERSION);
@@ -448,6 +464,7 @@ public class P2MetadataParser implements XMLInputParser {
public ProvidesHandler() {
super(PROVIDES);
addChild(new ProvidedHandler(), new ChildElementHandler<ProvidedHandler>() {
+ @Override
public void childHanlded(ProvidedHandler child) {
if (child.namespace.equals("org.eclipse.equinox.p2.eclipse.type")) {
eclipseType = child.name;
@@ -472,6 +489,7 @@ public class P2MetadataParser implements XMLInputParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
capabilities = new ArrayList<BundleCapability>(size);
@@ -499,6 +517,7 @@ public class P2MetadataParser implements XMLInputParser {
super(PROVIDED);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
namespace = atts.getValue(NAMESPACE);
name = atts.getValue(NAME);
@@ -521,6 +540,7 @@ public class P2MetadataParser implements XMLInputParser {
public AbstractRequirementHandler(String name) {
super(name);
addChild(new RequiredHandler(), new ChildElementHandler<RequiredHandler>() {
+ @Override
public void childHanlded(RequiredHandler child) {
String name = child.name;
VersionRange range = child.range;
@@ -538,6 +558,7 @@ public class P2MetadataParser implements XMLInputParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
requirements = new ArrayList<BundleRequirement>(size);
@@ -590,6 +611,7 @@ public class P2MetadataParser implements XMLInputParser {
// });
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXParseException {
namespace = atts.getValue(NAMESPACE);
name = atts.getValue(NAME);
@@ -635,12 +657,14 @@ public class P2MetadataParser implements XMLInputParser {
public ArtifactsHandler() {
super(ARTIFACTS);
addChild(new ArtifactHandler(), new ChildElementHandler<ArtifactHandler>() {
+ @Override
public void childHanlded(ArtifactHandler child) {
artifacts.add(child.artifact);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
artifacts = new ArrayList<P2Artifact>(size);
@@ -664,6 +688,7 @@ public class P2MetadataParser implements XMLInputParser {
super(ARTIFACT);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String id = atts.getValue(ID);
String version = atts.getValue(VERSION);
@@ -710,6 +735,7 @@ public class P2MetadataParser implements XMLInputParser {
public TouchpointDataHandler() {
super(TOUCHPOINTDATA);
addChild(new InstructionsHandler(), new ChildElementHandler<InstructionsHandler>() {
+ @Override
public void childHanlded(InstructionsHandler child) {
manifest = child.manifest;
zipped = child.zipped;
@@ -717,6 +743,7 @@ public class P2MetadataParser implements XMLInputParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
// String size = atts.getValue(SIZE);
}
@@ -736,6 +763,7 @@ public class P2MetadataParser implements XMLInputParser {
public InstructionsHandler() {
super(INSTRUCTIONS);
addChild(new InstructionHandler(), new ChildElementHandler<InstructionHandler>() {
+ @Override
public void childHanlded(InstructionHandler child) {
manifest = null;
zipped = null;
@@ -749,6 +777,7 @@ public class P2MetadataParser implements XMLInputParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
// String size = atts.getValue(SIZE);
}
@@ -768,6 +797,7 @@ public class P2MetadataParser implements XMLInputParser {
setBufferingChar(true);
}
+ @Override
protected void handleAttributes(Attributes atts) {
key = atts.getValue(KEY);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java b/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java
index 60cb96b..5e1c705 100644
--- a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java
@@ -39,6 +39,7 @@ public class PropertiesParser {
super(PROPERTIES);
final List<String> propList = Arrays.asList(props);
addChild(new PropertyHandler(), new ChildElementHandler<PropertyHandler>() {
+ @Override
public void childHanlded(PropertyHandler child) {
if (propList.isEmpty() || propList.contains(child.name)) {
properties.put(child.name, child.value);
@@ -47,6 +48,7 @@ public class PropertiesParser {
});
}
+ @Override
protected void handleAttributes(Attributes atts) {
int size = Integer.parseInt(atts.getValue(SIZE));
properties = new HashMap<String, String>(size);
@@ -70,6 +72,7 @@ public class PropertiesParser {
super(PROPERTY);
}
+ @Override
protected void handleAttributes(Attributes atts) {
name = atts.getValue(NAME);
value = atts.getValue(VALUE);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
index 45e92ed..8a773f2 100644
--- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
+++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
@@ -289,6 +289,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
return found;
}
+ @Override
public ResolvedResource findArtifactRef(Artifact artifact, Date date) {
URL url = artifact.getUrl();
if (url == null) {
@@ -313,20 +314,20 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
@Override
- protected Collection/* <String> */filterNames(Collection/* <String> */names) {
+ protected Collection<String> filterNames(Collection<String> names) {
getSettings().filterIgnore(names);
return names;
}
@Override
- protected Collection findNames(Map tokenValues, String token) {
+ protected Collection<String> findNames(Map<String, String> tokenValues, String token) {
if (IvyPatternHelper.ORGANISATION_KEY.equals(token)) {
return getRepoDescriptor().getCapabilities();
}
- String osgiType = (String) tokenValues.get(IvyPatternHelper.ORGANISATION_KEY);
+ String osgiType = tokenValues.get(IvyPatternHelper.ORGANISATION_KEY);
if (osgiType == null || osgiType.length() == 0) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
if (IvyPatternHelper.MODULE_KEY.equals(token)) {
@@ -334,7 +335,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
if (IvyPatternHelper.REVISION_KEY.equals(token)) {
- String name = (String) tokenValues.get(IvyPatternHelper.MODULE_KEY);
+ String name = tokenValues.get(IvyPatternHelper.MODULE_KEY);
List<String> versions = new ArrayList<String>();
Set<ModuleDescriptorWrapper> mds = getRepoDescriptor().findModules(osgiType, name);
if (mds != null) {
@@ -346,9 +347,9 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
if (IvyPatternHelper.CONF_KEY.equals(token)) {
- String name = (String) tokenValues.get(IvyPatternHelper.MODULE_KEY);
+ String name = tokenValues.get(IvyPatternHelper.MODULE_KEY);
if (name == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
if (osgiType.equals(BundleInfo.PACKAGE_TYPE)) {
return Collections.singletonList(BundleInfoAdapter.CONF_USE_PREFIX + name);
@@ -356,11 +357,11 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
Collection<ModuleDescriptor> mds = ModuleDescriptorWrapper.unwrap(getRepoDescriptor()
.findModules(osgiType, name));
if (mds == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- String version = (String) tokenValues.get(IvyPatternHelper.REVISION_KEY);
+ String version = tokenValues.get(IvyPatternHelper.REVISION_KEY);
if (version == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
ModuleDescriptor found = null;
for (ModuleDescriptor md : mds) {
@@ -369,12 +370,12 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
}
if (found == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
List<String> confs = Arrays.asList(found.getConfigurationsNames());
return confs;
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/**
@@ -404,54 +405,62 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
@Override
- public Map[] listTokenValues(String[] tokens, Map criteria) {
+ public Map<String, String>[] listTokenValues(String[] tokens, Map<String, Object> criteria) {
Set<String> tokenSet = new HashSet<String>(Arrays.asList(tokens));
Set<Map<String, String>> listTokenValues = listTokenValues(tokenSet, criteria);
return listTokenValues.toArray(new Map[listTokenValues.size()]);
}
private Set<Map<String, String>> listTokenValues(Set<String> tokens,
- Map<String, String> criteria) {
+ Map<String, Object> criteria) {
+ Map<String, String> stringCriteria = new HashMap<String, String>();
+ for (Entry<String, Object> entry : criteria.entrySet()) {
+ String key = entry.getKey();
+ Object value = entry.getValue();
+ if (!(value instanceof String)) {
+ // no support for matcher for now
+ return Collections.emptySet();
+ }
+ stringCriteria.put(key, (String) value);
+ }
+
if (tokens.isEmpty()) {
- return Collections.singleton(criteria);
+ // no more tokens to resolve
+ return Collections.singleton(stringCriteria);
}
Set<String> remainingTokens = new HashSet<String>(tokens);
- Map<String, String> values = new HashMap<String, String>();
-
remainingTokens.remove(IvyPatternHelper.ORGANISATION_KEY);
- String osgiType = criteria.get(IvyPatternHelper.ORGANISATION_KEY);
- if (osgiType == null || osgiType.length() == 0) {
- return Collections.emptySet();
- }
- values.put(IvyPatternHelper.ORGANISATION_KEY, osgiType);
-
+ String osgiType = stringCriteria.get(IvyPatternHelper.ORGANISATION_KEY);
if (osgiType == null) {
Set<Map<String, String>> tokenValues = new HashSet<Map<String, String>>();
- Map<String, String> newCriteria = new HashMap<String, String>(criteria);
+ Map<String, Object> newCriteria = new HashMap<String, Object>(criteria);
newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.BUNDLE_TYPE);
tokenValues.addAll(listTokenValues(remainingTokens, newCriteria));
- newCriteria = new HashMap<String, String>(criteria);
+ newCriteria = new HashMap<String, Object>(criteria);
newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.PACKAGE_TYPE);
tokenValues.addAll(listTokenValues(remainingTokens, newCriteria));
- newCriteria = new HashMap<String, String>(criteria);
+ newCriteria = new HashMap<String, Object>(criteria);
newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.SERVICE_TYPE);
tokenValues.addAll(listTokenValues(remainingTokens, newCriteria));
return tokenValues;
}
+ Map<String, String> values = new HashMap<String, String>();
+ values.put(IvyPatternHelper.ORGANISATION_KEY, osgiType);
+
Set<String> capabilities = getRepoDescriptor().getCapabilityValues(osgiType);
if (capabilities == null || capabilities.isEmpty()) {
return Collections.emptySet();
}
remainingTokens.remove(IvyPatternHelper.MODULE_KEY);
- String module = criteria.get(IvyPatternHelper.MODULE_KEY);
+ String module = stringCriteria.get(IvyPatternHelper.MODULE_KEY);
if (module == null) {
Set<Map<String, String>> tokenValues = new HashSet<Map<String, String>>();
for (String name : capabilities) {
- Map<String, String> newCriteria = new HashMap<String, String>(criteria);
+ Map<String, Object> newCriteria = new HashMap<String, Object>(criteria);
newCriteria.put(IvyPatternHelper.MODULE_KEY, name);
tokenValues.addAll(listTokenValues(remainingTokens, newCriteria));
}
@@ -460,7 +469,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
values.put(IvyPatternHelper.MODULE_KEY, module);
remainingTokens.remove(IvyPatternHelper.REVISION_KEY);
- String rev = criteria.get(IvyPatternHelper.REVISION_KEY);
+ String rev = stringCriteria.get(IvyPatternHelper.REVISION_KEY);
if (rev == null) {
Set<ModuleDescriptorWrapper> mdws = getRepoDescriptor().findModules(osgiType, module);
if (mdws == null || mdws.isEmpty()) {
@@ -468,7 +477,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
}
Set<Map<String, String>> tokenValues = new HashSet<Map<String, String>>();
for (ModuleDescriptorWrapper mdw : mdws) {
- Map<String, String> newCriteria = new HashMap<String, String>(criteria);
+ Map<String, Object> newCriteria = new HashMap<String, Object>(criteria);
newCriteria.put(IvyPatternHelper.REVISION_KEY, mdw.getBundleInfo().getVersion()
.toString());
tokenValues.addAll(listTokenValues(remainingTokens, newCriteria));
@@ -478,7 +487,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
values.put(IvyPatternHelper.REVISION_KEY, rev);
remainingTokens.remove(IvyPatternHelper.CONF_KEY);
- String conf = criteria.get(IvyPatternHelper.CONF_KEY);
+ String conf = stringCriteria.get(IvyPatternHelper.CONF_KEY);
if (conf == null) {
if (osgiType.equals(BundleInfo.PACKAGE_TYPE)) {
values.put(IvyPatternHelper.CONF_KEY, BundleInfoAdapter.CONF_USE_PREFIX + module);
@@ -508,7 +517,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
List<String> configurations = BundleInfoAdapter
.getConfigurations(found.getBundleInfo());
for (int i = 0; i < configurations.size(); i++) {
- Map<String, String> newCriteria = new HashMap<String, String>(criteria);
+ Map<String, String> newCriteria = new HashMap<String, String>(stringCriteria);
newCriteria.put(IvyPatternHelper.CONF_KEY, configurations.get(i));
tokenValues.add(newCriteria);
}
@@ -519,6 +528,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
return Collections.singleton(values);
}
+ @Override
protected long get(Resource resource, File dest) throws IOException {
Message.verbose("\t" + getName() + ": downloading " + resource.getName());
Message.debug("\t\tto " + dest);
@@ -529,6 +539,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
return dest.length();
}
+ @Override
protected Resource getResource(String source) throws IOException {
return getRepository().getResource(source);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
index 08f2fb9..887ed69 100644
--- a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
+++ b/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java
@@ -34,7 +34,7 @@ import org.xml.sax.SAXException;
public class EclipseUpdateSiteParser {
- public static UpdateSite parse(InputStream in) throws ParseException, IOException, SAXException {
+ public static UpdateSite parse(InputStream in) throws IOException, SAXException {
SiteHandler handler = new SiteHandler();
try {
XMLHelper.parse(in, null, handler, null);
@@ -68,6 +68,7 @@ public class EclipseUpdateSiteParser {
// }
// });
addChild(new FeatureHandler(), new ChildElementHandler<FeatureHandler>() {
+ @Override
public void childHanlded(FeatureHandler child) {
updatesite.addFeature(child.feature);
}
@@ -84,6 +85,7 @@ public class EclipseUpdateSiteParser {
// });
}
+ @Override
protected void handleAttributes(Attributes atts) {
updatesite = new UpdateSite();
@@ -170,12 +172,14 @@ public class EclipseUpdateSiteParser {
public FeatureHandler() {
super(FEATURE);
addChild(new CategoryHandler(), new ChildElementHandler<CategoryHandler>() {
+ @Override
public void childHanlded(CategoryHandler child) {
feature.addCategory(child.name);
}
});
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String id = atts.getValue(ID);
String version = atts.getValue(VERSION);
@@ -213,6 +217,7 @@ public class EclipseUpdateSiteParser {
super(CATEGORY);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
name = atts.getValue(NAME);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java
index 739b828..444097a 100644
--- a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java
+++ b/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java
@@ -33,8 +33,7 @@ import org.xml.sax.SAXException;
public class FeatureParser {
- public static EclipseFeature parse(InputStream in) throws ParseException, IOException,
- SAXException {
+ public static EclipseFeature parse(InputStream in) throws IOException, SAXException {
FeatureHandler handler = new FeatureHandler();
try {
XMLHelper.parse(in, null, handler, null);
@@ -81,26 +80,31 @@ public class FeatureParser {
public FeatureHandler() {
super(FEATURE);
addChild(new DescriptionHandler(), new ChildElementHandler<DescriptionHandler>() {
+ @Override
public void childHanlded(DescriptionHandler child) {
feature.setDescription(child.getBufferedChars().trim());
}
});
addChild(new LicenseHandler(), new ChildElementHandler<LicenseHandler>() {
+ @Override
public void childHanlded(LicenseHandler child) {
feature.setLicense(child.getBufferedChars().trim());
}
});
addChild(new CopyrightHandler(), new ChildElementHandler<CopyrightHandler>() {
+ @Override
public void childHanlded(CopyrightHandler child) {
feature.setCopyright(child.getBufferedChars().trim());
}
});
addChild(new PluginHandler(), new ChildElementHandler<PluginHandler>() {
+ @Override
public void childHanlded(PluginHandler child) {
feature.addPlugin(child.plugin);
}
});
addChild(new RequiresHandler(), new ChildElementHandler<RequiresHandler>() {
+ @Override
public void childHanlded(RequiresHandler child) {
for (Require require : child.requires) {
feature.addRequire(require);
@@ -113,6 +117,7 @@ public class FeatureParser {
// });
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
String id = atts.getValue(ID);
String version = atts.getValue(VERSION);
@@ -159,6 +164,7 @@ public class FeatureParser {
super(PLUGIN);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
plugin = new EclipsePlugin();
@@ -189,6 +195,7 @@ public class FeatureParser {
setBufferingChar(true);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
// String url = atts.getValue(URL);
}
@@ -205,6 +212,7 @@ public class FeatureParser {
setBufferingChar(true);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
// String url = atts.getValue(URL);
}
@@ -222,6 +230,7 @@ public class FeatureParser {
setBufferingChar(true);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
// String url = atts.getValue(URL);
}
@@ -236,6 +245,7 @@ public class FeatureParser {
public RequiresHandler() {
super(REQUIRES);
addChild(new ImportHandler(), new ChildElementHandler<ImportHandler>() {
+ @Override
public void childHanlded(ImportHandler child) {
requires.add(child.require);
}
@@ -263,6 +273,7 @@ public class FeatureParser {
super(IMPORT);
}
+ @Override
protected void handleAttributes(Attributes atts) throws SAXException {
require = new Require();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java
index 681823b..16fa169 100644
--- a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java
+++ b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java
@@ -19,7 +19,6 @@ package org.apache.ivy.osgi.updatesite.xml;
import java.io.IOException;
import java.io.InputStream;
-import java.text.ParseException;
import javax.xml.parsers.ParserConfigurationException;
@@ -32,8 +31,8 @@ import org.xml.sax.SAXException;
public class UpdateSiteDigestParser {
- public static UpdateSiteDescriptor parse(InputStream in, UpdateSite site)
- throws ParseException, IOException, SAXException {
+ public static UpdateSiteDescriptor parse(InputStream in, UpdateSite site) throws IOException,
+ SAXException {
DigestHandler handler = new DigestHandler(site);
try {
XMLHelper.parse(in, null, handler, null);
@@ -54,6 +53,7 @@ public class UpdateSiteDigestParser {
repoDescriptor = new UpdateSiteDescriptor(site.getUri(),
ExecutionEnvironmentProfileProvider.getInstance());
addChild(new FeatureHandler(), new ChildElementHandler<FeatureHandler>() {
+ @Override
public void childHanlded(FeatureHandler child) {
repoDescriptor.addFeature(child.feature);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
index 05fb53a..5434d8a 100644
--- a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
+++ b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
@@ -92,6 +92,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
return charBuffer.toString();
}
+ @Override
public void setDocumentLocator(Locator locator) {
this.locator = locator;
for (DelegatingHandler subHandler : saxHandlerMapping.values()) {
@@ -146,6 +147,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
}
}
+ @Override
public final void startDocument() throws SAXException {
if (skip) {
return;
@@ -164,6 +166,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void endDocument() throws SAXException {
if (skip) {
return;
@@ -182,6 +185,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void startElement(final String uri, final String localName, final String n,
final Attributes atts) throws SAXException {
// reset the char buffer
@@ -246,6 +250,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void endElement(final String uri, final String localName, final String n)
throws SAXException {
if (delegate != null) {
@@ -297,6 +302,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
}
+ @Override
public final void characters(char[] ch, int start, int length) throws SAXException {
if (skip) {
return;
@@ -317,6 +323,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
}
}
+ @Override
public final void startPrefixMapping(String prefix, String uri) throws SAXException {
if (skip) {
return;
@@ -335,6 +342,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void endPrefixMapping(String prefix) throws SAXException {
if (skip) {
return;
@@ -353,6 +361,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
if (skip) {
return;
@@ -371,6 +380,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void notationDecl(String name, String publicId, String systemId)
throws SAXException {
if (skip) {
@@ -391,6 +401,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void processingInstruction(String target, String data) throws SAXException {
if (skip) {
return;
@@ -409,6 +420,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void skippedEntity(String name) throws SAXException {
if (skip) {
return;
@@ -427,9 +439,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
- /**
- * @throws SAXException
- */
+ @Override
public final void unparsedEntityDecl(String name, String publicId, String systemId,
String notationName) throws SAXException {
if (skip) {
@@ -452,6 +462,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// ERROR HANDLING
+ @Override
public final void warning(SAXParseException exception) throws SAXException {
if (skip) {
return;
@@ -470,6 +481,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void error(SAXParseException exception) throws SAXException {
if (skip) {
return;
@@ -488,6 +500,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
// by default do nothing
}
+ @Override
public final void fatalError(SAXParseException exception) throws SAXException {
if (skip) {
return;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
index ee68337..531f632 100644
--- a/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
@@ -20,6 +20,7 @@ package org.apache.ivy.plugins.conflict;
import java.util.Collection;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.settings.IvySettings;
import org.apache.ivy.plugins.IvySettingsAware;
@@ -44,10 +45,12 @@ public abstract class AbstractConflictManager implements ConflictManager, IvySet
this.name = name;
}
+ @Override
public String toString() {
return name;
}
- public void handleAllBlacklistedRevisions(DependencyDescriptor dd, Collection foundBlacklisted) {
+ public void handleAllBlacklistedRevisions(DependencyDescriptor dd,
+ Collection<ModuleRevisionId> foundBlacklisted) {
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java
index 46c2060..645cbe5 100644
--- a/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java
@@ -20,6 +20,7 @@ package org.apache.ivy.plugins.conflict;
import java.util.Collection;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
import org.apache.ivy.core.resolve.IvyNode;
public interface ConflictManager {
@@ -38,7 +39,7 @@ public interface ConflictManager {
* @return a Collection of IvyNode which have not been evicted, or null if conflict management
* resolution is not possible yet
*/
- Collection resolveConflicts(IvyNode parent, Collection conflicts);
+ Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts);
String getName();
@@ -56,5 +57,5 @@ public interface ConflictManager {
* the list of all ModuleRevisionId found which are blacklisted
*/
void handleAllBlacklistedRevisions(DependencyDescriptor dd,
- Collection/* <ModuleRevisionId> */foundBlacklisted);
+ Collection<ModuleRevisionId> foundBlacklisted);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
index 34815bf..b178fb1 100644
--- a/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
@@ -20,22 +20,21 @@ package org.apache.ivy.plugins.conflict;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.ivy.core.resolve.IvyNode;
public class FixedConflictManager extends AbstractConflictManager {
- private Collection revisions;
+
+ private Collection<String> revisions;
public FixedConflictManager(String[] revs) {
revisions = Arrays.asList(revs);
setName("fixed" + revisions);
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
- Collection resolved = new ArrayList(conflicts.size());
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
+ Collection<IvyNode> resolved = new ArrayList<IvyNode>(conflicts.size());
+ for (IvyNode node : conflicts) {
String revision = node.getResolvedId().getRevision();
if (revisions.contains(revision)) {
resolved.add(node);
@@ -44,7 +43,7 @@ public class FixedConflictManager extends AbstractConflictManager {
return resolved;
}
- public Collection getRevs() {
+ public Collection<String> getRevs() {
return revisions;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
index f4e775c..a9e4c99 100644
--- a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java
@@ -71,19 +71,20 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
super(name, strategy);
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
+ @Override
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
if (conflicts.size() < 2) {
return conflicts;
}
VersionMatcher versionMatcher = getSettings().getVersionMatcher();
- Iterator iter = conflicts.iterator();
- IvyNode node = (IvyNode) iter.next();
+ Iterator<IvyNode> iter = conflicts.iterator();
+ IvyNode node = iter.next();
ModuleRevisionId mrid = node.getResolvedId();
if (versionMatcher.isDynamic(mrid)) {
while (iter.hasNext()) {
- IvyNode other = (IvyNode) iter.next();
+ IvyNode other = iter.next();
if (versionMatcher.isDynamic(other.getResolvedId())) {
// two dynamic versions in conflict, not enough information yet
return null;
@@ -98,17 +99,17 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
if (conflicts.size() == 2) {
// very common special case of only two modules in conflict,
// let's return the second one (static)
- Iterator it = conflicts.iterator();
+ Iterator<IvyNode> it = conflicts.iterator();
it.next();
return Collections.singleton(it.next());
}
- Collection newConflicts = new LinkedHashSet(conflicts);
+ Collection<IvyNode> newConflicts = new LinkedHashSet<IvyNode>(conflicts);
newConflicts.remove(node);
return super.resolveConflicts(parent, newConflicts);
} else {
// the first node is a static revision, let's see if all other versions match
while (iter.hasNext()) {
- IvyNode other = (IvyNode) iter.next();
+ IvyNode other = iter.next();
if (!versionMatcher.accept(other.getResolvedId(), mrid)) {
// incompatibility found
if (!handleIncompatibleConflict(parent, conflicts, node, other)) {
@@ -152,8 +153,8 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
* @return true if the incompatible conflict has been handled, false otherwise (in which case
* resolveConflicts should return null)
*/
- private boolean handleIncompatibleConflict(IvyNode parent, Collection conflicts, IvyNode node,
- IvyNode other) {
+ private boolean handleIncompatibleConflict(IvyNode parent, Collection<IvyNode> conflicts,
+ IvyNode node, IvyNode other) {
// we never actually return anything else than false or throw an exception,
// but returning a boolean make the calling code cleaner
try {
@@ -184,14 +185,14 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
private void blackListIncompatibleCallerAndRestartResolveIfPossible(IvySettings settings,
IvyNode parent, IvyNode selected, IvyNode evicted) {
- Stack callerStack = new Stack();
+ Stack<IvyNode> callerStack = new Stack<IvyNode>();
callerStack.push(evicted);
- final Collection toBlacklist = blackListIncompatibleCaller(settings.getVersionMatcher(),
- parent, selected, evicted, callerStack);
+ Collection<IvyNodeBlacklist> toBlacklist = blackListIncompatibleCaller(
+ settings.getVersionMatcher(), parent, selected, evicted, callerStack);
if (toBlacklist != null) {
final StringBuffer blacklisted = new StringBuffer();
- for (Iterator iterator = toBlacklist.iterator(); iterator.hasNext();) {
- IvyNodeBlacklist blacklist = (IvyNodeBlacklist) iterator.next();
+ for (Iterator<IvyNodeBlacklist> iterator = toBlacklist.iterator(); iterator.hasNext();) {
+ IvyNodeBlacklist blacklist = iterator.next();
blacklist.getBlacklistedNode().blacklist(blacklist);
blacklisted.append(blacklist.getBlacklistedNode());
if (iterator.hasNext()) {
@@ -212,9 +213,9 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
}
}
- private boolean handleIncompatibleCaller(Stack callerStack, IvyNode node, IvyNode callerNode,
- IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode,
- Collection blacklisted, VersionMatcher versionMatcher) {
+ private boolean handleIncompatibleCaller(Stack<IvyNode> callerStack, IvyNode node,
+ IvyNode callerNode, IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode,
+ Collection<IvyNodeBlacklist> blacklisted, VersionMatcher versionMatcher) {
if (callerStack.subList(0, callerStack.size() - 1).contains(node)) {
// circular dependency found and handled: the current top of the stack (node)
// was already contained in the rest of the stack, the circle is closed, nothing
@@ -222,8 +223,8 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
return true;
} else {
callerStack.push(callerNode);
- Collection sub = blackListIncompatibleCaller(versionMatcher, conflictParent,
- selectedNode, evictedNode, callerStack);
+ Collection<IvyNodeBlacklist> sub = blackListIncompatibleCaller(versionMatcher,
+ conflictParent, selectedNode, evictedNode, callerStack);
callerStack.pop();
if (sub == null) {
// propagate the fact that a path with unblacklistable caller has been found
@@ -251,11 +252,11 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
* @return the collection of blacklisting to do, null if a blacklist is not possible in at least
* one caller path
*/
- private Collection/* <IvyNodeBlacklist> */blackListIncompatibleCaller(
- VersionMatcher versionMatcher, IvyNode conflictParent, IvyNode selectedNode,
- IvyNode evictedNode, Stack/* <IvyNode> */callerStack) {
- Collection/* <IvyNodeBlacklist> */blacklisted = new ArrayList/* <IvyNodeBlacklist> */();
- IvyNode node = (IvyNode) callerStack.peek();
+ private Collection<IvyNodeBlacklist> blackListIncompatibleCaller(VersionMatcher versionMatcher,
+ IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode,
+ Stack<IvyNode> callerStack) {
+ Collection<IvyNodeBlacklist> blacklisted = new ArrayList<IvyNodeBlacklist>();
+ IvyNode node = callerStack.peek();
String rootModuleConf = conflictParent.getData().getReport().getConfiguration();
Caller[] callers = node.getCallers(rootModuleConf);
for (int i = 0; i < callers.length; i++) {
@@ -282,30 +283,30 @@ public class LatestCompatibleConflictManager extends LatestConflictManager {
return blacklisted;
}
- protected void handleUnsolvableConflict(IvyNode parent, Collection conflicts, IvyNode node1,
- IvyNode node2) {
+ protected void handleUnsolvableConflict(IvyNode parent, Collection<IvyNode> conflicts,
+ IvyNode node1, IvyNode node2) {
throw new StrictConflictException(node1, node2);
}
+ @Override
public void handleAllBlacklistedRevisions(DependencyDescriptor dd,
- Collection/* <ModuleRevisionId> */foundBlacklisted) {
+ Collection<ModuleRevisionId> foundBlacklisted) {
ResolveData resolveData = IvyContext.getContext().getResolveData();
- Collection/* <IvyNode> */blacklisted = new HashSet();
- for (Iterator iterator = foundBlacklisted.iterator(); iterator.hasNext();) {
- ModuleRevisionId mrid = (ModuleRevisionId) iterator.next();
+ Collection<IvyNode> blacklisted = new HashSet<IvyNode>();
+ for (ModuleRevisionId mrid : foundBlacklisted) {
blacklisted.add(resolveData.getNode(mrid));
}
- for (Iterator iterator = blacklisted.iterator(); iterator.hasNext();) {
- IvyNode node = (IvyNode) iterator.next();
+ for (IvyNode node : blacklisted) {
IvyNodeBlacklist bdata = node.getBlacklistData(resolveData.getReport()
.getConfiguration());
handleUnsolvableConflict(bdata.getConflictParent(),
- Arrays.asList(new Object[] {bdata.getEvictedNode(), bdata.getSelectedNode()}),
+ Arrays.asList(bdata.getEvictedNode(), bdata.getSelectedNode()),
bdata.getEvictedNode(), bdata.getSelectedNode());
}
}
+ @Override
public String toString() {
return getName();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
index aafe069..9cccb59 100644
--- a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
@@ -20,7 +20,6 @@ package org.apache.ivy.plugins.conflict;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
@@ -78,12 +77,11 @@ public class LatestConflictManager extends AbstractConflictManager {
this.strategy = strategy;
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
if (conflicts.size() < 2) {
return conflicts;
}
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ for (IvyNode node : conflicts) {
DependencyDescriptor dd = node.getDependencyDescriptor(parent);
if (dd != null && dd.isForce()
&& parent.getResolvedId().equals(dd.getParentRevisionId())) {
@@ -95,17 +93,15 @@ public class LatestConflictManager extends AbstractConflictManager {
* If the list of conflicts contains dynamic revisions, delay the conflict calculation until
* they are resolved. TODO: we probably could already evict some of the dynamic revisions!
*/
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ for (IvyNode node : conflicts) {
ModuleRevisionId modRev = node.getResolvedId();
if (getSettings().getVersionMatcher().isDynamic(modRev)) {
return null;
}
}
- ArrayList unevicted = new ArrayList();
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ ArrayList<IvyNode> unevicted = new ArrayList<IvyNode>();
+ for (IvyNode node : conflicts) {
if (!node.isCompletelyEvicted())
unevicted.add(node);
}
@@ -128,13 +124,12 @@ public class LatestConflictManager extends AbstractConflictManager {
}
}
- protected ArtifactInfo[] toArtifactInfo(Collection conflicts) {
- List artifacts = new ArrayList(conflicts.size());
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ protected ArtifactInfo[] toArtifactInfo(Collection<IvyNode> conflicts) {
+ List<ArtifactInfo> artifacts = new ArrayList<ArtifactInfo>(conflicts.size());
+ for (IvyNode node : conflicts) {
artifacts.add(new IvyNodeArtifactInfo(node));
}
- return (ArtifactInfo[]) artifacts.toArray(new ArtifactInfo[artifacts.size()]);
+ return artifacts.toArray(new ArtifactInfo[artifacts.size()]);
}
public LatestStrategy getStrategy() {
@@ -165,6 +160,7 @@ public class LatestConflictManager extends AbstractConflictManager {
this.strategy = strategy;
}
+ @Override
public String toString() {
return strategy != null ? String.valueOf(strategy) : strategyName;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java
index cd6f5ce..39dc8f4 100644
--- a/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java
@@ -26,7 +26,7 @@ public class NoConflictManager extends AbstractConflictManager {
setName("all");
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
return conflicts;
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java
index b003cbf..3dec168 100644
--- a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java
@@ -20,7 +20,6 @@ package org.apache.ivy.plugins.conflict;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -66,10 +65,9 @@ public class RegexpConflictManager extends AbstractConflictManager {
mIgnoreNonMatching = ignoreNonMatching;
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
IvyNode lastNode = null;
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
+ for (IvyNode node : conflicts) {
if (lastNode != null && !matchEquals(node, lastNode)) {
String msg = lastNode + ":" + getMatch(lastNode) + " (needed by "
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java
index 7d3fde4..b9af702 100644
--- a/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java
+++ b/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java
@@ -19,7 +19,6 @@ package org.apache.ivy.plugins.conflict;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import org.apache.ivy.core.resolve.IvyNode;
import org.apache.ivy.plugins.version.VersionMatcher;
@@ -29,13 +28,11 @@ public class StrictConflictManager extends AbstractConflictManager {
public StrictConflictManager() {
}
- public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
+ public Collection<IvyNode> resolveConflicts(IvyNode parent, Collection<IvyNode> conflicts) {
VersionMatcher versionMatcher = getSettings().getVersionMatcher();
IvyNode lastNode = null;
- for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
- IvyNode node = (IvyNode) iter.next();
-
+ for (IvyNode node : conflicts) {
if (versionMatcher.isDynamic(node.getResolvedId())) {
// dynamic revision, not enough information to resolve conflict
return null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java
index 9c35d51..dbd24dc 100644
--- a/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java
+++ b/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java
@@ -32,17 +32,18 @@ public abstract class AbstractLatestStrategy implements LatestStrategy {
this.name = name;
}
+ @Override
public String toString() {
return name;
}
public ArtifactInfo findLatest(ArtifactInfo[] infos, Date date) {
- List l = sort(infos);
+ List<ArtifactInfo> l = sort(infos);
// the latest revision comes last, use a ListIterator to iterate the
// sorted list in the reverse direction.
- for (ListIterator iter = l.listIterator(l.size()); iter.hasPrevious();) {
- ArtifactInfo info = (ArtifactInfo) iter.previous();
+ for (ListIterator<ArtifactInfo> iter = l.listIterator(l.size()); iter.hasPrevious();) {
+ ArtifactInfo info = iter.previous();
if (date == null || info.getLastModified() < date.getTime()) {
return info;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java
index 8ad6677..4adc5a3 100644
--- a/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java
+++ b/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java
@@ -25,26 +25,26 @@ import java.util.List;
public class ComparatorLatestStrategy extends AbstractLatestStrategy {
- private Comparator comparator;
+ private Comparator<ArtifactInfo> comparator;
public ComparatorLatestStrategy() {
}
- public ComparatorLatestStrategy(Comparator comparator) {
+ public ComparatorLatestStrategy(Comparator<ArtifactInfo> comparator) {
this.comparator = comparator;
}
- public List sort(ArtifactInfo[] infos) {
- List ret = new ArrayList(Arrays.asList(infos));
+ public List<ArtifactInfo> sort(ArtifactInfo[] infos) {
+ List<ArtifactInfo> ret = new ArrayList<ArtifactInfo>(Arrays.asList(infos));
Collections.sort(ret, comparator);
return ret;
}
- public Comparator getComparator() {
+ public Comparator<ArtifactInfo> getComparator() {
return comparator;
}
- public void setComparator(Comparator comparator) {
+ public void setComparator(Comparator<ArtifactInfo> comparator) {
this.comparator = comparator;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/e1276e0a/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java
index b33bce8..c8ba3fe 100644
--- a/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java
+++ b/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java
@@ -26,10 +26,10 @@ public class LatestLexicographicStrategy extends ComparatorLatestStrategy {
* assumed to be the greater. If a partial latest is found, then it is assumed to be greater
* than any matching fixed revision.
*/
- private static final Comparator COMPARATOR = new Comparator() {
- public int compare(Object o1, Object o2) {
- String rev1 = ((ArtifactInfo) o1).getRevision();
- String rev2 = ((ArtifactInfo) o2).getRevision();
+ private static final Comparator<ArtifactInfo> COMPARATOR = new Comparator<ArtifactInfo>() {
+ public int compare(ArtifactInfo o1, ArtifactInfo o2) {
+ String rev1 = o1.getRevision();
+ String rev2 = o2.getRevision();
if (rev1.startsWith("latest")) {
return 1;
}