http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 7f21ea6..da9ed9e 100644 --- a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java +++ b/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java @@ -52,7 +52,7 @@ public class OSGiFilterParser { /** * Default constructor * - * @param header + * @param text * the header to parse */ Parser(String text) { @@ -63,7 +63,7 @@ public class OSGiFilterParser { /** * Do the parsing * - * @return + * @return OSGiFilter * * @throws ParseException */
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 f4fb3e5..162fd42 100644 --- a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java +++ b/src/java/org/apache/ivy/osgi/obr/OBRResolver.java @@ -91,7 +91,7 @@ public class OBRResolver extends AbstractOSGiResolver { options.setTtl(metadataTtl.longValue()); } if (forceMetadataUpdate != null) { - options.setForce(forceMetadataUpdate.booleanValue()); + options.setForce(forceMetadataUpdate); } report = getRepositoryCacheManager().downloadRepositoryResource(obrResource, "obr", "obr", "xml", options, getRepository()); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/obr/xml/CapabilityAdapter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/obr/xml/CapabilityAdapter.java b/src/java/org/apache/ivy/osgi/obr/xml/CapabilityAdapter.java index 2df1f11..6aea463 100644 --- a/src/java/org/apache/ivy/osgi/obr/xml/CapabilityAdapter.java +++ b/src/java/org/apache/ivy/osgi/obr/xml/CapabilityAdapter.java @@ -97,7 +97,6 @@ public class CapabilityAdapter { if (name == null) { throw new ParseException("No service name for the capability", 0); } - BundleCapability service = new BundleCapability(BundleInfo.SERVICE_TYPE, name, version); - return service; + return new BundleCapability(BundleInfo.SERVICE_TYPE, name, version); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 3f9088c..1bff108 100644 --- a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java +++ b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java @@ -69,7 +69,7 @@ public class OBRXMLParser { this.baseUri = baseUri; addChild(new ResourceHandler(), new ChildElementHandler<ResourceHandler>() { @Override - public void childHanlded(ResourceHandler child) { + public void childHandled(ResourceHandler child) { repo.addBundle(child.bundleInfo); } }); @@ -112,7 +112,7 @@ public class OBRXMLParser { addChild(new ResourceSourceHandler(), new ChildElementHandler<ResourceSourceHandler>() { @Override - public void childHanlded(ResourceSourceHandler child) { + public void childHandled(ResourceSourceHandler child) { String uri = child.getBufferedChars().trim(); if (!uri.endsWith(".jar")) { // the maven plugin is putting some useless source url sometimes... @@ -133,27 +133,27 @@ public class OBRXMLParser { addChild(new ResourceDescriptionHandler(), new ChildElementHandler<ResourceDescriptionHandler>() { @Override - public void childHanlded(ResourceDescriptionHandler child) { + public void childHandled(ResourceDescriptionHandler child) { bundleInfo.setDescription(child.getBufferedChars().trim()); } }); addChild(new ResourceDocumentationHandler(), new ChildElementHandler<ResourceDocumentationHandler>() { @Override - public void childHanlded(ResourceDocumentationHandler child) { + public void childHandled(ResourceDocumentationHandler child) { bundleInfo.setDocumentation(child.getBufferedChars().trim()); } }); addChild(new ResourceLicenseHandler(), new ChildElementHandler<ResourceLicenseHandler>() { @Override - public void childHanlded(ResourceLicenseHandler child) { + public void childHandled(ResourceLicenseHandler child) { bundleInfo.setLicense(child.getBufferedChars().trim()); } }); addChild(new ResourceSizeHandler(), new ChildElementHandler<ResourceSizeHandler>() { @Override - public void childHanlded(ResourceSizeHandler child) { + public void childHandled(ResourceSizeHandler child) { String size = child.getBufferedChars().trim(); try { bundleInfo.setSize(Integer.valueOf(size)); @@ -166,7 +166,7 @@ public class OBRXMLParser { }); addChild(new CapabilityHandler(), new ChildElementHandler<CapabilityHandler>() { @Override - public void childHanlded(CapabilityHandler child) throws SAXParseException { + public void childHandled(CapabilityHandler child) throws SAXParseException { try { CapabilityAdapter.adapt(bundleInfo, child.capability); @@ -178,7 +178,7 @@ public class OBRXMLParser { }); addChild(new RequireHandler(), new ChildElementHandler<RequireHandler>() { @Override - public void childHanlded(RequireHandler child) throws SAXParseException { + public void childHandled(RequireHandler child) throws SAXParseException { try { RequirementAdapter.adapt(bundleInfo, child.requirement); } catch (UnsupportedFilterException e) { @@ -193,7 +193,7 @@ public class OBRXMLParser { }); addChild(new ExtendHandler(), new ChildElementHandler<ExtendHandler>() { @Override - public void childHanlded(ExtendHandler child) throws SAXParseException { + public void childHandled(ExtendHandler child) throws SAXParseException { // TODO handle fragment host } }); @@ -203,22 +203,13 @@ public class OBRXMLParser { protected void handleAttributes(Attributes atts) throws SAXException { String symbolicname = atts.getValue(SYMBOLIC_NAME); if (symbolicname == null) { - log(Message.MSG_ERR, "Resource with no symobilc name, skipping it."); + log(Message.MSG_ERR, "Resource with no symbolic name, skipping it."); skip(); return; } String v = getOptionalAttribute(atts, VERSION, DEFAULT_VERSION); - Version version; - try { - version = new Version(v); - } catch (ParseException e) { - log(Message.MSG_ERR, "Incorrect resource version: " + v + ". The resource " - + symbolicname + " is then ignored."); - skip(); - return; - } - + Version version = new Version(v); bundleInfo = new BundleInfo(symbolicname, version); bundleInfo.setPresentationName(atts.getValue(PRESENTATION_NAME)); String uri = atts.getValue(URI); @@ -308,7 +299,7 @@ public class OBRXMLParser { addChild(new CapabilityPropertyHandler(), new ChildElementHandler<CapabilityPropertyHandler>() { @Override - public void childHanlded(CapabilityPropertyHandler child) { + public void childHandled(CapabilityPropertyHandler child) { String name = child.name; String value = child.value; String type = child.type; @@ -382,7 +373,7 @@ public class OBRXMLParser { try { filter = OSGiFilterParser.parse(filterText); } catch (ParseException e) { - throw new SAXParseException("Requirement with illformed filter: " + filterText, + throw new SAXParseException("Requirement with ill-formed filter: " + filterText, getLocator()); } } @@ -392,10 +383,10 @@ public class OBRXMLParser { requirement = new Requirement(name, filter); if (optional != null) { - requirement.setOptional(optional.booleanValue()); + requirement.setOptional(optional); } if (multiple != null) { - requirement.setMultiple(multiple.booleanValue()); + requirement.setMultiple(multiple); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/obr/xml/RequirementAdapter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/obr/xml/RequirementAdapter.java b/src/java/org/apache/ivy/osgi/obr/xml/RequirementAdapter.java index 0f9a68d..0c20f1f 100644 --- a/src/java/org/apache/ivy/osgi/obr/xml/RequirementAdapter.java +++ b/src/java/org/apache/ivy/osgi/obr/xml/RequirementAdapter.java @@ -100,7 +100,7 @@ public class RequirementAdapter { || BundleInfo.SERVICE_TYPE.equals(att)) { if (not) { throw new UnsupportedFilterException( - "Not filter on requirement comparaison is not supported"); + "Not filter on requirement comparison is not supported"); } if (type != null) { throw new UnsupportedFilterException("Multiple requirement type are not supported"); @@ -117,17 +117,12 @@ public class RequirementAdapter { name = compareFilter.getRightValue(); } else if ("version".equals(att)) { String v = compareFilter.getRightValue(); - Version version; - try { - version = new Version(v); - } catch (ParseException e) { - throw new ParseException("Ill formed version: " + v, 0); - } + Version version = new Version(v); Operator operator = compareFilter.getOperator(); if (not) { if (operator == Operator.EQUALS) { throw new UnsupportedFilterException( - "Not filter on equals comparaison is not supported"); + "Not filter on equals comparison is not supported"); } else if (operator == Operator.GREATER_OR_EQUAL) { operator = Operator.LOWER_THAN; } else if (operator == Operator.GREATER_THAN) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/obr/xml/UnsupportedFilterException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/obr/xml/UnsupportedFilterException.java b/src/java/org/apache/ivy/osgi/obr/xml/UnsupportedFilterException.java index 3218bca..c798be1 100644 --- a/src/java/org/apache/ivy/osgi/obr/xml/UnsupportedFilterException.java +++ b/src/java/org/apache/ivy/osgi/obr/xml/UnsupportedFilterException.java @@ -17,6 +17,7 @@ */ package org.apache.ivy.osgi.obr.xml; +@SuppressWarnings("serial") public class UnsupportedFilterException extends Exception { public UnsupportedFilterException(String message) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 0d3786f..207618a 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java @@ -76,12 +76,12 @@ public class P2ArtifactParser implements XMLInputParser { public RepositoryHandler(final P2Descriptor p2Descriptor, String repoUrl) { super(REPOSITORY); // addChild(new PropertiesHandler(), new ChildElementHandler<PropertiesHandler>() { - // public void childHanlded(PropertiesHandler child) { + // public void childHandled(PropertiesHandler child) { // } // }); addChild(new MappingsHandler(), new ChildElementHandler<MappingsHandler>() { @Override - public void childHanlded(MappingsHandler child) { + public void childHandled(MappingsHandler child) { for (Entry<String, String> entry : child.outputByFilter.entrySet()) { OSGiFilter filter; try { @@ -97,7 +97,7 @@ public class P2ArtifactParser implements XMLInputParser { addChild(new ArtifactsHandler(p2Descriptor, artifactPatterns, repoUrl), new ChildElementHandler<ArtifactsHandler>() { @Override - public void childHanlded(ArtifactsHandler child) { + public void childHandled(ArtifactsHandler child) { // nothing to do } }); @@ -121,7 +121,7 @@ public class P2ArtifactParser implements XMLInputParser { super(MAPPINGS); addChild(new RuleHandler(), new ChildElementHandler<RuleHandler>() { @Override - public void childHanlded(RuleHandler child) { + public void childHandled(RuleHandler child) { outputByFilter.put(child.filter, child.output); } }); @@ -170,7 +170,7 @@ public class P2ArtifactParser implements XMLInputParser { super(ARTIFACTS); addChild(new ArtifactHandler(), new ChildElementHandler<ArtifactHandler>() { @Override - public void childHanlded(ArtifactHandler child) throws SAXParseException { + public void childHandled(ArtifactHandler child) throws SAXParseException { String url = getPattern(child.p2Artifact, child.properties); if (url != null) { url = url.replaceAll("\\$\\{repoUrl\\}", repoUrl); @@ -231,7 +231,7 @@ public class P2ArtifactParser implements XMLInputParser { super(ARTIFACT); addChild(new PropertiesHandler(), new ChildElementHandler<PropertiesHandler>() { @Override - public void childHanlded(PropertiesHandler child) { + public void childHandled(PropertiesHandler child) { properties = child.properties; } }); @@ -240,13 +240,7 @@ public class P2ArtifactParser implements XMLInputParser { @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); - Version version; - try { - version = new Version(atts.getValue(VERSION)); - } catch (ParseException e) { - throw new SAXException("Incorrect version attribute on artifact '" + id + "': " - + atts.getValue(VERSION) + " (" + e.getMessage() + ")"); - } + Version version = new Version(atts.getValue(VERSION)); String classifier = atts.getValue(CLASSIFIER); p2Artifact = new P2Artifact(id, version, classifier); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 1a9bf78..110907f 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java @@ -67,7 +67,7 @@ public class P2CompositeParser implements XMLInputParser { super(REPOSITORY); addChild(new ChildrenHandler(), new ChildElementHandler<ChildrenHandler>() { @Override - public void childHanlded(ChildrenHandler child) { + public void childHandled(ChildrenHandler child) { childLocations = child.childLocations; } }); @@ -91,7 +91,7 @@ public class P2CompositeParser implements XMLInputParser { super(CHILDREN); addChild(new ChildHandler(), new ChildElementHandler<ChildHandler>() { @Override - public void childHanlded(ChildHandler child) { + public void childHandled(ChildHandler child) { childLocations.add(child.location); } }); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/p2/P2Descriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/p2/P2Descriptor.java b/src/java/org/apache/ivy/osgi/p2/P2Descriptor.java index 7dbfe32..87ab7fc 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2Descriptor.java +++ b/src/java/org/apache/ivy/osgi/p2/P2Descriptor.java @@ -136,8 +136,6 @@ public class P2Descriptor extends EditableRepoDescriptor { } } - BundleArtifact best = artifact; - if (same != null) { // we have two artifacts for the same bundle, let's choose a "packed" one if (artifact.getFormat() == null || same.getFormat() != null) { @@ -147,6 +145,6 @@ public class P2Descriptor extends EditableRepoDescriptor { bundle.removeArtifact(same); } - bundle.addArtifact(best); + bundle.addArtifact(artifact); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 c8a24ad..700a23a 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java @@ -85,7 +85,7 @@ public class P2MetadataParser implements XMLInputParser { super(REPOSITORY); // addChild(new PropertiesHandler(P2_TIMESTAMP), // new ChildElementHandler<PropertiesHandler>() { - // public void childHanlded(PropertiesHandler child) { + // public void childHandled(PropertiesHandler child) { // String timestamp = child.properties.get(P2_TIMESTAMP); // if (timestamp != null) { // p2Descriptor.setTimestamp(Long.parseLong(timestamp)); @@ -94,7 +94,7 @@ public class P2MetadataParser implements XMLInputParser { // }); addChild(new UnitsHandler(), new ChildElementHandler<UnitsHandler>() { @Override - public void childHanlded(UnitsHandler child) { + public void childHandled(UnitsHandler child) { for (BundleInfo bundle : child.bundles) { p2Descriptor.addBundle(bundle); } @@ -102,7 +102,7 @@ public class P2MetadataParser implements XMLInputParser { }); addChild(new ReferencesHandler(), new ChildElementHandler<ReferencesHandler>() { @Override - public void childHanlded(ReferencesHandler child) { + public void childHandled(ReferencesHandler child) { } }); } @@ -129,7 +129,7 @@ public class P2MetadataParser implements XMLInputParser { addChild(new RepositoryReferenceHandler(), new ChildElementHandler<RepositoryReferenceHandler>() { @Override - public void childHanlded(RepositoryReferenceHandler child) { + public void childHandled(RepositoryReferenceHandler child) { repositoryUris.add(child.uri); } }); @@ -208,7 +208,7 @@ public class P2MetadataParser implements XMLInputParser { super(UNITS); addChild(new UnitHandler(), new ChildElementHandler<UnitHandler>() { @Override - public void childHanlded(UnitHandler child) { + public void childHandled(UnitHandler child) { if (child.bundleInfo != null && !child.bundleInfo.getCapabilities().isEmpty()) { bundles.add(child.bundleInfo); } @@ -241,15 +241,15 @@ public class P2MetadataParser implements XMLInputParser { public UnitHandler() { super(UNIT); // addChild(new UpdateHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); addChild(new PropertiesHandler(CATEGORY_PROPERTY), new ChildElementHandler<PropertiesHandler>() { @Override - public void childHanlded(PropertiesHandler child) { + public void childHandled(PropertiesHandler child) { String category = child.properties.get(CATEGORY_PROPERTY); - if (category != null && Boolean.valueOf(category).booleanValue()) { + if (category != null && Boolean.valueOf(category)) { // this is a category definition, this is useless, skip this unit child.getParent().skip(); bundleInfo = null; @@ -258,11 +258,11 @@ public class P2MetadataParser implements XMLInputParser { }); addChild(new ProvidesHandler(), new ChildElementHandler<ProvidesHandler>() { @Override - public void childHanlded(ProvidesHandler child) { + public void childHandled(ProvidesHandler child) { if ("source".equals(child.eclipseType)) { // this is some source of some bundle bundleInfo.setSource(true); - // we need to parse the manifest in the toupointData to figure out the + // we need to parse the manifest in the touchpointData to figure out the // targeted bundle // in case we won't have the proper data in the manifest, prepare the source // data from the convention @@ -280,12 +280,12 @@ public class P2MetadataParser implements XMLInputParser { }); addChild(new FilterHandler(), new ChildElementHandler<FilterHandler>() { @Override - public void childHanlded(FilterHandler child) { + public void childHandled(FilterHandler child) { } }); addChild(new RequiresHandler(), new ChildElementHandler<RequiresHandler>() { @Override - public void childHanlded(RequiresHandler child) { + public void childHandled(RequiresHandler child) { for (BundleRequirement requirement : child.requirements) { bundleInfo.addRequirement(requirement); } @@ -294,29 +294,29 @@ public class P2MetadataParser implements XMLInputParser { addChild(new HostRequirementsHandler(), new ChildElementHandler<HostRequirementsHandler>() { @Override - public void childHanlded(HostRequirementsHandler child) { + public void childHandled(HostRequirementsHandler child) { } }); addChild(new MetaRequirementsHandler(), new ChildElementHandler<MetaRequirementsHandler>() { @Override - public void childHanlded(MetaRequirementsHandler child) { + public void childHandled(MetaRequirementsHandler child) { } }); addChild(new ArtifactsHandler(), new ChildElementHandler<ArtifactsHandler>() { @Override - public void childHanlded(ArtifactsHandler child) { + public void childHandled(ArtifactsHandler child) { } }); // addChild(new TouchpointHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); addChild(new TouchpointDataHandler(), new ChildElementHandler<TouchpointDataHandler>() { @Override - public void childHanlded(TouchpointDataHandler child) throws SAXParseException { + public void childHandled(TouchpointDataHandler child) throws SAXParseException { if (child.zipped != null) { - bundleInfo.setHasInnerClasspath(child.zipped.booleanValue()); + bundleInfo.setHasInnerClasspath(child.zipped); } if (!bundleInfo.isSource()) { // we only care about parsing the manifest if it is a source @@ -376,15 +376,15 @@ public class P2MetadataParser implements XMLInputParser { } }); // addChild(new LicensesHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); // addChild(new CopyrightHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); // addChild(new ChangesHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); @@ -395,17 +395,12 @@ public class P2MetadataParser implements XMLInputParser { String id = atts.getValue(ID); String version = atts.getValue(VERSION); // Boolean singleton = Boolean.valueOf(atts.getValue(SINGLETON)); - try { - bundleInfo = new BundleInfo(id, new Version(version)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on bundle '" + id + "': " + version - + " (" + e.getMessage() + ")"); - } + bundleInfo = new BundleInfo(id, new Version(version)); } } - // static class UpdateHandler extends DelegetingHandler { + // static class UpdateHandler extends DelegatingHandler { // // private static final String UPDATE = "update"; // @@ -465,7 +460,7 @@ public class P2MetadataParser implements XMLInputParser { super(PROVIDES); addChild(new ProvidedHandler(), new ChildElementHandler<ProvidedHandler>() { @Override - public void childHanlded(ProvidedHandler child) { + public void childHandled(ProvidedHandler child) { if (child.namespace.equals("org.eclipse.equinox.p2.eclipse.type")) { eclipseType = child.name; } else { @@ -521,12 +516,7 @@ public class P2MetadataParser implements XMLInputParser { protected void handleAttributes(Attributes atts) throws SAXException { namespace = atts.getValue(NAMESPACE); name = atts.getValue(NAME); - try { - version = new Version(atts.getValue(VERSION)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on provided capability: " + version - + " (" + e.getMessage() + ")"); - } + version = new Version(atts.getValue(VERSION)); } } @@ -541,7 +531,7 @@ public class P2MetadataParser implements XMLInputParser { super(name); addChild(new RequiredHandler(), new ChildElementHandler<RequiredHandler>() { @Override - public void childHanlded(RequiredHandler child) { + public void childHandled(RequiredHandler child) { String name = child.name; VersionRange range = child.range; String type = namespace2Type(child.namespace); @@ -605,7 +595,7 @@ public class P2MetadataParser implements XMLInputParser { public RequiredHandler() { super(REQUIRED); // addChild(new FilterHandler(), new ChildElementHandler<FilterHandler>() { - // public void childHanlded(FilterHandler child) { + // public void childHandled(FilterHandler child) { // filter = child.getBufferedChars().trim(); // } // }); @@ -621,7 +611,7 @@ public class P2MetadataParser implements XMLInputParser { throw new RuntimeException(e); } // greedy = getOptionalBooleanAttribute(atts, GREEDY, Boolean.TRUE).booleanValue(); - optional = getOptionalBooleanAttribute(atts, OPTIONAL, Boolean.FALSE).booleanValue(); + optional = getOptionalBooleanAttribute(atts, OPTIONAL, Boolean.FALSE); } } @@ -658,7 +648,7 @@ public class P2MetadataParser implements XMLInputParser { super(ARTIFACTS); addChild(new ArtifactHandler(), new ChildElementHandler<ArtifactHandler>() { @Override - public void childHanlded(ArtifactHandler child) { + public void childHandled(ArtifactHandler child) { artifacts.add(child.artifact); } }); @@ -693,17 +683,12 @@ public class P2MetadataParser implements XMLInputParser { String id = atts.getValue(ID); String version = atts.getValue(VERSION); String classifier = atts.getValue(CLASSIFIER); - try { - artifact = new P2Artifact(id, new Version(version), classifier); - } catch (ParseException e) { - throw new SAXException("Incorrect version on artifact '" + id + "': " + version - + " (" + e.getMessage() + ")"); - } + artifact = new P2Artifact(id, new Version(version), classifier); } } - // private static class TouchpointHandler extends DelegetingHandler { + // private static class TouchpointHandler extends DelegatingHandler { // // private static final String TOUCHPOINT = "touchpoint"; // @@ -736,7 +721,7 @@ public class P2MetadataParser implements XMLInputParser { super(TOUCHPOINTDATA); addChild(new InstructionsHandler(), new ChildElementHandler<InstructionsHandler>() { @Override - public void childHanlded(InstructionsHandler child) { + public void childHandled(InstructionsHandler child) { manifest = child.manifest; zipped = child.zipped; } @@ -764,7 +749,7 @@ public class P2MetadataParser implements XMLInputParser { super(INSTRUCTIONS); addChild(new InstructionHandler(), new ChildElementHandler<InstructionHandler>() { @Override - public void childHanlded(InstructionHandler child) { + public void childHandled(InstructionHandler child) { manifest = null; zipped = null; String buffer = child.getBufferedChars().trim(); @@ -804,7 +789,7 @@ public class P2MetadataParser implements XMLInputParser { } - // private static class LicensesHandler extends DelegetingHandler { + // private static class LicensesHandler extends DelegatingHandler { // // private static final String LICENSES = "licenses"; // @@ -813,7 +798,7 @@ public class P2MetadataParser implements XMLInputParser { // public LicensesHandler() { // super(LICENSES); // addChild(new LicenseHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // } // }); // } @@ -824,7 +809,7 @@ public class P2MetadataParser implements XMLInputParser { // // } - // private static class LicenseHandler extends DelegetingHandler { + // private static class LicenseHandler extends DelegatingHandler { // // private static final String LICENSE = "license"; // @@ -844,7 +829,7 @@ public class P2MetadataParser implements XMLInputParser { // // } - // private static class CopyrightHandler extends DelegetingHandler { + // private static class CopyrightHandler extends DelegatingHandler { // // private static final String COPYRIGHT = "copyright"; // @@ -863,7 +848,7 @@ public class P2MetadataParser implements XMLInputParser { // // } - // private class ChangesHandler extends DelegetingHandler { + // private class ChangesHandler extends DelegatingHandler { // // private static final String CHANGES = "changes"; // @@ -872,7 +857,7 @@ public class P2MetadataParser implements XMLInputParser { // public ChangesHandler() { // super(CHANGES); // addChild(new ChangeHandler(), new ChildElementHandler<ChangeHandler>() { - // public void childHanlded(ChangeHandler child) { + // public void childHandled(ChangeHandler child) { // } // }); // } @@ -882,7 +867,7 @@ public class P2MetadataParser implements XMLInputParser { // } // } - // private class ChangeHandler extends DelegetingHandler { + // private class ChangeHandler extends DelegatingHandler { // // private static final String CHANGE = "change"; // @@ -911,7 +896,7 @@ public class P2MetadataParser implements XMLInputParser { // // } - // private class PatchScopeHandler extends DelegetingHandler { + // private class PatchScopeHandler extends DelegatingHandler { // // private static final String PATCH_SCOPE = "patchScope"; // @@ -920,7 +905,7 @@ public class P2MetadataParser implements XMLInputParser { // public PatchScopeHandler() { // super(PATCH_SCOPE); // addChild(new PatchScopeHandler(), new ChildElementHandler<PatchScopeHandler>() { - // public void childHanlded(PatchScopeHandler child) { + // public void childHandled(PatchScopeHandler child) { // } // }); // } @@ -930,14 +915,14 @@ public class P2MetadataParser implements XMLInputParser { // } // } - // private class ScopeHandler extends DelegetingHandler { + // private class ScopeHandler extends DelegatingHandler { // // private static final String SCOPE = "scope"; // // public ScopeHandler() { // super(SCOPE); // addChild(new RequiresHandler(), new ChildElementHandler<RequiresHandler>() { - // public void childHanlded(RequiresHandler child) { + // public void childHandled(RequiresHandler child) { // } // }); // } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 5e1c705..bf048af 100644 --- a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java +++ b/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java @@ -40,7 +40,7 @@ public class PropertiesParser { final List<String> propList = Arrays.asList(props); addChild(new PropertyHandler(), new ChildElementHandler<PropertyHandler>() { @Override - public void childHanlded(PropertyHandler child) { + public void childHandled(PropertyHandler child) { if (propList.isEmpty() || propList.contains(child.name)) { properties.put(child.name, child.value); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java index 0318f67..eb4b4f0 100644 --- a/src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/AbstractFSManifestIterable.java @@ -72,7 +72,7 @@ public abstract class AbstractFSManifestIterable<T> implements Iterable<Manifest private T currentDir = null; FSManifestIterator() { - dirs.add(Collections.<T> singleton(root).iterator()); + dirs.add(Collections.singleton(root).iterator()); } /** http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 8a773f2..2612fbe 100644 --- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java +++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java @@ -20,7 +20,6 @@ package org.apache.ivy.osgi.repo; import java.io.File; import java.io.IOException; import java.net.URL; -import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -372,8 +371,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { if (found == null) { return Collections.emptyList(); } - List<String> confs = Arrays.asList(found.getConfigurationsNames()); - return confs; + return Arrays.asList(found.getConfigurationsNames()); } return Collections.emptyList(); } @@ -382,14 +380,15 @@ public abstract class AbstractOSGiResolver extends BasicResolver { * Populate capabilityValues with capability values for which at least one module match the * expected revision */ + @SuppressWarnings("unused") private void filterCapabilityValues(Set<String> capabilityValues, - Map<String, Set<ModuleDescriptor>> moduleByCapbilityValue, + Map<String, Set<ModuleDescriptor>> moduleByCapabilityValue, Map<String, String> tokenValues, String rev) { if (rev == null) { // no revision, all match then - capabilityValues.addAll(moduleByCapbilityValue.keySet()); + capabilityValues.addAll(moduleByCapabilityValue.keySet()); } else { - for (Entry<String, Set<ModuleDescriptor>> entry : moduleByCapbilityValue.entrySet()) { + for (Entry<String, Set<ModuleDescriptor>> entry : moduleByCapabilityValue.entrySet()) { Iterator<ModuleDescriptor> itModules = entry.getValue().iterator(); boolean moduleMatchRev = false; while (!moduleMatchRev && itModules.hasNext()) { @@ -498,12 +497,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { if (bundles == null) { return Collections.emptySet(); } - Version v; - try { - v = new Version(rev); - } catch (ParseException e) { - return Collections.emptySet(); - } + Version v = new Version(rev); ModuleDescriptorWrapper found = null; for (ModuleDescriptorWrapper bundle : bundles) { if (bundle.getBundleInfo().getVersion().equals(v)) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java index 5b3ae2d..0674228 100644 --- a/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java @@ -148,10 +148,7 @@ public class ArtifactReportManifestIterable implements Iterable<ManifestAndLocat } } } - if (next == null) { - return false; - } - return true; + return next != null; } public ManifestAndLocation next() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java index fe997e2..f6b2cb2 100644 --- a/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java @@ -52,7 +52,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { /** * Default bundle filter that select only .jar files */ - public static final FilenameFilter DEFAULT_BUNLDE_FILTER = new FilenameFilter() { + public static final FilenameFilter DEFAULT_BUNDLE_FILTER = new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".jar"); } @@ -60,7 +60,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { private FilenameFilter dirFilter = DEFAULT_DIR_FILTER; - private FilenameFilter bundleFilter = DEFAULT_BUNLDE_FILTER; + private FilenameFilter bundleFilter = DEFAULT_BUNDLE_FILTER; /** * Default constructor @@ -105,10 +105,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { protected List<File> listBundleFiles(File dir) { return Arrays.asList(dir.listFiles(new FileFilter() { public boolean accept(File f) { - if (!f.isFile()) { - return false; - } - return bundleFilter.accept(f.getParentFile(), f.getName()); + return f.isFile() && bundleFilter.accept(f.getParentFile(), f.getName()); } })); } @@ -116,10 +113,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { protected List<File> listDirs(File dir) { return Arrays.asList(dir.listFiles(new FileFilter() { public boolean accept(File f) { - if (!f.isDirectory()) { - return false; - } - return dirFilter == null || dirFilter.accept(f.getParentFile(), f.getName()); + return f.isDirectory() && (dirFilter == null || dirFilter.accept(f.getParentFile(), f.getName())); } })); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/ModuleDescriptorWrapper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/ModuleDescriptorWrapper.java b/src/java/org/apache/ivy/osgi/repo/ModuleDescriptorWrapper.java index 3707647..22bf67e 100644 --- a/src/java/org/apache/ivy/osgi/repo/ModuleDescriptorWrapper.java +++ b/src/java/org/apache/ivy/osgi/repo/ModuleDescriptorWrapper.java @@ -85,10 +85,8 @@ public class ModuleDescriptorWrapper { @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof ModuleDescriptorWrapper)) { - return false; - } - return bundleInfo.equals(((ModuleDescriptorWrapper) obj).bundleInfo); + return !(obj == null || !(obj instanceof ModuleDescriptorWrapper)) + && bundleInfo.equals(((ModuleDescriptorWrapper) obj).bundleInfo); } @Override http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java b/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java index 29ab44a..e4b055d 100644 --- a/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java +++ b/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java @@ -52,7 +52,7 @@ public class RelativeURLRepository extends URLRepository { try { uri = new URI(source); } catch (URISyntaxException e) { - // very wierd URL, let's assume it is absolute + // very weird URL, let's assume it is absolute uri = null; } if (uri == null || uri.isAbsolute()) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/repo/RepositoryManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/RepositoryManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/RepositoryManifestIterable.java index b832c09..2c23516 100644 --- a/src/java/org/apache/ivy/osgi/repo/RepositoryManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/RepositoryManifestIterable.java @@ -37,7 +37,7 @@ public class RepositoryManifestIterable extends AbstractFSManifestIterable<Strin /** * Default constructor * - * @param root + * @param repo * the root directory of the file system to lookup */ public RepositoryManifestIterable(Repository repo) { @@ -68,6 +68,6 @@ public class RepositoryManifestIterable extends AbstractFSManifestIterable<Strin } private List<String> asList(String[] array) { - return array == null ? Collections.<String> emptyList() : Arrays.<String> asList(array); + return (array == null) ? Collections.<String> emptyList() : Arrays.asList(array); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java b/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java index e8bf6d1..f178615 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java +++ b/src/java/org/apache/ivy/osgi/updatesite/UpdateSiteResolver.java @@ -70,7 +70,7 @@ public class UpdateSiteResolver extends AbstractOSGiResolver { options.setTtl(metadataTtl.longValue()); } if (forceMetadataUpdate != null) { - options.setForce(forceMetadataUpdate.booleanValue()); + options.setForce(forceMetadataUpdate); } final int log; if (logLevel != null) { @@ -127,9 +127,9 @@ public class UpdateSiteResolver extends AbstractOSGiResolver { } catch (ParseException e) { throw new RuntimeException("Failed to parse the updatesite (" + e.getMessage() + ")", e); } catch (SAXException e) { - throw new RuntimeException("Illformed updatesite (" + e.getMessage() + ")", e); + throw new RuntimeException("Ill-formed updatesite (" + e.getMessage() + ")", e); } catch (URISyntaxException e) { - throw new RuntimeException("Illformed url (" + e.getMessage() + ")", e); + throw new RuntimeException("Ill-formed url (" + e.getMessage() + ")", e); } if (repoDescriptor == null) { setRepoDescriptor(FAILING_REPO_DESCRIPTOR); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 887ed69..eb780df 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; -import java.text.ParseException; import javax.xml.parsers.ParserConfigurationException; @@ -63,23 +62,23 @@ public class EclipseUpdateSiteParser { public SiteHandler() { super(SITE); // addChild(new DescriptionHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // updateSite.setDescription(child.getBufferedChars().trim()); // } // }); addChild(new FeatureHandler(), new ChildElementHandler<FeatureHandler>() { @Override - public void childHanlded(FeatureHandler child) { + public void childHandled(FeatureHandler child) { updatesite.addFeature(child.feature); } }); // addChild(new ArchiveHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // updateSite.addArchive(((ArchiveHandler) child).archive); // } // }); // addChild(new CategoryDefHandler(), new ChildElementHandler() { - // public void childHanlded(DelegetingHandler child) { + // public void childHandled(DelegatingHandler child) { // updateSite.addCategoryDef(((CategoryDefHandler) child).categoryDef); // } // }); @@ -107,7 +106,7 @@ public class EclipseUpdateSiteParser { } String pack200 = atts.getValue(PACK200); - if (pack200 != null && new Boolean(pack200).booleanValue()) { + if (pack200 != null && Boolean.parseBoolean(pack200)) { updatesite.setPack200(true); } @@ -127,7 +126,7 @@ public class EclipseUpdateSiteParser { } } - // private static class DescriptionHandler extends DelegetingHandler { + // private static class DescriptionHandler extends DelegatingHandler { // // private static final String DESCRIPTION = "description"; // @@ -173,7 +172,7 @@ public class EclipseUpdateSiteParser { super(FEATURE); addChild(new CategoryHandler(), new ChildElementHandler<CategoryHandler>() { @Override - public void childHanlded(CategoryHandler child) { + public void childHandled(CategoryHandler child) { feature.addCategory(child.name); } }); @@ -183,12 +182,7 @@ public class EclipseUpdateSiteParser { protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); - try { - feature = new EclipseFeature(id, new Version(version)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on the feature '" + id + "': " + version - + " (" + e.getMessage() + ")"); - } + feature = new EclipseFeature(id, new Version(version)); String url = atts.getValue(URL); if (url != null) { @@ -223,7 +217,7 @@ public class EclipseUpdateSiteParser { } } - // private static class ArchiveHandler extends DelegetingHandler { + // private static class ArchiveHandler extends DelegatingHandler { // // private static final String ARCHIVE = "archive"; // @@ -249,7 +243,7 @@ public class EclipseUpdateSiteParser { // } // } - // private static class CategoryDefHandler extends DelegetingHandler { + // private static class CategoryDefHandler extends DelegatingHandler { // // private static final String CATEGORY_DEF = "category-def"; // @@ -262,7 +256,7 @@ public class EclipseUpdateSiteParser { // public CategoryDefHandler() { // super(CATEGORY_DEF); // addChild(new DescriptionHandler(), new ChildElementHandler<DescriptionHandler>() { - // public void childHanlded(DescriptionHandler child) { + // public void childHandled(DescriptionHandler child) { // categoryDef.setDescription(child.getBufferedChars().trim()); // } // }); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 444097a..979de27 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.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 java.util.ArrayList; import java.util.List; @@ -81,38 +80,38 @@ public class FeatureParser { super(FEATURE); addChild(new DescriptionHandler(), new ChildElementHandler<DescriptionHandler>() { @Override - public void childHanlded(DescriptionHandler child) { + public void childHandled(DescriptionHandler child) { feature.setDescription(child.getBufferedChars().trim()); } }); addChild(new LicenseHandler(), new ChildElementHandler<LicenseHandler>() { @Override - public void childHanlded(LicenseHandler child) { + public void childHandled(LicenseHandler child) { feature.setLicense(child.getBufferedChars().trim()); } }); addChild(new CopyrightHandler(), new ChildElementHandler<CopyrightHandler>() { @Override - public void childHanlded(CopyrightHandler child) { + public void childHandled(CopyrightHandler child) { feature.setCopyright(child.getBufferedChars().trim()); } }); addChild(new PluginHandler(), new ChildElementHandler<PluginHandler>() { @Override - public void childHanlded(PluginHandler child) { + public void childHandled(PluginHandler child) { feature.addPlugin(child.plugin); } }); addChild(new RequiresHandler(), new ChildElementHandler<RequiresHandler>() { @Override - public void childHanlded(RequiresHandler child) { + public void childHandled(RequiresHandler child) { for (Require require : child.requires) { feature.addRequire(require); } } }); // addChild(new UrlHandler(), new ChildElementHandler<UrlHandler>() { - // public void childHanlded(UrlHandler child) { + // public void childHandled(UrlHandler child) { // } // }); } @@ -121,12 +120,7 @@ public class FeatureParser { protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); - try { - feature = new EclipseFeature(id, new Version(version)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on feature '" + id + "': " + version - + " (" + e.getMessage() + ")"); - } + feature = new EclipseFeature(id, new Version(version)); feature.setOS(atts.getValue(OS)); feature.setWS(atts.getValue(WS)); @@ -134,8 +128,8 @@ public class FeatureParser { feature.setArch(atts.getValue(ARCH)); feature.setApplication(atts.getValue(APPLICATION)); feature.setPlugin(atts.getValue(PLUGIN)); - feature.setExclusive(Boolean.valueOf(atts.getValue(EXCLUSIVE)).booleanValue()); - feature.setPrimary(Boolean.valueOf(atts.getValue(PRIMARY)).booleanValue()); + feature.setExclusive(Boolean.valueOf(atts.getValue(EXCLUSIVE))); + feature.setPrimary(Boolean.valueOf(atts.getValue(PRIMARY))); feature.setColocationAffinity(atts.getValue(COLOCATION_AFFINITY)); feature.setProviderName(atts.getValue(PROVIDER_NAME)); feature.setLabel(atts.getValue(LABEL)); @@ -172,13 +166,8 @@ public class FeatureParser { String version = atts.getValue(VERSION); plugin.setId(id); - try { - plugin.setVersion(new Version(version)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on feature's plugin '" + id + "': " - + version + " (" + e.getMessage() + ")"); - } - plugin.setUnpack(Boolean.valueOf(atts.getValue(UNPACK)).booleanValue()); + plugin.setVersion(new Version(version)); + plugin.setUnpack(Boolean.valueOf(atts.getValue(UNPACK))); plugin.setFragment(atts.getValue(FRAGMENT)); plugin.setFilter(atts.getValue(FILTER)); } @@ -246,7 +235,7 @@ public class FeatureParser { super(REQUIRES); addChild(new ImportHandler(), new ChildElementHandler<ImportHandler>() { @Override - public void childHanlded(ImportHandler child) { + public void childHandled(ImportHandler child) { requires.add(child.require); } }); @@ -281,18 +270,13 @@ public class FeatureParser { require.setFeature(atts.getValue(FEATURE)); require.setPlugin(atts.getValue(PLUGIN)); - try { - require.setVersion(new Version(version)); - } catch (ParseException e) { - throw new SAXException("Incorrect version on feature's import: " + version + " (" - + e.getMessage() + ")"); - } + require.setVersion(new Version(version)); require.setMatch(atts.getValue(MATCH)); require.setFilter(atts.getValue(FILTER)); } } - // private static class IncludesHandler extends DelegetingHandler { + // private static class IncludesHandler extends DelegatingHandler { // // private static final String INCLUDES = "includes"; // @@ -317,7 +301,7 @@ public class FeatureParser { // // } - // private static class InstallHandlerHandler extends DelegetingHandler { + // private static class InstallHandlerHandler extends DelegatingHandler { // // private static final String INSTALL_HANDLER = "install-handler"; // @@ -339,25 +323,25 @@ public class FeatureParser { // // } - // private static class UrlHandler extends DelegetingHandler { + // private static class UrlHandler extends DelegatingHandler { // // private static final String URL = "url"; // // public UrlHandler() { // super(URL); // addChild(new UpdateHandler(), new ChildElementHandler<UpdateHandler>() { - // public void childHanlded(UpdateHandler child) { + // public void childHandled(UpdateHandler child) { // } // }); // addChild(new DiscoveryHandler(), new ChildElementHandler<DiscoveryHandler>() { - // public void childHanlded(DiscoveryHandler child) { + // public void childHandled(DiscoveryHandler child) { // } // }); // } // // } - // private static class UpdateHandler extends DelegetingHandler { + // private static class UpdateHandler extends DelegatingHandler { // // private static final String UPDATE = "update"; // @@ -376,7 +360,7 @@ public class FeatureParser { // // } - // private static class DiscoveryHandler extends DelegetingHandler { + // private static class DiscoveryHandler extends DelegatingHandler { // // private static final String DISCOVERY = "discovery"; // http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSite.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSite.java b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSite.java index de1f84d..24a0414 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSite.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSite.java @@ -25,8 +25,10 @@ public class UpdateSite { private URI uri; + @SuppressWarnings("unused") private String mirrorsURL; + @SuppressWarnings("unused") private boolean pack200; private URI digestUri; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 16fa169..6f2d90c 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java @@ -54,7 +54,7 @@ public class UpdateSiteDigestParser { ExecutionEnvironmentProfileProvider.getInstance()); addChild(new FeatureHandler(), new ChildElementHandler<FeatureHandler>() { @Override - public void childHanlded(FeatureHandler child) { + public void childHandled(FeatureHandler child) { repoDescriptor.addFeature(child.feature); } }); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 5434d8a..bebdc1f 100644 --- a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java +++ b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java @@ -267,7 +267,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con if (childHandler != null) { skipOnError(new SkipOnErrorCallback() { public void call() throws SAXException { - childHandler._childHanlded(savedDelegate); + childHandler._childHandled(savedDelegate); } }); } @@ -292,12 +292,12 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con public static abstract class ChildElementHandler<DH extends DelegatingHandler> { - public abstract void childHanlded(DH child) throws SAXParseException; + public abstract void childHandled(DH child) throws SAXParseException; // because we know what we're doing @SuppressWarnings("unchecked") - private void _childHanlded(DelegatingHandler delegate) throws SAXParseException { - childHanlded((DH) delegate); + private void _childHandled(DelegatingHandler delegate) throws SAXParseException { + childHandled((DH) delegate); } } @@ -539,6 +539,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con return "[line " + locator.getLineNumber() + " col. " + locator.getColumnNumber() + "] "; } + @SuppressWarnings("unused") private void skipOnError(DelegatingHandler currentHandler, Class<? extends DelegatingHandler> handlerClassToSkip, String message) { DelegatingHandler handlerToSkip = currentHandler; @@ -628,7 +629,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con if (value == null) { return defaultValue; } - return Boolean.valueOf(parseBoolean(name, value)); + return parseBoolean(name, value); } static final String TRUE = Boolean.TRUE.toString().toLowerCase(Locale.US); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/util/Version.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/util/Version.java b/src/java/org/apache/ivy/osgi/util/Version.java index 4db670e..9a5f868 100644 --- a/src/java/org/apache/ivy/osgi/util/Version.java +++ b/src/java/org/apache/ivy/osgi/util/Version.java @@ -36,17 +36,17 @@ public class Version implements Comparable<Version> { private String input; - private boolean splitted = false; + private volatile boolean split = false; - private boolean toString = false; + private volatile boolean toString = false; - public Version(String versionStr, String qualifier) throws ParseException { + public Version(String versionStr, String qualifier) { this(qualifier == null ? versionStr : (versionStr + "." + qualifier)); } - public Version(String versionStr) throws ParseException { + public Version(String versionStr) { this.input = versionStr; - splitted = false; + split = false; toString = false; } @@ -55,7 +55,7 @@ public class Version implements Comparable<Version> { this.minor = minor; this.patch = patch; this.qualifier = qualifier; - splitted = true; + split = true; toString = false; } @@ -63,7 +63,9 @@ public class Version implements Comparable<Version> { * Build a version from another one while appending an extra qualifier * * @param baseVersion - * @param qualifier + * Version + * @param extraQualifier + * String */ public Version(Version baseVersion, String extraQualifier) { this.major = baseVersion.major; @@ -71,19 +73,19 @@ public class Version implements Comparable<Version> { this.patch = baseVersion.patch; this.qualifier = baseVersion.qualifier == null ? extraQualifier : (baseVersion.qualifier + extraQualifier); - splitted = true; + split = true; toString = false; } - private void ensureSplitted() { - if (!splitted) { + private void ensureSplit() { + if (!split) { synchronized (this) { - if (splitted) { + if (split) { return; } String[] splits = input.split("\\."); if (splits == null || splits.length == 0 || splits.length > 4) { - throw new RuntimeException(new ParseException("Ill formed OSGi version", 0)); + throw new RuntimeException(new ParseException("Ill-formed OSGi version", 0)); } try { major = Integer.parseInt(splits[0]); @@ -104,7 +106,7 @@ public class Version implements Comparable<Version> { "Patch part of an OSGi version should be an integer", 0)); } qualifier = splits.length == 4 ? splits[3] : null; - splitted = true; + split = true; } } } @@ -115,7 +117,7 @@ public class Version implements Comparable<Version> { if (toString) { return; } - ensureSplitted(); + ensureSplit(); version = major + "." + minor + "." + patch + (qualifier == null ? "" : "." + qualifier); toString = true; @@ -129,7 +131,7 @@ public class Version implements Comparable<Version> { } public int hashCode() { - ensureSplitted(); + ensureSplit(); final int prime = 31; int result = 1; result = prime * result + major; @@ -150,8 +152,8 @@ public class Version implements Comparable<Version> { return false; } Version other = (Version) obj; - ensureSplitted(); - other.ensureSplitted(); + ensureSplit(); + other.ensureSplit(); if (major != other.major) { return false; } @@ -172,23 +174,23 @@ public class Version implements Comparable<Version> { } public Version withNudgedPatch() { - ensureSplitted(); + ensureSplit(); return new Version(major, minor, patch + 1, null); } public Version withoutQualifier() { - ensureSplitted(); + ensureSplit(); return new Version(major, minor, patch, null); } public String qualifier() { - ensureSplitted(); + ensureSplit(); return qualifier == null ? "" : qualifier; } public int compareUnqualified(Version other) { - ensureSplitted(); - other.ensureSplitted(); + ensureSplit(); + other.ensureSplit(); int diff = major - other.major; if (diff != 0) { return diff; @@ -205,8 +207,8 @@ public class Version implements Comparable<Version> { } public int compareTo(Version other) { - ensureSplitted(); - other.ensureSplitted(); + ensureSplit(); + other.ensureSplit(); int diff = compareUnqualified(other); if (diff != 0) { return diff; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/osgi/util/VersionRange.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/util/VersionRange.java b/src/java/org/apache/ivy/osgi/util/VersionRange.java index 575ff0a..b477145 100644 --- a/src/java/org/apache/ivy/osgi/util/VersionRange.java +++ b/src/java/org/apache/ivy/osgi/util/VersionRange.java @@ -68,8 +68,8 @@ public class VersionRange { /** * Default constructor * - * @param header - * the header to parse + * @param version + * the version to parse */ VersionRangeParser(String version) { this.version = version; @@ -149,7 +149,7 @@ public class VersionRange { } Integer minor = new Integer(0); Integer patch = new Integer(0); - String qualififer = null; + String qualifier = null; if (parseNumberSeparator()) { minor = parseNumber(); if (minor == null) { @@ -159,11 +159,11 @@ public class VersionRange { if (patch == null) { patch = new Integer(0); } else if (parseNumberSeparator()) { - qualififer = parseQualifier(); + qualifier = parseQualifier(); } } } - return new Version(major.intValue(), minor.intValue(), patch.intValue(), qualififer); + return new Version(major.intValue(), minor.intValue(), patch.intValue(), qualifier); } private Integer parseNumber() { @@ -243,7 +243,7 @@ public class VersionRange { break; default: unread(); - throw new ParseException("Expexting ] or )", pos); + throw new ParseException("Expecting ] or )", pos); } } } @@ -311,18 +311,8 @@ public class VersionRange { } public boolean contains(Version version) { - if (startExclusive ? version.compareUnqualified(startVersion) <= 0 : version - .compareUnqualified(startVersion) < 0) { - return false; - } - if (endVersion == null) { - return true; - } - if (endExclusive ? version.compareUnqualified(endVersion) >= 0 : version - .compareUnqualified(endVersion) > 0) { - return false; - } - return true; + return (startExclusive ? version.compareUnqualified(startVersion) > 0 : version.compareUnqualified(startVersion) >= 0) + && (endVersion == null || (endExclusive ? version.compareUnqualified(endVersion) < 0 : version.compareUnqualified(endVersion) <= 0)); } public int hashCode() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java index 0b37dfd..438c572 100644 --- a/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java +++ b/src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java @@ -23,12 +23,13 @@ import org.apache.ivy.core.module.id.ModuleRevisionId; * Unchecked exception thrown when a circular dependency exists between projects. */ +@SuppressWarnings("serial") public class CircularDependencyException extends RuntimeException { private ModuleRevisionId[] mrids; /** - * @param descriptors + * @param mrids * module descriptors in order of circular dependency */ public CircularDependencyException(final ModuleRevisionId[] mrids) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/circular/CircularDependencyHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/circular/CircularDependencyHelper.java b/src/java/org/apache/ivy/plugins/circular/CircularDependencyHelper.java index 59d5595..69dbdba 100644 --- a/src/java/org/apache/ivy/plugins/circular/CircularDependencyHelper.java +++ b/src/java/org/apache/ivy/plugins/circular/CircularDependencyHelper.java @@ -35,7 +35,7 @@ public final class CircularDependencyHelper { /** * Returns a string representation of this circular dependency graph * - * @param descriptors + * @param mrids * in order of circular dependency * @return a string representation of this circular dependency graph */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/circular/CircularDependencyStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/circular/CircularDependencyStrategy.java b/src/java/org/apache/ivy/plugins/circular/CircularDependencyStrategy.java index f1ae506..1a84a98 100644 --- a/src/java/org/apache/ivy/plugins/circular/CircularDependencyStrategy.java +++ b/src/java/org/apache/ivy/plugins/circular/CircularDependencyStrategy.java @@ -21,7 +21,7 @@ import org.apache.ivy.core.module.id.ModuleRevisionId; /** * A CircularDependencyStrategy indicates what ivy does when a circular dependency is detected. Ivy - * can ignore it, warn the user, or interupt the processing. + * can ignore it, warn the user, or interrupt the processing. */ public interface CircularDependencyStrategy { String getName(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 a9e4c99..4501e72 100644 --- a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java @@ -177,7 +177,7 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { return false; } } catch (NoConflictResolvedYetException ex) { - // we have not enough informations in the nodes to resolve conflict + // we have not enough information in the nodes to resolve conflict // according to the resolveConflicts contract, resolveConflicts must return null return false; } @@ -247,8 +247,8 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { * the node in favor of which the conflict is resolved * @param evictedNode * the node which will be evicted if we are able to blacklist all paths - * @param node - * the node for which callers should be considered + * @param callerStack + * ditto * @return the collection of blacklisting to do, null if a blacklist is not possible in at least * one caller path */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 9cccb59..541648e 100644 --- a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java @@ -30,6 +30,7 @@ import org.apache.ivy.plugins.latest.LatestStrategy; import org.apache.ivy.util.Message; public class LatestConflictManager extends AbstractConflictManager { + @SuppressWarnings("serial") public static class NoConflictResolvedYetException extends RuntimeException { } @@ -44,7 +45,7 @@ public class LatestConflictManager extends AbstractConflictManager { long lastModified = node.getLastModified(); if (lastModified == 0) { // if the last modified timestamp is unknown, we can't resolve - // the conflicts now, and trigger an exception which will be catched + // the conflicts now, and trigger an exception which will be caught // in the main resolveConflicts method throw new NoConflictResolvedYetException(); } else { @@ -118,7 +119,7 @@ public class LatestConflictManager extends AbstractConflictManager { return conflicts; } } catch (NoConflictResolvedYetException ex) { - // we have not enough informations in the nodes to resolve conflict + // we have not enough information in the nodes to resolve conflict // according to the resolveConflicts contract, we must return null return null; } @@ -150,7 +151,7 @@ public class LatestConflictManager extends AbstractConflictManager { /** * To conform to configurator API * - * @param latestStrategy + * @param strategyName ditto */ public void setLatest(String strategyName) { this.strategyName = strategyName; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/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 3dec168..3312e45 100644 --- a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java @@ -41,7 +41,7 @@ import org.apache.ivy.util.Message; * * The regular expression must contain a capturing group. The group will be used to resolve the * conflicts by an String.equals() test. If ignoreNonMatching is false non matching modules will - * result in an exception. If it is true they will be compaired by their full revision. + * result in an exception. If it is true they will be compared by their full revision. */ public class RegexpConflictManager extends AbstractConflictManager { private Pattern pattern = Pattern.compile("(.*)"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/conflict/StrictConflictException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/conflict/StrictConflictException.java b/src/java/org/apache/ivy/plugins/conflict/StrictConflictException.java index b2e0441..a0099a9 100644 --- a/src/java/org/apache/ivy/plugins/conflict/StrictConflictException.java +++ b/src/java/org/apache/ivy/plugins/conflict/StrictConflictException.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.ivy.core.resolve.IvyNode; import org.apache.ivy.core.resolve.ResolveProcessException; +@SuppressWarnings("serial") public class StrictConflictException extends ResolveProcessException { public StrictConflictException() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java index b9ceb99..8cebce5 100644 --- a/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java @@ -26,8 +26,8 @@ public interface LatestStrategy { * on the strategy itself. Given artifacts info are all good candidate. If the given date is not * null, then found artifact should not be later than this date. * - * @param infos - * @param date + * @param infos ArtifactInfo[] + * @param date Date * @return the latest artifact among the given ones. */ ArtifactInfo findLatest(ArtifactInfo[] infos, Date date); @@ -36,8 +36,8 @@ public interface LatestStrategy { * Sorts the given artifacts info from the oldest one to the latest one. The definition of * 'latest' depends on the strategy itself. Given artifacts info are all good candidate. * - * @param infos - * @return + * @param infos ArtifactInfo[] + * @return List<ArtifactInfo> */ List<ArtifactInfo> sort(ArtifactInfo[] infos); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java b/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java index 637988f..8fa2643 100644 --- a/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java +++ b/src/java/org/apache/ivy/plugins/lock/FileBasedLockStrategy.java @@ -310,6 +310,7 @@ public abstract class FileBasedLockStrategy extends AbstractLockStrategy { } } + @SuppressWarnings("resource") public boolean tryLock(File file) { try { if (file.getParentFile().exists() || file.getParentFile().mkdirs()) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java index 5afc5a2..96a8d3a 100644 --- a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java @@ -34,8 +34,7 @@ import org.apache.oro.text.regex.Perl5Matcher; * <b> Note that this matcher is available only with <a href="http://jakarta.apache.org/oro"Apache * Jakarta Oro 2.0.8</a> in your classpath.</b> * - * @see <a - * href="http://jakarta.apache.org/oro/api/org/apache/oro/text/GlobCompiler.html";>GlobCompiler</a> + * @see <a href="http://jakarta.apache.org/oro/api/org/apache/oro/text/GlobCompiler.html";>GlobCompiler</a> */ public/* @Immutable */final class GlobPatternMatcher extends AbstractPatternMatcher { @@ -83,7 +82,7 @@ public/* @Immutable */final class GlobPatternMatcher extends AbstractPatternMatc if (exact == null) { exact = calculateExact(); } - return exact.booleanValue(); + return exact; } private Boolean calculateExact() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java index 5be28f6..aa97974 100644 --- a/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java @@ -69,7 +69,7 @@ public final/* @Immutable */class RegexpPatternMatcher extends AbstractPatternMa if (exact == null) { exact = calculateExact(); } - return exact.booleanValue(); + return exact; } private Boolean calculateExact() {
