Author: xavier
Date: Thu Aug 16 02:26:16 2007
New Revision: 566598
URL: http://svn.apache.org/viewvc?view=rev&rev=566598
Log:
clean code
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyArtifactProperty.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyArtifactProperty.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyArtifactProperty.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyArtifactProperty.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyArtifactProperty.java
Thu Aug 16 02:26:16 2007
@@ -91,7 +91,7 @@
if (overwrite) {
getProject().setProperty(name, value);
} else {
- getProject().setNewProperty(name,value);
+ getProject().setNewProperty(name, value);
}
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheTask.java Thu
Aug 16 02:26:16 2007
@@ -87,7 +87,7 @@
XmlReportParser parser = new XmlReportParser();
CacheManager cacheMgr =
getIvyInstance().getCacheManager(getCache());
String resolvedId = getResolveId();
- if (resolvedId==null) {
+ if (resolvedId == null) {
resolvedId =
ResolveOptions.getDefaultResolveId(getResolvedModuleId());
}
for (int i = 0; i < confs.length; i++) {
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractArtifact.java
Thu Aug 16 02:26:16 2007
@@ -41,6 +41,7 @@
}
public int hashCode() {
+ //CheckStyle:MagicNumber| OFF
int hash = 33;
hash = hash * 17 + getModuleRevisionId().hashCode();
if (getPublicationDate() != null) {
@@ -50,6 +51,7 @@
hash = hash * 17 + getExt().hashCode();
hash = hash * 17 + getType().hashCode();
hash = hash * 17 + getExtraAttributes().hashCode();
+ //CheckStyle:MagicNumber| ON
return hash;
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Artifact.java
Thu Aug 16 02:26:16 2007
@@ -26,8 +26,8 @@
/**
* Representation of a published 'file' in the development environment. An
artifact is generally a
- * file that is produced by a project build. This is typically a
<code>jar</code>, a <code>war</code>,
- * an <code>ear</code>, a <code>zip</code>, a <code>deb</code>, etc.
+ * file that is produced by a project build. This is typically a
<code>jar</code>,
+ * a <code>war</code>, an <code>ear</code>, a <code>zip</code>, a
<code>deb</code>, etc.
*/
public interface Artifact extends ExtendableItem {
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
Thu Aug 16 02:26:16 2007
@@ -54,7 +54,7 @@
* namespace, because they aren't transformable (the name space hasn't the
ability to convert
* regular expressions). However, method doesExclude will work with system
artifacts.</i>
*
- * @param md
+ * @param dd
* @param ns
* @return
*/
@@ -64,7 +64,7 @@
return dd;
}
DefaultDependencyDescriptor newdd = transformInstance(dd, t, false);
- newdd._namespace = ns;
+ newdd.namespace = ns;
return newdd;
}
@@ -83,105 +83,103 @@
ModuleRevisionId transformMrid =
t.transform(dd.getDependencyRevisionId());
DefaultDependencyDescriptor newdd = new
DefaultDependencyDescriptor(null, transformMrid, dd
.isForce(), dd.isChanging(), dd.isTransitive());
- newdd._parentId = transformParentId;
+ newdd.parentId = transformParentId;
String[] moduleConfs = dd.getModuleConfigurations();
if (moduleConfs.length == 1 && "*".equals(moduleConfs[0])) {
if (dd instanceof DefaultDependencyDescriptor) {
DefaultDependencyDescriptor ddd =
(DefaultDependencyDescriptor) dd;
- newdd._confs = new LinkedHashMap(ddd._confs);
- newdd._excludeRules = new LinkedHashMap(ddd._excludeRules);
- newdd._includeRules = new LinkedHashMap(ddd._includeRules);
- newdd._dependencyArtifacts = new
LinkedHashMap(ddd._dependencyArtifacts);
+ newdd.confs = new LinkedHashMap(ddd.confs);
+ newdd.excludeRules = new LinkedHashMap(ddd.excludeRules);
+ newdd.includeRules = new LinkedHashMap(ddd.includeRules);
+ newdd.dependencyArtifacts = new
LinkedHashMap(ddd.dependencyArtifacts);
} else {
throw new IllegalArgumentException(
- "dependency descriptor transformation does not support
* module confs with descriptors which aren't DefaultDependencyDescriptor");
+ "dependency descriptor transformation does not support
* module confs "
+ + "with descriptors which aren't
DefaultDependencyDescriptor");
}
} else {
for (int i = 0; i < moduleConfs.length; i++) {
- newdd._confs.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
+ newdd.confs.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
.getDependencyConfigurations(moduleConfs[i]))));
- newdd._excludeRules.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
+ newdd.excludeRules.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
.getExcludeRules(moduleConfs[i]))));
- newdd._includeRules.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
+ newdd.includeRules.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
.getIncludeRules(moduleConfs[i]))));
- newdd._dependencyArtifacts.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
+ newdd.dependencyArtifacts.put(moduleConfs[i], new
ArrayList(Arrays.asList(dd
.getDependencyArtifacts(moduleConfs[i]))));
}
}
if (fromSystem) {
- newdd._asSystem = dd;
+ newdd.asSystem = dd;
}
return newdd;
}
- private ModuleRevisionId _revId;
-
- private Map _confs = new LinkedHashMap();
-
- private Map _dependencyArtifacts = new LinkedHashMap(); // Map (String
masterConf ->
-
- // Collection(DependencyArtifactDescriptor))
+ private ModuleRevisionId revId;
- private Map _includeRules = new LinkedHashMap(); // Map (String masterConf
->
+ private Map confs = new LinkedHashMap();
- // Collection(IncludeRule))
+ // Map (String masterConf -> Collection(DependencyArtifactDescriptor))
+ private Map dependencyArtifacts = new LinkedHashMap();
- private Map _excludeRules = new LinkedHashMap(); // Map (String masterConf
->
+ // Map (String masterConf -> Collection(IncludeRule))
+ private Map includeRules = new LinkedHashMap();
- // Collection(ExcludeRule))
+ // Map (String masterConf -> Collection(ExcludeRule))
+ private Map excludeRules = new LinkedHashMap();
- private Set _extends = new LinkedHashSet();
+ private Set extendsConfs = new LinkedHashSet();
/**
* Used to indicate that this revision must be used in case of conflicts,
independently of
* conflicts manager
*/
- private boolean _force;
+ private boolean isForce;
/**
* Used to indicate that the dependency is a changing one, i.e. that ivy
should not rely on the
* version to know if it can trust artifacts in cache
*/
- private boolean _changing;
+ private boolean isChanging;
- private ModuleRevisionId _parentId;
+ private ModuleRevisionId parentId;
- private boolean _transitive = true;
+ private boolean isTransitive = true;
/**
* This namespace should be used to check
*/
- private Namespace _namespace = null;
+ private Namespace namespace = null;
- private final ModuleDescriptor _md;
+ private final ModuleDescriptor md;
- private DependencyDescriptor _asSystem = this;
+ private DependencyDescriptor asSystem = this;
public DefaultDependencyDescriptor(DependencyDescriptor dd, String
revision) {
- _md = null;
- _parentId = dd.getParentRevisionId();
- _revId = ModuleRevisionId.newInstance(dd.getDependencyRevisionId(),
revision);
- _force = dd.isForce();
- _changing = dd.isChanging();
- _transitive = dd.isTransitive();
+ md = null;
+ parentId = dd.getParentRevisionId();
+ revId = ModuleRevisionId.newInstance(dd.getDependencyRevisionId(),
revision);
+ isForce = dd.isForce();
+ isChanging = dd.isChanging();
+ isTransitive = dd.isTransitive();
String[] moduleConfs = dd.getModuleConfigurations();
for (int i = 0; i < moduleConfs.length; i++) {
- _confs.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
+ confs.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
.getDependencyConfigurations(moduleConfs[i]))));
- _excludeRules.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
+ excludeRules.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
.getExcludeRules(moduleConfs[i]))));
- _includeRules.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
+ includeRules.put(moduleConfs[i], new ArrayList(Arrays.asList(dd
.getIncludeRules(moduleConfs[i]))));
}
}
public DefaultDependencyDescriptor(ModuleDescriptor md, ModuleRevisionId
mrid, boolean force,
boolean changing, boolean transitive) {
- _md = md;
- _revId = mrid;
- _force = force;
- _changing = changing;
- _transitive = transitive;
+ this.md = md;
+ revId = mrid;
+ isForce = force;
+ isChanging = changing;
+ isTransitive = transitive;
}
public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force) {
@@ -189,10 +187,10 @@
}
public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force,
boolean changing) {
- _md = null;
- _revId = mrid;
- _force = force;
- _changing = changing;
+ md = null;
+ revId = mrid;
+ isForce = force;
+ isChanging = changing;
}
public ModuleId getDependencyId() {
@@ -200,11 +198,11 @@
}
public ModuleRevisionId getDependencyRevisionId() {
- return _revId;
+ return revId;
}
public String[] getModuleConfigurations() {
- return (String[]) _confs.keySet().toArray(new
String[_confs.keySet().size()]);
+ return (String[]) confs.keySet().toArray(new
String[confs.keySet().size()]);
}
public String[] getDependencyConfigurations(String moduleConfiguration) {
@@ -223,15 +221,15 @@
*/
public String[] getDependencyConfigurations(String moduleConfiguration,
String requestedConfiguration) {
- List confs = (List) _confs.get(moduleConfiguration);
- if (confs == null) {
+ List confsList = (List) confs.get(moduleConfiguration);
+ if (confsList == null) {
// there is no mapping defined for this configuration, add the
'other' mappings.
- confs = (List) _confs.get("%");
+ confsList = (List) confs.get("%");
}
- List defConfs = (List) _confs.get("*");
+ List defConfs = (List) confs.get("*");
Collection ret = new LinkedHashSet();
- if (confs != null) {
- ret.addAll(confs);
+ if (confsList != null) {
+ ret.addAll(confsList);
}
if (defConfs != null) {
ret.addAll(defConfs);
@@ -266,7 +264,8 @@
protected static String replaceSelfFallbackPattern(final String conf,
final String moduleConfiguration) {
- return replaceFallbackConfigurationPattern(SELF_FALLBACK_PATTERN,
conf, moduleConfiguration);
+ return replaceFallbackConfigurationPattern(
+ SELF_FALLBACK_PATTERN, conf, moduleConfiguration);
}
protected static String replaceThisFallbackPattern(final String conf,
@@ -312,18 +311,18 @@
public DependencyArtifactDescriptor[] getDependencyArtifacts(String
moduleConfiguration) {
Collection artifacts =
getCollectionForConfiguration(moduleConfiguration,
- _dependencyArtifacts);
+ dependencyArtifacts);
return (DependencyArtifactDescriptor[]) artifacts
.toArray(new DependencyArtifactDescriptor[artifacts.size()]);
}
public IncludeRule[] getIncludeRules(String moduleConfiguration) {
- Collection rules = getCollectionForConfiguration(moduleConfiguration,
_includeRules);
+ Collection rules = getCollectionForConfiguration(moduleConfiguration,
includeRules);
return (IncludeRule[]) rules.toArray(new IncludeRule[rules.size()]);
}
public ExcludeRule[] getExcludeRules(String moduleConfiguration) {
- Collection rules = getCollectionForConfiguration(moduleConfiguration,
_excludeRules);
+ Collection rules = getCollectionForConfiguration(moduleConfiguration,
excludeRules);
return (ExcludeRule[]) rules.toArray(new ExcludeRule[rules.size()]);
}
@@ -369,18 +368,18 @@
}
public DependencyArtifactDescriptor[] getAllDependencyArtifacts() {
- Set ret = mergeAll(_dependencyArtifacts);
+ Set ret = mergeAll(dependencyArtifacts);
return (DependencyArtifactDescriptor[]) ret.toArray(new
DependencyArtifactDescriptor[ret
.size()]);
}
public IncludeRule[] getAllIncludeRules() {
- Set ret = mergeAll(_includeRules);
+ Set ret = mergeAll(includeRules);
return (IncludeRule[]) ret.toArray(new IncludeRule[ret.size()]);
}
public ExcludeRule[] getAllExcludeRules() {
- Set ret = mergeAll(_excludeRules);
+ Set ret = mergeAll(excludeRules);
return (ExcludeRule[]) ret.toArray(new ExcludeRule[ret.size()]);
}
@@ -394,34 +393,34 @@
}
public void addDependencyConfiguration(String masterConf, String depConf) {
- if ((_md != null) && !"*".equals(masterConf) &&
!"%".equals(masterConf)) {
- Configuration config = _md.getConfiguration(masterConf);
+ if ((md != null) && !"*".equals(masterConf) &&
!"%".equals(masterConf)) {
+ Configuration config = md.getConfiguration(masterConf);
if (config == null) {
throw new IllegalArgumentException("Configuration '" +
masterConf
- + "' does not exist in module " + _md);
+ + "' does not exist in module " + md);
}
}
- List confs = (List) _confs.get(masterConf);
- if (confs == null) {
- confs = new ArrayList();
- _confs.put(masterConf, confs);
+ List confsList = (List) confs.get(masterConf);
+ if (confsList == null) {
+ confsList = new ArrayList();
+ confs.put(masterConf, confsList);
}
- if (!confs.contains(depConf)) {
- confs.add(depConf);
+ if (!confsList.contains(depConf)) {
+ confsList.add(depConf);
}
}
public void addDependencyArtifact(String masterConf,
DependencyArtifactDescriptor dad) {
- addObjectToConfiguration(masterConf, dad, _dependencyArtifacts);
+ addObjectToConfiguration(masterConf, dad, dependencyArtifacts);
}
public void addIncludeRule(String masterConf, IncludeRule rule) {
- addObjectToConfiguration(masterConf, rule, _includeRules);
+ addObjectToConfiguration(masterConf, rule, includeRules);
}
public void addExcludeRule(String masterConf, ExcludeRule rule) {
- addObjectToConfiguration(masterConf, rule, _excludeRules);
+ addObjectToConfiguration(masterConf, rule, excludeRules);
}
private void addObjectToConfiguration(String callerConf, Object toAdd, Map
confsMap) {
@@ -438,8 +437,8 @@
* set
*/
public boolean doesExclude(String[] moduleConfigurations, ArtifactId
artifactId) {
- if (_namespace != null) {
- artifactId = NameSpaceHelper.transform(artifactId, _namespace
+ if (namespace != null) {
+ artifactId = NameSpaceHelper.transform(artifactId, namespace
.getFromSystemTransformer());
}
ExcludeRule[] rules = getExcludeRules(moduleConfigurations);
@@ -457,63 +456,63 @@
* @return
*/
public boolean canExclude() {
- return !_excludeRules.isEmpty();
+ return !excludeRules.isEmpty();
}
public void addExtends(String conf) {
- _extends.add(conf);
+ extendsConfs.add(conf);
}
public String toString() {
- return "dependency: " + _revId + " " + _confs;
+ return "dependency: " + revId + " " + confs;
}
public boolean isForce() {
- return _force;
+ return isForce;
}
public ModuleRevisionId getParentRevisionId() {
- return _md != null ? _md.getResolvedModuleRevisionId() : _parentId;
+ return md != null ? md.getResolvedModuleRevisionId() : parentId;
}
public boolean isChanging() {
- return _changing;
+ return isChanging;
}
public boolean isTransitive() {
- return _transitive;
+ return isTransitive;
}
public Namespace getNamespace() {
- return _namespace;
+ return namespace;
}
public String getAttribute(String attName) {
- return _revId.getAttribute(attName);
+ return revId.getAttribute(attName);
}
public Map getAttributes() {
- return _revId.getAttributes();
+ return revId.getAttributes();
}
public String getExtraAttribute(String attName) {
- return _revId.getExtraAttribute(attName);
+ return revId.getExtraAttribute(attName);
}
public Map getExtraAttributes() {
- return _revId.getExtraAttributes();
+ return revId.getExtraAttributes();
}
public String getStandardAttribute(String attName) {
- return _revId.getStandardAttribute(attName);
+ return revId.getStandardAttribute(attName);
}
public Map getStandardAttributes() {
- return _revId.getStandardAttributes();
+ return revId.getStandardAttributes();
}
public DependencyDescriptor asSystem() {
- return _asSystem;
+ return asSystem;
}
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java?view=diff&rev=566598&r1=566597&r2=566598
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
Thu Aug 16 02:26:16 2007
@@ -137,18 +137,18 @@
return md;
}
DefaultModuleDescriptor nmd = new
DefaultModuleDescriptor(md.getParser(), md.getResource());
- nmd._revId = t.transform(md.getModuleRevisionId());
- nmd._resolvedRevId = t.transform(md.getResolvedModuleRevisionId());
- nmd._status = md.getStatus();
- nmd._publicationDate = md.getPublicationDate();
- nmd._resolvedPublicationDate = md.getResolvedPublicationDate();
+ nmd.revId = t.transform(md.getModuleRevisionId());
+ nmd.resolvedRevId = t.transform(md.getResolvedModuleRevisionId());
+ nmd.status = md.getStatus();
+ nmd.publicationDate = md.getPublicationDate();
+ nmd.resolvedPublicationDate = md.getResolvedPublicationDate();
DependencyDescriptor[] dd = md.getDependencies();
for (int i = 0; i < dd.length; i++) {
- nmd._dependencies.add(NameSpaceHelper.toSystem(dd[i], ns));
+ nmd.dependencies.add(NameSpaceHelper.toSystem(dd[i], ns));
}
Configuration[] confs = md.getConfigurations();
for (int i = 0; i < confs.length; i++) {
- nmd._configurations.put(confs[i].getName(), confs[i]);
+ nmd.configurations.put(confs[i].getName(), confs[i]);
Artifact[] arts = md.getArtifacts(confs[i].getName());
for (int j = 0; j < arts.length; j++) {
nmd.addArtifact(confs[i].getName(),
NameSpaceHelper.transform(arts[j], t));
@@ -157,61 +157,59 @@
nmd.setDefault(md.isDefault());
if (md instanceof DefaultModuleDescriptor) {
DefaultModuleDescriptor dmd = (DefaultModuleDescriptor) md;
- nmd._conflictManagers.putAll(dmd._conflictManagers);
+ nmd.conflictManagers.putAll(dmd.conflictManagers);
} else {
- Message
- .warn("transformed module descriptor is not a default
module descriptor: impossible to copy conflict manager configuration: "
- + md);
- }
- nmd._licenses.addAll(Arrays.asList(md.getLicenses()));
- nmd._homePage = md.getHomePage();
- nmd._lastModified = md.getLastModified();
- nmd._namespace = ns;
+ Message.warn(
+ "transformed module descriptor is not a default module
descriptor: "
+ + "impossible to copy conflict manager configuration: " + md);
+ }
+ nmd.licenses.addAll(Arrays.asList(md.getLicenses()));
+ nmd.homePage = md.getHomePage();
+ nmd.lastModified = md.getLastModified();
+ nmd.namespace = ns;
return nmd;
}
- private ModuleRevisionId _revId;
+ private ModuleRevisionId revId;
- private ModuleRevisionId _resolvedRevId;
+ private ModuleRevisionId resolvedRevId;
- private String _status = StatusManager.getCurrent().getDefaultStatus();
+ private String status = StatusManager.getCurrent().getDefaultStatus();
- private Date _publicationDate;
+ private Date publicationDate;
- private Date _resolvedPublicationDate;
+ private Date resolvedPublicationDate;
- private List _dependencies = new ArrayList(); // List
(DependencyDescriptor)
+ private List dependencies = new ArrayList(); // List (DependencyDescriptor)
- private Map _configurations = new LinkedHashMap(); // Map(String conf ->
Configuration)
+ private Map configurations = new LinkedHashMap(); // Map(String conf ->
Configuration)
- private Map _artifactsByConf = new HashMap(); // Map (String conf ->
Collection(Artifact))
+ private Map artifactsByConf = new HashMap(); // Map (String conf ->
Collection(Artifact))
- private Collection _artifacts = new LinkedHashSet(); //
Collection(Artifact) // all artifacts
-
- // could also be found in the
- // artifactsByConf map, but here we can
+ private Collection artifacts = new LinkedHashSet(); //
Collection(Artifact)
+ // all artifacts could also be found in the artifactsByConf map, but here
we can
// preserve the order
- private boolean _isDefault = false;
+ private boolean isDefault = false;
- private Map _conflictManagers = new LinkedHashMap(); // Map (ModuleId -> )
+ private Map conflictManagers = new LinkedHashMap(); // Map (ModuleId -> )
- private List _licenses = new ArrayList(); // List(License)
+ private List licenses = new ArrayList(); // List(License)
- private String _homePage;
+ private String homePage;
- private long _lastModified = 0;
+ private long lastModified = 0;
- private Namespace _namespace;
+ private Namespace namespace;
- private boolean _mappingOverride;
+ private boolean mappingOverride;
- private ModuleDescriptorParser _parser;
+ private ModuleDescriptorParser parser;
- private Resource _resource;
+ private Resource resource;
- private List _excludeRules = new ArrayList(); // List(ExcludeRule)
+ private List excludeRules = new ArrayList(); // List(ExcludeRule)
public DefaultModuleDescriptor(ModuleRevisionId id, String status, Date
pubDate) {
this(id, status, pubDate, false);
@@ -225,12 +223,12 @@
if (status == null) {
throw new NullPointerException("null status not allowed");
}
- _revId = id;
- _resolvedRevId = id;
- _status = status;
- _publicationDate = pubDate;
- _resolvedPublicationDate = _publicationDate == null ? new Date() :
_publicationDate;
- _isDefault = isDefault;
+ revId = id;
+ resolvedRevId = id;
+ this.status = status;
+ publicationDate = pubDate;
+ resolvedPublicationDate = publicationDate == null ? new Date() :
publicationDate;
+ this.isDefault = isDefault;
}
/**
@@ -238,60 +236,60 @@
* created by this constructor !
*/
public DefaultModuleDescriptor(ModuleDescriptorParser parser, Resource
res) {
- _parser = parser;
- _resource = res;
+ this.parser = parser;
+ resource = res;
}
public boolean isDefault() {
- return _isDefault;
+ return isDefault;
}
public void setPublicationDate(Date publicationDate) {
- _publicationDate = publicationDate;
- if (_resolvedPublicationDate == null) {
- _resolvedPublicationDate = _publicationDate == null ? new Date() :
_publicationDate;
+ this.publicationDate = publicationDate;
+ if (resolvedPublicationDate == null) {
+ resolvedPublicationDate = publicationDate == null ? new Date() :
publicationDate;
}
}
public Date getPublicationDate() {
- return _publicationDate;
+ return publicationDate;
}
public void setResolvedPublicationDate(Date publicationDate) {
if (publicationDate == null) {
throw new NullPointerException("null publication date not
allowed");
}
- _resolvedPublicationDate = publicationDate;
+ resolvedPublicationDate = publicationDate;
}
public Date getResolvedPublicationDate() {
- return _resolvedPublicationDate;
+ return resolvedPublicationDate;
}
public void setModuleRevisionId(ModuleRevisionId revId) {
if (revId == null) {
throw new NullPointerException("null module revision id not
allowed");
}
- _revId = revId;
- if (_resolvedRevId == null) {
- _resolvedRevId = _revId;
+ this.revId = revId;
+ if (resolvedRevId == null) {
+ resolvedRevId = revId;
}
}
public void setResolvedModuleRevisionId(ModuleRevisionId revId) {
- _resolvedRevId = revId;
+ resolvedRevId = revId;
}
public void setStatus(String status) {
- _status = status;
+ this.status = status;
}
public void addDependency(DependencyDescriptor dependency) {
- _dependencies.add(dependency);
+ dependencies.add(dependency);
}
public void addConfiguration(Configuration conf) {
- _configurations.put(conf.getName(), conf);
+ configurations.put(conf.getName(), conf);
}
/**
@@ -302,44 +300,44 @@
* @param artifact
*/
public void addArtifact(String conf, Artifact artifact) {
- if (!_configurations.containsKey(conf)) {
+ if (!configurations.containsKey(conf)) {
throw new IllegalArgumentException("Configuration '" + conf
+ "' doesn't exist in module " + this);
}
- Collection artifacts = (Collection) _artifactsByConf.get(conf);
+ Collection artifacts = (Collection) artifactsByConf.get(conf);
if (artifacts == null) {
artifacts = new ArrayList();
- _artifactsByConf.put(conf, artifacts);
+ artifactsByConf.put(conf, artifacts);
}
artifacts.add(artifact);
- _artifacts.add(artifact);
+ this.artifacts.add(artifact);
}
public ModuleRevisionId getModuleRevisionId() {
- return _revId;
+ return revId;
}
public ModuleRevisionId getResolvedModuleRevisionId() {
- return _resolvedRevId;
+ return resolvedRevId;
}
public String getStatus() {
- return _status;
+ return status;
}
public Configuration[] getConfigurations() {
- return (Configuration[]) _configurations.values().toArray(
- new Configuration[_configurations.size()]);
+ return (Configuration[]) configurations.values().toArray(
+ new Configuration[configurations.size()]);
}
public String[] getConfigurationsNames() {
- return (String[]) _configurations.keySet().toArray(new
String[_configurations.size()]);
+ return (String[]) configurations.keySet().toArray(new
String[configurations.size()]);
}
public String[] getPublicConfigurationsNames() {
List ret = new ArrayList();
- for (Iterator iter = _configurations.values().iterator();
iter.hasNext();) {
+ for (Iterator iter = configurations.values().iterator();
iter.hasNext();) {
Configuration conf = (Configuration) iter.next();
if (conf.getVisibility() == Configuration.Visibility.PUBLIC) {
ret.add(conf.getName());
@@ -353,11 +351,11 @@
* if not found.
*/
public Configuration getConfiguration(String confName) {
- return (Configuration) _configurations.get(confName);
+ return (Configuration) configurations.get(confName);
}
public Artifact[] getArtifacts(String conf) {
- Collection artifacts = (Collection) _artifactsByConf.get(conf);
+ Collection artifacts = (Collection) artifactsByConf.get(conf);
if (artifacts == null) {
return new Artifact[0];
} else {
@@ -366,16 +364,16 @@
}
public Artifact[] getAllArtifacts() {
- return (Artifact[]) _artifacts.toArray(new
Artifact[_artifacts.size()]);
+ return (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]);
}
public DependencyDescriptor[] getDependencies() {
- return (DependencyDescriptor[]) _dependencies
- .toArray(new DependencyDescriptor[_dependencies.size()]);
+ return (DependencyDescriptor[]) dependencies
+ .toArray(new DependencyDescriptor[dependencies.size()]);
}
public boolean dependsOn(VersionMatcher matcher, ModuleDescriptor md) {
- for (Iterator iter = _dependencies.iterator(); iter.hasNext();) {
+ for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
DependencyDescriptor dd = (DependencyDescriptor) iter.next();
if
(dd.getDependencyId().equals(md.getModuleRevisionId().getModuleId())) {
if (md.getResolvedModuleRevisionId().getRevision() == null) {
@@ -389,35 +387,35 @@
}
public void toIvyFile(File destFile) throws ParseException, IOException {
- if (_parser != null && _resource != null) {
- _parser.toIvyFile(_resource.openStream(), _resource, destFile,
this);
+ if (parser != null && resource != null) {
+ parser.toIvyFile(resource.openStream(), resource, destFile, this);
} else {
XmlModuleDescriptorWriter.write(this, destFile);
}
}
public String toString() {
- return "module: " + _revId + " status=" + _status + " publication=" +
_publicationDate
- + " configurations=" + _configurations + " artifacts=" +
_artifactsByConf
- + " dependencies=" + _dependencies;
+ return "module: " + revId + " status=" + status + " publication=" +
publicationDate
+ + " configurations=" + configurations + " artifacts=" +
artifactsByConf
+ + " dependencies=" + dependencies;
}
public void setDefault(boolean b) {
- _isDefault = b;
+ isDefault = b;
}
private static class ModuleIdMatcher {
- private PatternMatcher _matcher;
+ private PatternMatcher matcher;
- private ModuleId _mid;
+ private ModuleId mid;
public ModuleIdMatcher(PatternMatcher matcher, ModuleId mid) {
- _matcher = matcher;
- _mid = mid;
+ this.matcher = matcher;
+ this.mid = mid;
}
public boolean matches(ModuleId mid) {
- return MatcherHelper.matches(_matcher, _mid, mid);
+ return MatcherHelper.matches(matcher, this.mid, mid);
}
}
@@ -431,49 +429,49 @@
*/
public void addConflictManager(ModuleId moduleId, PatternMatcher matcher,
ConflictManager manager) {
- _conflictManagers.put(new ModuleIdMatcher(matcher, moduleId), manager);
+ conflictManagers.put(new ModuleIdMatcher(matcher, moduleId), manager);
}
public ConflictManager getConflictManager(ModuleId moduleId) {
- for (Iterator iter = _conflictManagers.keySet().iterator();
iter.hasNext();) {
+ for (Iterator iter = conflictManagers.keySet().iterator();
iter.hasNext();) {
ModuleIdMatcher matcher = (ModuleIdMatcher) iter.next();
if (matcher.matches(moduleId)) {
- return (ConflictManager) _conflictManagers.get(matcher);
+ return (ConflictManager) conflictManagers.get(matcher);
}
}
return null;
}
public void addLicense(License license) {
- _licenses.add(license);
+ licenses.add(license);
}
public License[] getLicenses() {
- return (License[]) _licenses.toArray(new License[_licenses.size()]);
+ return (License[]) licenses.toArray(new License[licenses.size()]);
}
public String getHomePage() {
- return _homePage;
+ return homePage;
}
public void setHomePage(String homePage) {
- _homePage = homePage;
+ this.homePage = homePage;
}
public long getLastModified() {
- return _lastModified;
+ return lastModified;
}
public void setLastModified(long lastModified) {
- _lastModified = lastModified;
+ this.lastModified = lastModified;
}
public Namespace getNamespace() {
- return _namespace;
+ return namespace;
}
public boolean isNamespaceUseful() {
- for (Iterator iter = _dependencies.iterator(); iter.hasNext();) {
+ for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
DependencyDescriptor dd = (DependencyDescriptor) iter.next();
if (dd.getAllExcludeRules().length > 0) {
return true;
@@ -483,7 +481,7 @@
}
public void setNamespace(Namespace ns) {
- _namespace = ns;
+ namespace = ns;
}
/**
@@ -491,11 +489,11 @@
* configurations existence is checked
*/
public void check() {
- for (Iterator iter = _configurations.values().iterator();
iter.hasNext();) {
+ for (Iterator iter = configurations.values().iterator();
iter.hasNext();) {
Configuration conf = (Configuration) iter.next();
String[] ext = conf.getExtends();
for (int i = 0; i < ext.length; i++) {
- if (!_configurations.containsKey(ext[i].trim())) {
+ if (!configurations.containsKey(ext[i].trim())) {
throw new IllegalStateException("unknown configuration '"
+ ext[i]
+ "'. It is extended by " + conf.getName());
}
@@ -504,51 +502,51 @@
}
public void setMappingOverride(boolean override) {
- _mappingOverride = override;
+ mappingOverride = override;
}
public boolean isMappingOverride() {
- return _mappingOverride;
+ return mappingOverride;
}
public String getAttribute(String attName) {
- return _resolvedRevId.getAttribute(attName);
+ return resolvedRevId.getAttribute(attName);
}
public Map getAttributes() {
- return _resolvedRevId.getAttributes();
+ return resolvedRevId.getAttributes();
}
public String getExtraAttribute(String attName) {
- return _resolvedRevId.getExtraAttribute(attName);
+ return resolvedRevId.getExtraAttribute(attName);
}
public Map getExtraAttributes() {
- return _resolvedRevId.getExtraAttributes();
+ return resolvedRevId.getExtraAttributes();
}
public String getStandardAttribute(String attName) {
- return _resolvedRevId.getStandardAttribute(attName);
+ return resolvedRevId.getStandardAttribute(attName);
}
public Map getStandardAttributes() {
- return _resolvedRevId.getStandardAttributes();
+ return resolvedRevId.getStandardAttributes();
}
public ModuleDescriptorParser getParser() {
- return _parser;
+ return parser;
}
public Resource getResource() {
- return _resource;
+ return resource;
}
public void addExcludeRule(ExcludeRule rule) {
- _excludeRules.add(rule);
+ excludeRules.add(rule);
}
public boolean canExclude() {
- return !_excludeRules.isEmpty();
+ return !excludeRules.isEmpty();
}
/**
@@ -556,8 +554,8 @@
* set
*/
public boolean doesExclude(String[] moduleConfigurations, ArtifactId
artifactId) {
- if (_namespace != null) {
- artifactId = NameSpaceHelper.transform(artifactId, _namespace
+ if (namespace != null) {
+ artifactId = NameSpaceHelper.transform(artifactId, namespace
.getFromSystemTransformer());
}
ExcludeRule[] rules = getExcludeRules(moduleConfigurations);
@@ -570,12 +568,12 @@
}
public ExcludeRule[] getAllExcludeRules() {
- return (ExcludeRule[]) _excludeRules.toArray(new
ExcludeRule[_excludeRules.size()]);
+ return (ExcludeRule[]) excludeRules.toArray(new
ExcludeRule[excludeRules.size()]);
}
public ExcludeRule[] getExcludeRules(String[] moduleConfigurations) {
Set rules = new LinkedHashSet();
- for (Iterator iter = _excludeRules.iterator(); iter.hasNext();) {
+ for (Iterator iter = excludeRules.iterator(); iter.hasNext();) {
ExcludeRule rule = (ExcludeRule) iter.next();
String[] ruleConfs = rule.getConfigurations();
if (containsAny(ruleConfs, moduleConfigurations)) {
