http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java index 0dd9bb3..6307ff0 100644 --- a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java @@ -61,10 +61,10 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor private String defaultConf; // used only as defaultconf, not used for - // guesssing right side part of a mapping + // guessing right side part of a mapping private String defaultConfMapping; // same as default conf but is used - // for guesssing right side part of a mapping + // for guessing right side part of a mapping private DefaultDependencyDescriptor defaultConfMappingDescriptor; private Resource res; @@ -113,33 +113,33 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor } protected void parseDepsConfs(String confs, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande) { - parseDepsConfs(confs, dd, useDefaultMappingToGuessRightOperande, true); + boolean useDefaultMappingToGuessRightOperand) { + parseDepsConfs(confs, dd, useDefaultMappingToGuessRightOperand, true); } protected void parseDepsConfs(String confs, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande, boolean evaluateConditions) { + boolean useDefaultMappingToGuessRightOperand, boolean evaluateConditions) { if (confs == null) { return; } String[] conf = confs.split(";"); - parseDepsConfs(conf, dd, useDefaultMappingToGuessRightOperande, evaluateConditions); + parseDepsConfs(conf, dd, useDefaultMappingToGuessRightOperand, evaluateConditions); } protected void parseDepsConfs(String[] conf, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande) { - parseDepsConfs(conf, dd, useDefaultMappingToGuessRightOperande, true); + boolean useDefaultMappingToGuessRightOperand) { + parseDepsConfs(conf, dd, useDefaultMappingToGuessRightOperand, true); } protected void parseDepsConfs(String[] conf, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande, boolean evaluateConditions) { + boolean useDefaultMappingToGuessRightOperand, boolean evaluateConditions) { replaceConfigurationWildcards(md); for (int i = 0; i < conf.length; i++) { String[] ops = conf[i].split("->"); if (ops.length == 1) { String[] modConfs = ops[0].split(","); - if (!useDefaultMappingToGuessRightOperande) { + if (!useDefaultMappingToGuessRightOperand) { for (int j = 0; j < modConfs.length; j++) { dd.addDependencyConfiguration(modConfs[j].trim(), modConfs[j].trim()); } @@ -182,20 +182,20 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor } if (md.isMappingOverride()) { - addExtendingConfigurations(conf, dd, useDefaultMappingToGuessRightOperande); + addExtendingConfigurations(conf, dd, useDefaultMappingToGuessRightOperand); } } /** * Evaluate the optional condition in the given configuration, like "[org=MYORG]confX". If * the condition evaluates to true, the configuration is returned, if the condition - * evaluatate to false, null is returned. If there are no conditions, the configuration + * evaluates to false, null is returned. If there are no conditions, the configuration * itself is returned. * * @param conf * the configuration to evaluate * @param dd - * the dependencydescriptor to which the configuration will be added + * the dependency descriptor to which the configuration will be added * @return the evaluated condition */ private String evaluateCondition(String conf, DefaultDependencyDescriptor dd) { @@ -250,14 +250,14 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor } private void addExtendingConfigurations(String[] confs, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande) { + boolean useDefaultMappingToGuessRightOperand) { for (int i = 0; i < confs.length; i++) { - addExtendingConfigurations(confs[i], dd, useDefaultMappingToGuessRightOperande); + addExtendingConfigurations(confs[i], dd, useDefaultMappingToGuessRightOperand); } } private void addExtendingConfigurations(String conf, DefaultDependencyDescriptor dd, - boolean useDefaultMappingToGuessRightOperande) { + boolean useDefaultMappingToGuessRightOperand) { Set<String> configsToAdd = new HashSet<String>(); Configuration[] configs = md.getConfigurations(); for (int i = 0; i < configs.length; i++) { @@ -267,13 +267,13 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor String configName = configs[i].getName(); configsToAdd.add(configName); addExtendingConfigurations(configName, dd, - useDefaultMappingToGuessRightOperande); + useDefaultMappingToGuessRightOperand); } } } String[] confs = configsToAdd.toArray(new String[configsToAdd.size()]); - parseDepsConfs(confs, dd, useDefaultMappingToGuessRightOperande); + parseDepsConfs(confs, dd, useDefaultMappingToGuessRightOperand); } protected DependencyDescriptor getDefaultConfMappingDescriptor() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java index cbb2eed..4967457 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java @@ -502,14 +502,14 @@ public class PomModuleDescriptorBuilder { return result; } - private static String getDependencyMgtExtraInfoKeyForVersion(String groupId, String artifaceId) { + private static String getDependencyMgtExtraInfoKeyForVersion(String groupId, String artifactId) { return DEPENDENCY_MANAGEMENT + EXTRA_INFO_DELIMITER + groupId + EXTRA_INFO_DELIMITER - + artifaceId + EXTRA_INFO_DELIMITER + "version"; + + artifactId + EXTRA_INFO_DELIMITER + "version"; } - private static String getDependencyMgtExtraInfoKeyForScope(String groupId, String artifaceId) { + private static String getDependencyMgtExtraInfoKeyForScope(String groupId, String artifactId) { return DEPENDENCY_MANAGEMENT + EXTRA_INFO_DELIMITER + groupId + EXTRA_INFO_DELIMITER - + artifaceId + EXTRA_INFO_DELIMITER + "scope"; + + artifactId + EXTRA_INFO_DELIMITER + "scope"; } private static String getPropertyExtraInfoKey(String propertyName) { @@ -517,9 +517,9 @@ public class PomModuleDescriptorBuilder { } private static String getDependencyMgtExtraInfoPrefixForExclusion(String groupId, - String artifaceId) { + String artifactId) { return DEPENDENCY_MANAGEMENT + EXTRA_INFO_DELIMITER + groupId + EXTRA_INFO_DELIMITER - + artifaceId + EXTRA_INFO_DELIMITER + "exclusion_"; + + artifactId + EXTRA_INFO_DELIMITER + "exclusion_"; } private static List<ModuleId> getDependencyMgtExclusions(ModuleDescriptor descriptor, http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java index c7d82ba..9bb6433 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java @@ -176,7 +176,7 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { + " relocated to " + relocation + ". Please update your dependency to directly use the right version."); Message.warn("Resolution will only pick dependencies of the relocated element." - + " Artefact and other metadata will be ignored."); + + " Artifact and other metadata will be ignored."); ResolvedModuleRevision relocatedModule = parseOtherPom(ivySettings, relocation); if (relocatedModule == null) { throw new ParseException( @@ -233,7 +233,7 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { // add plugins from parent for (PomDependencyMgt pomDependencyMgt : PomModuleDescriptorBuilder .getPlugins(parentDescr)) { - mdBuilder.addPlugin((PomDependencyMgt) pomDependencyMgt); + mdBuilder.addPlugin(pomDependencyMgt); } } @@ -399,8 +399,7 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { return null; } else { dd = NameSpaceHelper.toSystem(dd, ivySettings.getContextNamespace()); - ResolvedModuleRevision otherModule = resolver.getDependency(dd, data); - return otherModule; + return resolver.getDependency(dd, data); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java index 7dc318f..e2f72c0 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java @@ -51,6 +51,7 @@ public final class PomModuleDescriptorWriter { private static final String SKIP_LINE = "SKIP_LINE"; + @SuppressWarnings("serial") private static final ConfigurationScopeMapping DEFAULT_MAPPING = new ConfigurationScopeMapping( new LinkedHashMap<String, String>() { { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java index bfefe7c..b9e8201 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java @@ -153,8 +153,9 @@ public class PomReader { } /** - * Add a property if not yet set and value is not null. This garantee that property keep the - * first value that is put on it and that the properties are never null. + * Add a property if not yet set and value is not null. This guarantees + * that property keeps the first value that is put on it and that the + * properties are never null. */ public void setProperty(String prop, String val) { if (!properties.containsKey(prop) && val != null) { @@ -535,7 +536,7 @@ public class PomReader { return false; } String propertyValue = getFirstChildText(propertyActivation, VALUE); - + Map<String, String> pomProperties = PomReader.this.getPomProperties(); boolean matched; if (propertyValue == null || "".equals(propertyValue)) { @@ -695,8 +696,7 @@ public class PomReader { return prefix[count++]; } - int result = super.read(); - return result; + return super.read(); } @Override http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java index 1a247bb..a272d65 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java @@ -100,13 +100,13 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } /** - * @param settings + * @param ivySettings ParserSettings * @param xmlURL * the url pointing to the file to parse * @param res * the real resource to parse, used for log only - * @param validate - * @return + * @param validate boolean + * @return ModuleDescriptor * @throws ParseException * @throws IOException */ @@ -412,7 +412,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { * <li>ask repositories to retrieve the parent module descriptor</li> * </ul> * - * @param attributes + * @param attributes Attributes * @throws ParseException */ protected void extendsStarted(Attributes attributes) throws ParseException { @@ -523,7 +523,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { * Merge everything from a given parent * * @param parent - * a given parent module desciptor + * a given parent module descriptor */ protected void mergeAll(ModuleDescriptor parent) { mergeInfo(parent); @@ -535,10 +535,10 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } /** - * Explain how to inherit metadatas related to info element + * Explain how to inherit metadata related to info element * * @param parent - * a given parent module decriptor + * a given parent module descriptor */ protected void mergeInfo(ModuleDescriptor parent) { ModuleRevisionId parentMrid = parent.getModuleRevisionId(); @@ -590,10 +590,8 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { /** * Describes how to merge configurations elements * - * @param sourceMrid - * the source module revision id - * @param configurations - * array of configurations to be inherited + * @param parent + * the module descriptor */ protected void mergeConfigurations(ModuleDescriptor parent) { ModuleRevisionId sourceMrid = parent.getModuleRevisionId(); @@ -849,14 +847,13 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String visibility = settings.substitute(attributes.getValue("visibility")); String ext = settings.substitute(attributes.getValue("extends")); String transitiveValue = attributes.getValue("transitive"); - boolean transitive = (transitiveValue == null) ? true : Boolean.valueOf( - attributes.getValue("transitive")).booleanValue(); + boolean transitive = (transitiveValue == null) ? true + : Boolean.valueOf(attributes.getValue("transitive")); String deprecated = attributes.getValue("deprecated"); Configuration configuration = new Configuration(conf, - Configuration.Visibility.getVisibility(visibility == null ? "public" - : visibility), settings.substitute(attributes - .getValue("description")), ext == null ? null : ext.split(","), - transitive, deprecated); + Configuration.Visibility.getVisibility((visibility == null) ? "public" + : visibility), settings.substitute(attributes.getValue("description")), + (ext == null) ? null : ext.split(","), transitive, deprecated); ExtendableItemHelper.fillExtraAttributes(settings, configuration, attributes, new String[] {"name", "visibility", "extends", "transitive", "description", "deprecated"}); @@ -903,14 +900,12 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { if (org == null) { org = getMd().getModuleRevisionId().getOrganisation(); } - boolean force = Boolean.valueOf(settings.substitute(attributes.getValue("force"))) - .booleanValue(); - boolean changing = Boolean - .valueOf(settings.substitute(attributes.getValue("changing"))).booleanValue(); + boolean force = Boolean.valueOf(settings.substitute(attributes.getValue("force"))); + boolean changing = Boolean.valueOf(settings.substitute(attributes.getValue("changing"))); String transitiveValue = settings.substitute(attributes.getValue("transitive")); - boolean transitive = (transitiveValue == null) ? true : Boolean.valueOf( - attributes.getValue("transitive")).booleanValue(); + boolean transitive = (transitiveValue == null) ? true + : Boolean.valueOf(attributes.getValue("transitive")); String name = settings.substitute(attributes.getValue("name")); String branch = settings.substitute(attributes.getValue("branch")); @@ -1008,7 +1003,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String confMappingOverride = settings.substitute(attributes .getValue("confmappingoverride")); if (confMappingOverride != null) { - getMd().setMappingOverride(Boolean.valueOf(confMappingOverride).booleanValue()); + getMd().setMappingOverride(Boolean.valueOf(confMappingOverride)); } checkConfigurations(); } @@ -1018,8 +1013,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { setDefaultConfMapping(settings.substitute(attributes.getValue("defaultconfmapping"))); setDefaultConf(settings.substitute(attributes.getValue("defaultconf"))); getMd().setMappingOverride( - Boolean.valueOf(settings.substitute(attributes.getValue("confmappingoverride"))) - .booleanValue()); + Boolean.valueOf(settings.substitute(attributes.getValue("confmappingoverride")))); } protected void infoStarted(Attributes attributes) { @@ -1053,7 +1047,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { getMd().setStatus( status == null ? settings.getStatusManager().getDefaultStatus() : status); getMd().setDefault( - Boolean.valueOf(settings.substitute(attributes.getValue("default"))).booleanValue()); + Boolean.valueOf(settings.substitute(attributes.getValue("default")))); String pubDate = settings.substitute(attributes.getValue("publication")); if (pubDate != null && pubDate.length() > 0) { try { @@ -1271,7 +1265,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { buffer.deleteCharAt(buffer.length() - 1); buffer.append("/>"); } else { - buffer.append("</" + qName + ">"); + buffer.append("</").append(qName).append(">"); } } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java index 9880f2d..b373acf 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java @@ -221,7 +221,7 @@ public final class XmlModuleDescriptorUpdater { if (options.getConfsToExclude() != null) { this.confs = Arrays.asList(options.getConfsToExclude()); } else { - this.confs = Collections.EMPTY_LIST; + this.confs = Collections.emptyList(); } } @@ -920,7 +920,9 @@ public final class XmlModuleDescriptorUpdater { } } - /** get the whitespace that should precede new elements at the current depth in the document */ + /** + * get the whitespace that should precede new elements at the current depth in the document + */ private String getIndent() { int level = context.size() - 1; fillIndents(level); @@ -1279,11 +1281,11 @@ public final class XmlModuleDescriptorUpdater { if (print == null) { return defaultPrint; } - return print.booleanValue(); + return print; } void setPrint(boolean print) { - this.print = Boolean.valueOf(print); + this.print = print; } void setDefaultPrint(boolean print) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java index 2206663..828307b 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java @@ -552,6 +552,7 @@ public final class XmlModuleDescriptorWriter { } } + @SuppressWarnings("deprecation") private static boolean requireInnerInfoElement(ModuleDescriptor md) { return md.getExtraInfo().size() > 0 || md.getExtraInfos().size() > 0 || md.getHomePage() != null http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/report/XmlReportParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/report/XmlReportParser.java b/src/java/org/apache/ivy/plugins/report/XmlReportParser.java index 633eb56..c24fc11 100644 --- a/src/java/org/apache/ivy/plugins/report/XmlReportParser.java +++ b/src/java/org/apache/ivy/plugins/report/XmlReportParser.java @@ -78,7 +78,7 @@ public class XmlReportParser { revisionArtifacts = new ArrayList<ArtifactDownloadReport>(); branch = attributes.getValue("branch"); revision = attributes.getValue("name"); - isDefault = Boolean.valueOf(attributes.getValue("default")).booleanValue(); + isDefault = Boolean.valueOf(attributes.getValue("default")); // retrieve position from file. If no position is found, it may be an old // report generated with a previous version, // in which case, we put it at the last position @@ -137,7 +137,7 @@ public class XmlReportParser { } if (attributes.getValue("origin-location") != null) { if (ArtifactOrigin.isUnknown(attributes.getValue("origin-location"))) { - madr.setArtifactOrigin(ArtifactOrigin.unkwnown(madr.getArtifact())); + madr.setArtifactOrigin(ArtifactOrigin.unknown(madr.getArtifact())); } else { madr.setArtifactOrigin(new ArtifactOrigin(madr.getArtifact(), parseBoolean(attributes.getValue("origin-is-local")), @@ -175,7 +175,7 @@ public class XmlReportParser { .get(revisionArtifacts.size() - 1); if (ArtifactOrigin.isUnknown(attributes.getValue("location"))) { - aReport.setArtifactOrigin(ArtifactOrigin.unkwnown(aReport.getArtifact())); + aReport.setArtifactOrigin(ArtifactOrigin.unknown(aReport.getArtifact())); } else { aReport.setArtifactOrigin(new ArtifactOrigin(aReport.getArtifact(), parseBoolean(attributes.getValue("is-local")), attributes http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/Resource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/Resource.java b/src/java/org/apache/ivy/plugins/repository/Resource.java index ea3ef01..7a62269 100644 --- a/src/java/org/apache/ivy/plugins/repository/Resource.java +++ b/src/java/org/apache/ivy/plugins/repository/Resource.java @@ -47,7 +47,7 @@ public interface Resource { /** * Get the name of the resource. * - * @return the repositorie's assigned resource name/identifier. + * @return the repository's assigned resource name/identifier. */ public String getName(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/TransferEvent.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/TransferEvent.java b/src/java/org/apache/ivy/plugins/repository/TransferEvent.java index d7697e3..68c5adf 100644 --- a/src/java/org/apache/ivy/plugins/repository/TransferEvent.java +++ b/src/java/org/apache/ivy/plugins/repository/TransferEvent.java @@ -23,7 +23,7 @@ import org.apache.ivy.core.event.IvyEvent; /** * TransferEvent is used to notify TransferListeners about progress in transfer of resources form/to - * the respository This class is LARGELY inspired by org.apache.maven.wagon.events.TransferEvent + * the repository This class is LARGELY inspired by org.apache.maven.wagon.events.TransferEvent * released under the following copyright license: * * <pre> @@ -44,7 +44,7 @@ import org.apache.ivy.core.event.IvyEvent; * * </pre> * - * Orginal class written by Michal Maczka. + * Original class written by Michal Maczka. */ public class TransferEvent extends IvyEvent { /** http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java b/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java index 1f5f93a..3b31ee9 100644 --- a/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java @@ -86,6 +86,7 @@ public class SFTPRepository extends AbstractSshBasedRepository { * @return a fully initialized resource, able to answer to all its methods without needing any * further connection */ + @SuppressWarnings("unchecked") public Resource resolveResource(String path) { try { ChannelSftp c = getSftpChannel(path); @@ -105,7 +106,7 @@ public class SFTPRepository extends AbstractSshBasedRepository { } } catch (Exception e) { Message.debug("Error while resolving resource " + path, e); - // silent fail, return unexisting resource + // silent fail, return nonexistent resource } return new BasicResource(path, false, 0, 0, false); @@ -199,6 +200,7 @@ public class SFTPRepository extends AbstractSshBasedRepository { return result; } + @SuppressWarnings("unchecked") public List list(String parent) throws IOException { try { ChannelSftp c = getSftpChannel(parent); @@ -240,12 +242,9 @@ public class SFTPRepository extends AbstractSshBasedRepository { * to check * @param channel * to use - * @returns true if file exists, false otherwise - * @throws IOException - * @throws SftpException + * @return true if file exists, false otherwise */ - private boolean checkExistence(String file, ChannelSftp channel) throws IOException, - SftpException { + private boolean checkExistence(String file, ChannelSftp channel) { try { return channel.stat(file) != null; } catch (SftpException ex) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java index e8a5aed..276cc25 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java @@ -63,7 +63,7 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { **/ private static HashMap credentialsCache = new HashMap(); - private static final int MAX_CREDENTILAS_CACHE_SIZE = 100; + private static final int MAX_CREDENTIALS_CACHE_SIZE = 100; /** * get a new session using the default attributes if the given String is a full uri, use the @@ -168,7 +168,7 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { } /** - * Called, when user was not found in URL. Maintain static hashe of credentials and retrieve or + * Called, when user was not found in URL. Maintain static hash of credentials and retrieve or * ask credentials for host. * * @param host @@ -181,7 +181,7 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { Credentials c = CredentialsUtil.promptCredentials(new Credentials(null, host, user, userPassword), getPassFile()); if (c != null) { - if (credentialsCache.size() > MAX_CREDENTILAS_CACHE_SIZE) { + if (credentialsCache.size() > MAX_CREDENTIALS_CACHE_SIZE) { credentialsCache.clear(); } credentialsCache.put(host, c); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java b/src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java index bf09516..6765e48 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/RemoteScpException.java @@ -19,7 +19,7 @@ package org.apache.ivy.plugins.repository.ssh; /** * This exception will be used for Remote SCP Exceptions (failures on the target system, no - * connetion probs) + * connection probs) */ public class RemoteScpException extends Exception { @@ -29,22 +29,22 @@ public class RemoteScpException extends Exception { } /** - * @param message + * @param message ditto */ public RemoteScpException(String message) { super(message); } /** - * @param cause + * @param cause Throwable */ public RemoteScpException(Throwable cause) { super(cause); } /** - * @param message - * @param cause + * @param message ditto + * @param cause Throwable */ public RemoteScpException(String message, Throwable cause) { super(message, cause); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java b/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java index ab53876..934ac7d 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java @@ -275,6 +275,7 @@ public class Scp { fileInfo.setLastModified(modtime); } + @SuppressWarnings("resource") private void sendFile(Channel channel, String localFile, String remoteName, String mode) throws IOException, RemoteScpException { byte[] buffer = new byte[BUFFER_SIZE]; @@ -354,7 +355,7 @@ public class Scp { * ssh channel to use * @param file * to receive from remote - * @param target + * @param targetStream * to store file into (if null, get only file info) * @return file information of the file we received * @throws IOException @@ -450,7 +451,7 @@ public class Scp { } /** - * @return + * @return ChannelExec * @throws JSchException */ private ChannelExec getExecChannel() throws JSchException { @@ -476,6 +477,7 @@ public class Scp { * @throws RemoteScpException * in case of problems on the target system (connection ok) */ + @SuppressWarnings("unused") public void put(String localFile, String remoteTargetDir, String remoteTargetName, String mode) throws IOException, RemoteScpException { ChannelExec channel = null; @@ -550,6 +552,7 @@ public class Scp { */ public void get(String remoteFile, OutputStream localTarget) throws IOException, RemoteScpException { + @SuppressWarnings("unused") ChannelExec channel = null; if ((remoteFile == null) || (localTarget == null)) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java b/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java index 095ec61..de87655 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java @@ -53,7 +53,7 @@ public final class SshCache { private static final int SSH_DEFAULT_PORT = 22; private SshCache() { - }; + } private static SshCache instance = new SshCache(); @@ -151,7 +151,7 @@ public final class SshCache { /** * key is username / host / port * - * @see SshCache.createCacheKey() for details + * @see #createCacheKey(String, String, int) for details */ private Map uriCacheMap = new HashMap(); @@ -162,9 +162,13 @@ public final class SshCache { /** * retrieves a session entry for a given hostname from the cache - * - * @param hostname + * + * @param user * to retrieve session for + * @param host + * ditto + * @param port + * ditto * @return null or the existing entry */ private Entry getCacheEntry(String user, String host, int port) { @@ -172,7 +176,7 @@ public final class SshCache { } /** - * Creates a cobined cache key from the given key parts + * Creates a combined cache key from the given key parts * * @param user * name of the user @@ -241,7 +245,7 @@ public final class SshCache { } /** - * discardes session entries from the cache + * discards session entries from the cache * * @param session * to clear http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java b/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java index ec5240c..cbe654f 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java @@ -71,7 +71,7 @@ public class SshRepository extends AbstractSshBasedRepository { * * @param source * ssh uri for the file to get info for - * @return SshResource filled with the needed informations + * @return SshResource filled with the needed information * @see org.apache.ivy.plugins.repository.Repository#getResource(java.lang.String) */ public SshResource resolveResource(String source) { @@ -195,9 +195,8 @@ public class SshRepository extends AbstractSshBasedRepository { } /** - * @param session - * @return - * @throws JSchException + * @param session Session + * @return ChannelExec */ private ChannelExec getExecChannel(Session session) throws IOException { ChannelExec channel; @@ -215,7 +214,7 @@ public class SshRepository extends AbstractSshBasedRepository { * * @param command * with argument placeholder or not - * @param argument + * @param argument ditto * @return replaced full command */ private String replaceArgument(String command, String argument) { @@ -283,7 +282,7 @@ public class SshRepository extends AbstractSshBasedRepository { * * @param path * to create - * @param connnection + * @param session * to use */ private void makePath(String path, Session session) throws IOException { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java b/src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java index 7fc797e..74a0cca 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/SshResource.java @@ -116,13 +116,7 @@ public class SshResource implements Resource { } public String toString() { - StringBuffer buffer = new StringBuffer(); - buffer.append("SshResource:"); - buffer.append(uri); - buffer.append(" ("); - buffer.append(len); - buffer.append(")]"); - return buffer.toString(); + return "SshResource:" + uri + " (" + len + ")]"; } public boolean isLocal() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/url/URLRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/url/URLRepository.java b/src/java/org/apache/ivy/plugins/repository/url/URLRepository.java index 098ccc3..2897642 100644 --- a/src/java/org/apache/ivy/plugins/repository/url/URLRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/url/URLRepository.java @@ -131,7 +131,7 @@ public class URLRepository extends AbstractRepository { } return ret; } else { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java index aead7cf..6519811 100644 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsRepository.java @@ -118,7 +118,7 @@ public class VfsRepository extends AbstractRepository { /** * Get a VfsResource * - * @param source + * @param vfsURI * a <code>String</code> identifying a VFS Resource * @throws <code>IOException</code> on failure * @see "Supported File Systems in the jakarta-commons-vfs documentation" @@ -190,7 +190,7 @@ public class VfsRepository extends AbstractRepository { * Transfer an Ivy resource to a VFS repository * * @param source - * a <code>File</code> indentifying the local file to transfer to the repository + * a <code>File</code> identifying the local file to transfer to the repository * @param vfsURI * a <code>String</code> identifying the destination VFS Resource. * @param overwrite http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java index 5cd7cc2..5a97924 100644 --- a/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java +++ b/src/java/org/apache/ivy/plugins/repository/vfs/VfsResource.java @@ -80,8 +80,8 @@ public class VfsResource implements Resource { } /** - * Get a list of direct descendents of the given resource. Note that attempts to get a list of - * children does <emphasize>not</emphasize> result in an error. Instead an error message is + * Get a list of direct descendants of the given resource. Note that attempts to get a list of + * children does <em>not</em> result in an error. Instead an error message is * logged and an empty ArrayList returned. * * @return A <code>ArrayList</code> of VFSResources @@ -127,7 +127,7 @@ public class VfsResource implements Resource { * The VFS FileName getURI method seems to have a bug in it where file: URIs will have 4 forward * slashes instead of 3. * - * @param vfsURI + * @param vfsURI ditto * @return a normalized <class>String</class> representing the VFS URI */ public static String normalize(String vfsURI) { @@ -185,9 +185,9 @@ public class VfsResource implements Resource { return resourceImpl.exists(); // originally I only checked for a FileSystemException. I expanded it to // include all exceptions when I found it would throw a NPE exception when the query was - // run on non-wellformed VFS URI. + // run on ill-formed VFS URI. } catch (Exception e) { - Message.verbose("Fail to check the existance of the resource " + getName(), e); + Message.verbose("Fail to check the existence of the resource " + getName(), e); return false; } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java b/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java index 13f773f..1ec8f4f 100644 --- a/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java @@ -43,7 +43,7 @@ import org.apache.ivy.util.Message; /** * Repository using SecureCRT vsftp command line program to access an sftp repository This is - * especially useful to leverage the gssapi authentication supported by SecureCRT. In caseswhere + * especially useful to leverage the gssapi authentication supported by SecureCRT. In cases where * usual sftp is enough, prefer the 100% java solution of sftp repository. This requires SecureCRT * to be in the PATH. Tested with SecureCRT 5.0.5 */ @@ -305,7 +305,7 @@ public class VsftpRepository extends AbstractRepository { * stream, even if everything is ok. So it's quite difficult if there was an error or not. Hence * we compare the response with the expected message and deal with it. The problem is that this * is very specific to the version of vsftp used for the test, That's why expected messages are - * obtained using overridable protected methods. + * obtained using overriddable protected methods. */ protected void sendCommand(String command, Pattern expectedResponse, long timeout) throws IOException { @@ -366,6 +366,7 @@ public class VsftpRepository extends AbstractRepository { return readResponse(sendErrorAsResponse, readTimeout); } + @SuppressWarnings("deprecation") protected synchronized String readResponse(final boolean sendErrorAsResponse, long timeout) throws IOException { final StringBuffer response = new StringBuffer(); @@ -638,9 +639,9 @@ public class VsftpRepository extends AbstractRepository { /** * Parses a ls -l line and transforms it in a resource * - * @param file - * @param responseLine - * @return + * @param file ditto + * @param responseLine ditto + * @return Resource */ protected Resource lslToResource(String file, String responseLine) { if (responseLine == null || responseLine.startsWith("ls")) { @@ -729,7 +730,7 @@ public class VsftpRepository extends AbstractRepository { * Sets the reuse connection time. The same connection will be reused if the time here does not * last between two commands. O indicates that the connection should never be reused * - * @param time + * @param time long */ public void setReuseConnection(long time) { this.reuseConnection = time; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java index b813d38..ff99b8e 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java @@ -273,7 +273,7 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { /** * example of pattern : ~/Workspace/[module]/[module].ivy.xml * - * @param pattern + * @param pattern String */ public void addIvyPattern(String pattern) { ivyPatterns.add(pattern); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java index 7c5af9e..b310ed8 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java @@ -144,18 +144,18 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS protected boolean doValidate(ResolveData data) { if (validate != null) { - return validate.booleanValue(); + return validate; } else { return data.isValidate(); } } public boolean isValidate() { - return validate == null ? true : validate.booleanValue(); + return validate == null || validate; } public void setValidate(boolean validate) { - this.validate = Boolean.valueOf(validate); + this.validate = validate; } protected void checkInterrupted() { @@ -377,7 +377,7 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS } public void setCheckmodified(boolean check) { - checkmodified = Boolean.valueOf(check); + checkmodified = check; } public RepositoryCacheManager getRepositoryCacheManager() { @@ -499,9 +499,10 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS * Returns true if rmr1 is after rmr2, using the latest strategy to determine which is the * latest * - * @param rmr1 - * @param rmr2 - * @return + * @param rmr1 ResolvedModuleRevision + * @param rmr2 ResolvedModuleRevision + * @param date Date + * @return boolean */ protected boolean isAfter(ResolvedModuleRevision rmr1, ResolvedModuleRevision rmr2, Date date) { ArtifactInfo[] ais = new ArtifactInfo[] {new ResolvedModuleRevisionArtifactInfo(rmr1), http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java index c309893..907ccb4 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java @@ -66,7 +66,7 @@ public abstract class AbstractSshBasedResolver extends RepositoryResolver { } /** - * Optional password file. If set the repository will use it as an encypted property file, to + * Optional password file. If set the repository will use it as an encrypted property file, to * load username and passwd entries, and to store them if the user choose to do so. Defaults to * user.dir/.ivy/[host].sftp.passwd, set it to null to disable this feature. */ @@ -147,8 +147,8 @@ public abstract class AbstractSshBasedResolver extends RepositoryResolver { * sets the path to an OpenSSH-style config file to be used for reading configuration values for * an ssh repository, such as a username * - * @param path - * of the config file + * @param sshConfig + * path of the config file */ public void setSshConfig(String sshConfig) { getSshBasedRepository().setSshConfig(sshConfig); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java index 389998d..3f550b0 100644 --- a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java @@ -95,6 +95,7 @@ public abstract class BasicResolver extends AbstractResolver { * converted in a message (either error or verbose) and returning null * </p> */ + @SuppressWarnings("serial") private static class UnresolvedDependencyException extends RuntimeException { private static final long serialVersionUID = 1L; @@ -214,7 +215,7 @@ public abstract class BasicResolver extends AbstractResolver { } else if (isForce() && rmr.getResolver() != this) { Message.verbose("\t" + getName() + ": found revision in cache: " + systemMrid + " (resolved by " + rmr.getResolver().getName() - + "): but we are in force mode, let's try to find one ourself"); + + "): but we are in force mode, let's try to find one ourselves"); } else { Message.verbose("\t" + getName() + ": revision in cache: " + systemMrid); return checkLatest(systemDd, checkForcedResolvedModuleRevision(rmr), data); @@ -583,16 +584,14 @@ public abstract class BasicResolver extends AbstractResolver { Message.error("\t" + getName() + ": bad organisation found in " + ivyRef.getResource() + ": expected='" + mrid.getOrganisation() + "' found='" + md.getModuleRevisionId().getOrganisation() + "'"); - errors.append("bad organisation: expected='" + mrid.getOrganisation() + "' found='" - + md.getModuleRevisionId().getOrganisation() + "'; "); + errors.append("bad organisation: expected='").append(mrid.getOrganisation()).append("' found='").append(md.getModuleRevisionId().getOrganisation()).append("'; "); ok = false; } if (!mrid.getName().equals(md.getModuleRevisionId().getName())) { Message.error("\t" + getName() + ": bad module name found in " + ivyRef.getResource() + ": expected='" + mrid.getName() + " found='" + md.getModuleRevisionId().getName() + "'"); - errors.append("bad module name: expected='" + mrid.getName() + "' found='" - + md.getModuleRevisionId().getName() + "'; "); + errors.append("bad module name: expected='").append(mrid.getName()).append("' found='").append(md.getModuleRevisionId().getName()).append("'; "); ok = false; } if (mrid.getBranch() != null @@ -600,8 +599,7 @@ public abstract class BasicResolver extends AbstractResolver { Message.error("\t" + getName() + ": bad branch name found in " + ivyRef.getResource() + ": expected='" + mrid.getBranch() + " found='" + md.getModuleRevisionId().getBranch() + "'"); - errors.append("bad branch name: expected='" + mrid.getBranch() + "' found='" - + md.getModuleRevisionId().getBranch() + "'; "); + errors.append("bad branch name: expected='").append(mrid.getBranch()).append("' found='").append(md.getModuleRevisionId().getBranch()).append("'; "); ok = false; } if (ivyRef.getRevision() != null && !ivyRef.getRevision().startsWith("working@") @@ -611,15 +609,14 @@ public abstract class BasicResolver extends AbstractResolver { Message.error("\t" + getName() + ": bad revision found in " + ivyRef.getResource() + ": expected='" + ivyRef.getRevision() + " found='" + md.getModuleRevisionId().getRevision() + "'"); - errors.append("bad revision: expected='" + ivyRef.getRevision() + "' found='" - + md.getModuleRevisionId().getRevision() + "'; "); + errors.append("bad revision: expected='").append(ivyRef.getRevision()).append("' found='").append(md.getModuleRevisionId().getRevision()).append("'; "); ok = false; } } if (!getSettings().getStatusManager().isStatus(md.getStatus())) { Message.error("\t" + getName() + ": bad status found in " + ivyRef.getResource() + ": '" + md.getStatus() + "'"); - errors.append("bad status: '" + md.getStatus() + "'; "); + errors.append("bad status: '").append(md.getStatus()).append("'; "); ok = false; } for (Map.Entry<String, String> extra : mrid.getExtraAttributes().entrySet()) { @@ -629,7 +626,7 @@ public abstract class BasicResolver extends AbstractResolver { + ": expected='" + extra.getValue() + "' found='" + md.getExtraAttribute(extra.getKey()) + "'"; Message.error("\t" + getName() + ": " + errorMsg); - errors.append(errorMsg + ";"); + errors.append(errorMsg).append(";"); ok = false; } } @@ -878,10 +875,7 @@ public abstract class BasicResolver extends AbstractResolver { @Override public boolean exists(Artifact artifact) { ResolvedResource artifactRef = getArtifactRef(artifact, null); - if (artifactRef != null) { - return artifactRef.getResource().exists(); - } - return false; + return artifactRef != null && artifactRef.getResource().exists(); } @Override @@ -1067,8 +1061,8 @@ public abstract class BasicResolver extends AbstractResolver { return checkconsistency; } - public void setCheckconsistency(boolean checkConsitency) { - checkconsistency = checkConsitency; + public void setCheckconsistency(boolean checkConsistency) { + checkconsistency = checkConsistency; } public void setForce(boolean force) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java index e4a2987..8cf574c 100644 --- a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java @@ -299,7 +299,7 @@ public class ChainResolver extends AbstractResolver { return origin; } } - return ArtifactOrigin.unkwnown(artifact); + return ArtifactOrigin.unknown(artifact); } @Override http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java b/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java index 5d4c76c..8bd4898 100644 --- a/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java @@ -149,7 +149,7 @@ public interface DependencyResolver { /** * Reports last artifact download failure as Messages * - * @param art + * @param art Artifact */ void reportFailure(Artifact art); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java b/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java index fe0d0f2..8c7ca19 100644 --- a/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java @@ -220,7 +220,7 @@ public class FileSystemResolver extends RepositoryResolver { return false; } checkSupportTransaction(); - return supportTransaction.booleanValue(); + return supportTransaction; } private void closeTransaction() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java index 32c42ab..0084da0 100644 --- a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java @@ -347,11 +347,11 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { } public boolean isAlwaysCheckExactRevision() { - return alwaysCheckExactRevision == null ? true : alwaysCheckExactRevision.booleanValue(); + return alwaysCheckExactRevision == null || alwaysCheckExactRevision; } public void setAlwaysCheckExactRevision(boolean alwaysCheckExactRevision) { - this.alwaysCheckExactRevision = Boolean.valueOf(alwaysCheckExactRevision); + this.alwaysCheckExactRevision = alwaysCheckExactRevision; } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/SshResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/SshResolver.java b/src/java/org/apache/ivy/plugins/resolver/SshResolver.java index f1114de..bdb5e98 100644 --- a/src/java/org/apache/ivy/plugins/resolver/SshResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/SshResolver.java @@ -54,7 +54,7 @@ public class SshResolver extends AbstractSshBasedResolver { /** * set the command to get a directory listing the command has to be a shell command working on * the target system and has to produce a listing of filenames, with each filename on a new line - * the term %arg can be used in the command to substitue the path to be listed (e.g. + * the term %arg can be used in the command to substitute the path to be listed (e.g. * "ls -1 %arg | grep -v CVS" to get a listing without CVS directory) if %arg is not part of the * command, the path will be appended to the command default is: "ls -1" */ @@ -66,7 +66,7 @@ public class SshResolver extends AbstractSshBasedResolver { * set the command to check for existence of a file the command has to be a shell command * working on the target system and has to create an exit status of 0 for an existent file and * <> 0 for a non existing file given as argument the term %arg can be used in the command to - * substitue the path to be listed if %arg is not part of the command, the path will be appended + * substitute the path to be listed if %arg is not part of the command, the path will be appended * to the command default is: "ls" */ public void setExistCommand(String cmd) { @@ -76,7 +76,7 @@ public class SshResolver extends AbstractSshBasedResolver { /** * set the command to create a directory on the target system the command has to be a shell * command working on the target system and has to create a directory with the given argument - * the term %arg can be used in the command to substitue the path to be listed if %arg is not + * the term %arg can be used in the command to substitute the path to be listed if %arg is not * part of the command, the path will be appended to the command default is: "mkdir" */ public void setCreateDirCommand(String cmd) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/packager/BuiltFileResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/packager/BuiltFileResource.java b/src/java/org/apache/ivy/plugins/resolver/packager/BuiltFileResource.java index ce8912a..fdc5d9b 100644 --- a/src/java/org/apache/ivy/plugins/resolver/packager/BuiltFileResource.java +++ b/src/java/org/apache/ivy/plugins/resolver/packager/BuiltFileResource.java @@ -33,7 +33,7 @@ public class BuiltFileResource implements Resource { /** * Where the build file should put built artifacts (relative to the build directory). Value is: - * * {@value} + * {@value} */ public static final String BUILT_ARTIFACT_PATTERN = "artifacts/[type]s/[artifact].[ext]"; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java b/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java index d2575ed..2b7aec6 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java @@ -278,7 +278,7 @@ public final class ResolverHelper { String acceptNamePattern = ".*" + IvyPatternHelper.substituteToken(namePattern, token, "([^/]+)") + ".*"; - Pattern p = Pattern.compile(acceptNamePattern.toString()); + Pattern p = Pattern.compile(acceptNamePattern); for (URL url : all) { String path = standardize(url.getPath()); Matcher m = p.matcher(path); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java b/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java index b8bc901..db1cd32 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java @@ -26,8 +26,8 @@ public interface URLLister { * Indicates if this lister is able to list urls with the given pattern. In general, only * protocol is used. * - * @param pattern - * @return + * @param pattern ditto + * @return boolean */ boolean accept(String pattern); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java b/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java index e3100cb..b127005 100644 --- a/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/AbstractVersionMatcher.java @@ -54,8 +54,8 @@ public abstract class AbstractVersionMatcher implements VersionMatcher, IvySetti } /** - * This method should be overriden in most cases, because it uses the default contract to return - * 1 when it's not possible to know which revision is greater. + * This method should be overridden in most cases, because it uses the default contract to + * return 1 when it's not possible to know which revision is greater. */ public int compare(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid, Comparator staticComparator) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java b/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java index fae5ca7..a1c159d 100644 --- a/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/ChainVersionMatcher.java @@ -30,7 +30,7 @@ import org.apache.ivy.plugins.IvySettingsAware; import org.apache.ivy.util.Checks; /** - * An implementation of {@link VersionMatcher} chaining several version matchers, and implemeting + * An implementation of {@link VersionMatcher} chaining several version matchers, and implementing * the {@link VersionMatcher} interface by returning results from the first matcher in the chain * accepting the version. */ @@ -83,7 +83,7 @@ public class ChainVersionMatcher extends AbstractVersionMatcher { * Returns the list of matchers in the chain. * <p> * The list is returned as an unmodifiable view on the actual list of matchers, and will thus - * reflect futher changes made in the chain. + * reflect further changes made in the chain. * * @return the list of matchers in the chain. Is never null. */ http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java index 2ab2b33..cc60696 100644 --- a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java @@ -40,7 +40,7 @@ public class LatestVersionMatcher extends AbstractVersionMatcher { public boolean needModuleDescriptor(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) { List<Status> statuses = StatusManager.getCurrent().getStatuses(); - Status lowest = (Status) statuses.get(statuses.size() - 1); + Status lowest = statuses.get(statuses.size() - 1); String latestLowest = "latest." + lowest.getName(); return !latestLowest.equals(askedMrid.getRevision()); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/version/VersionMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/version/VersionMatcher.java b/src/java/org/apache/ivy/plugins/version/VersionMatcher.java index ffbc976..41f9533 100644 --- a/src/java/org/apache/ivy/plugins/version/VersionMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/VersionMatcher.java @@ -56,9 +56,9 @@ public interface VersionMatcher { * Indicates if this version matcher considers that the module revision found matches the asked * one. * - * @param askedMrid - * @param foundMrid - * @return + * @param askedMrid ModuleRevisionId + * @param foundMrid ModuleRevisionId + * @return boolean */ public boolean accept(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid); @@ -67,7 +67,7 @@ public interface VersionMatcher { * matches the asked one. Note that returning true in this method may imply big performance * issues. * - * @return + * @return boolean */ public boolean needModuleDescriptor(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid); @@ -77,9 +77,9 @@ public interface VersionMatcher { * foundMrid) returns false, so it is required to implement it in any case, a usual default * implementation being: return accept(askedMrid, foundMD.getResolvedModuleRevisionId()); * - * @param askedMrid - * @param foundMD - * @return + * @param askedMrid ModuleRevisionId + * @param foundMD ModuleDescriptor + * @return boolean */ public boolean accept(ModuleRevisionId askedMrid, ModuleDescriptor foundMD); @@ -87,7 +87,7 @@ public interface VersionMatcher { * Compares a dynamic revision (askedMrid) with a static one (foundMrid) to indicate which one * should be considered the greater. If there is not enough information to know which one is the * greater, the dynamic one should be considered greater and this method should return 0. This - * method should never be called with a askdeMrid for which isDynamic returns false. + * method should never be called with a askedMrid for which isDynamic returns false. * * @param askedMrid * the dynamic revision to compare http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java b/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java index 7c59a3a..b547f4c 100644 --- a/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/VersionRangeMatcher.java @@ -210,7 +210,7 @@ public class VersionRangeMatcher extends AbstractVersionMatcher { } int c = staticComparator.compare(ModuleRevisionId.newInstance(askedMrid, upper), foundMrid); // if the comparison consider them equal, we must return -1, because we can't consider the - // dynamic revision to be greater. Otherwise we can safeely return the result of the static + // dynamic revision to be greater. Otherwise we can safely return the result of the static // comparison return c == 0 ? -1 : c; } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/ChecksumHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/ChecksumHelper.java b/src/java/org/apache/ivy/util/ChecksumHelper.java index 792f1e3..b3d1e61 100644 --- a/src/java/org/apache/ivy/util/ChecksumHelper.java +++ b/src/java/org/apache/ivy/util/ChecksumHelper.java @@ -75,7 +75,7 @@ public final class ChecksumHelper { * @param algorithm * the checksum algorithm to use * @throws IOException - * if an IO problem occur whle reading files or if the checksum is not compliant + * if an IO problem occur while reading files or if the checksum is not compliant */ public static void check(File dest, File checksumFile, String algorithm) throws IOException { String csFileContent = FileUtil http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/ConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/ConfigurationUtils.java b/src/java/org/apache/ivy/util/ConfigurationUtils.java index 1b5a637..343ece9 100644 --- a/src/java/org/apache/ivy/util/ConfigurationUtils.java +++ b/src/java/org/apache/ivy/util/ConfigurationUtils.java @@ -54,7 +54,7 @@ public final class ConfigurationUtils { * the configurations, can contain wildcards * @param md * the configurations where the wildcards are replaced - * @return + * @return configurations */ public static String[] replaceWildcards(String[] confs, ModuleDescriptor md) { if (confs == null) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/CredentialsUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/CredentialsUtil.java b/src/java/org/apache/ivy/util/CredentialsUtil.java index 68a0ba8..9b5b7e0 100644 --- a/src/java/org/apache/ivy/util/CredentialsUtil.java +++ b/src/java/org/apache/ivy/util/CredentialsUtil.java @@ -38,6 +38,7 @@ import org.apache.ivy.Ivy; public final class CredentialsUtil { + @SuppressWarnings("serial") private static final class CredentialPanel extends JPanel { private static final int FIELD_LENGTH = 20; @@ -107,7 +108,7 @@ public final class CredentialsUtil { String username = credentialPanel.userNameField.getText(); String passwd = credentialPanel.passwordField.getText(); if (credentialPanel.rememberDataCB.isSelected()) { - Properties props = new EncrytedProperties(); + Properties props = new EncryptedProperties(); props.setProperty("username", username); props.setProperty("passwd", passwd); FileOutputStream fos = null; @@ -133,7 +134,7 @@ public final class CredentialsUtil { public static Credentials loadPassfile(Credentials c, File passfile) { if (passfile != null && passfile.exists()) { - Properties props = new EncrytedProperties(); + Properties props = new EncryptedProperties(); FileInputStream fis = null; try { fis = new FileInputStream(passfile); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/DefaultMessageLogger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/DefaultMessageLogger.java b/src/java/org/apache/ivy/util/DefaultMessageLogger.java index 7a88a36..bb3e84a 100644 --- a/src/java/org/apache/ivy/util/DefaultMessageLogger.java +++ b/src/java/org/apache/ivy/util/DefaultMessageLogger.java @@ -21,7 +21,7 @@ public class DefaultMessageLogger extends AbstractMessageLogger { private int level = Message.MSG_INFO; /** - * @param level + * @param level ditto */ public DefaultMessageLogger(int level) { this.level = level; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/EncryptedProperties.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/EncryptedProperties.java b/src/java/org/apache/ivy/util/EncryptedProperties.java new file mode 100644 index 0000000..cbed952 --- /dev/null +++ b/src/java/org/apache/ivy/util/EncryptedProperties.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.util; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Properties; + +/** + * An implementation of Properties which stores the values encrypted. The use is transparent from + * the user point of view (use as any Properties instance), except that get, put and putAll do not + * handle encryption/decryption. This means that get returns the encrypted value, while put and + * putAll puts given values without encrypting them. It this thus recommended to void using them, + * use setProperty and getProperty instead. + */ +public class EncryptedProperties extends Properties { + + public EncryptedProperties() { + super(); + } + + public synchronized Object setProperty(String key, String value) { + return StringUtils.decrypt((String) super.setProperty(key, StringUtils.encrypt(value))); + } + + public String getProperty(String key) { + return StringUtils.decrypt(super.getProperty(key)); + } + + public String getProperty(String key, String defaultValue) { + return StringUtils.decrypt(super.getProperty(key, StringUtils.encrypt(defaultValue))); + } + + public boolean containsValue(Object value) { + return super.containsValue(StringUtils.encrypt((String) value)); + } + + public synchronized boolean contains(Object value) { + return super.contains(StringUtils.encrypt((String) value)); + } + + public Collection values() { + List ret = new ArrayList(super.values()); + for (int i = 0; i < ret.size(); i++) { + ret.set(i, StringUtils.decrypt((String) ret.get(i))); + } + return ret; + } +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/EncrytedProperties.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/EncrytedProperties.java b/src/java/org/apache/ivy/util/EncrytedProperties.java deleted file mode 100644 index 8d38fef..0000000 --- a/src/java/org/apache/ivy/util/EncrytedProperties.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.ivy.util; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Properties; - -/** - * An implementation of Properties which stores the values encrypted. The use is transparent from - * the user point of view (use as any Properties instance), except that get, put and putAll do not - * handle encryption/decryption. This means that get returns the encrypted value, while put and - * putAll puts given values without encrypting them. It this thus recommended to void using them, - * use setProperty and getProperty instead. - */ -public class EncrytedProperties extends Properties { - - public EncrytedProperties() { - super(); - } - - public synchronized Object setProperty(String key, String value) { - return StringUtils.decrypt((String) super.setProperty(key, StringUtils.encrypt(value))); - } - - public String getProperty(String key) { - return StringUtils.decrypt(super.getProperty(key)); - } - - public String getProperty(String key, String defaultValue) { - return StringUtils.decrypt(super.getProperty(key, StringUtils.encrypt(defaultValue))); - } - - public boolean containsValue(Object value) { - return super.containsValue(StringUtils.encrypt((String) value)); - } - - public synchronized boolean contains(Object value) { - return super.contains(StringUtils.encrypt((String) value)); - } - - public Collection values() { - List ret = new ArrayList(super.values()); - for (int i = 0; i < ret.size(); i++) { - ret.set(i, StringUtils.decrypt((String) ret.get(i))); - } - return ret; - } -} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/FileResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/FileResolver.java b/src/java/org/apache/ivy/util/FileResolver.java index 2827519..75e918c 100644 --- a/src/java/org/apache/ivy/util/FileResolver.java +++ b/src/java/org/apache/ivy/util/FileResolver.java @@ -33,7 +33,7 @@ public interface FileResolver { * * @param path * The path of the file to resolve. Must not be <code>null</code>. - * @param fileName + * @param filename * The name of the file to resolve. This is used only for exception message if any. * Must not be <code>null</code>. * http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/FileUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/FileUtil.java b/src/java/org/apache/ivy/util/FileUtil.java index e251f5c..aca4007 100644 --- a/src/java/org/apache/ivy/util/FileUtil.java +++ b/src/java/org/apache/ivy/util/FileUtil.java @@ -92,8 +92,7 @@ public final class FileUtil { } // Add to our buffer of commands - sb.append("ln -s -f \"" + srcFile.getAbsolutePath() + "\" \"" - + destFile.getAbsolutePath() + "\";"); + sb.append("ln -s -f \"").append(srcFile.getAbsolutePath()).append("\" \"").append(destFile.getAbsolutePath()).append("\";"); if (keyItr.hasNext()) { sb.append("\n"); } @@ -377,7 +376,7 @@ public final class FileUtil { String line = in.readLine(); while (line != null) { - buf.append(line + "\n"); + buf.append(line).append("\n"); line = in.readLine(); } return buf.toString(); @@ -459,7 +458,7 @@ public final class FileUtil { * Returns a list of Files composed of all directories being parent of file and child of root + * file and root themselves. Example: getPathFiles(new File("test"), new * File("test/dir1/dir2/file.txt")) => {new File("test/dir1"), new File("test/dir1/dir2"), new - * File("test/dir1/dir2/file.txt") } Note that if root is not an ancester of file, or if root is + * File("test/dir1/dir2/file.txt") } Note that if root is not an ancestor of file, or if root is * null, all directories from the file system root will be returned. */ public static List<File> getPathFiles(File root, File file) { @@ -484,7 +483,7 @@ public final class FileUtil { * extracted. * @param ignore * a Collection of filenames which must be excluded from listing - * @return A collectoin containing all the files of the given directory and it's subdirectories. + * @return A collection containing all the files of the given directory and it's subdirectories. */ public static Collection<File> listAll(File dir, Collection<String> ignore) { return listAll(dir, new ArrayList<File>(), ignore); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/MemoryUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/MemoryUtil.java b/src/java/org/apache/ivy/util/MemoryUtil.java index fef4482..d27beba 100644 --- a/src/java/org/apache/ivy/util/MemoryUtil.java +++ b/src/java/org/apache/ivy/util/MemoryUtil.java @@ -65,8 +65,7 @@ public final class MemoryUtil { long totalMemory = Runtime.getRuntime().totalMemory(); gc(); long freeMemory = Runtime.getRuntime().freeMemory(); - long usedMemory = totalMemory - freeMemory; - return usedMemory; + return totalMemory - freeMemory; } private static void gc() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/6c92f32e/src/java/org/apache/ivy/util/MessageLogger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/MessageLogger.java b/src/java/org/apache/ivy/util/MessageLogger.java index 0c09efe..f08c0a5 100644 --- a/src/java/org/apache/ivy/util/MessageLogger.java +++ b/src/java/org/apache/ivy/util/MessageLogger.java @@ -50,7 +50,7 @@ public interface MessageLogger { * @see Message#MSG_VERBOSE * @see Message#MSG_INFO * @see Message#MSG_WARN - * @see Message#MSG_ERROR + * @see Message#MSG_ERR */ public abstract void log(String msg, int level);
