You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by gs...@apache.org on 2007/06/23 22:19:16 UTC
svn commit: r550125 - in
/incubator/ivy/core/trunk/src/java/org/apache/ivy/core: module/id/ publish/
report/ resolve/
Author: gscokart
Date: Sat Jun 23 15:19:15 2007
New Revision: 550125
URL: http://svn.apache.org/viewvc?view=rev&rev=550125
Log:
clean code
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactId.java Sat Jun 23 15:19:15 2007
@@ -51,10 +51,12 @@
}
public int hashCode() {
+ //CheckStyle:MagicNumber| OFF
int hash = 17;
hash += getModuleId().hashCode() * 37;
hash += getName().hashCode() * 37;
hash += getType().hashCode() * 37;
+ //CheckStyle:MagicNumber| OFF
return hash;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ArtifactRevisionId.java Sat Jun 23 15:19:15 2007
@@ -45,18 +45,18 @@
extraAttributes);
}
- private ArtifactId _artifactId;
+ private ArtifactId artifactId;
- private ModuleRevisionId _mrid;
+ private ModuleRevisionId mrid;
public ArtifactRevisionId(ArtifactId artifactId, ModuleRevisionId mrid) {
this(artifactId, mrid, null);
}
- public ArtifactRevisionId(ArtifactId artifactId, ModuleRevisionId mrid, Map extraAttributes) {
+ public ArtifactRevisionId(ArtifactId artfId, ModuleRevisionId mdlRevId, Map extraAttributes) {
super(null, extraAttributes);
- _artifactId = artifactId;
- _mrid = mrid;
+ artifactId = artfId;
+ mrid = mdlRevId;
setStandardAttribute(IvyPatternHelper.ORGANISATION_KEY, getModuleRevisionId()
.getOrganisation());
@@ -79,10 +79,13 @@
public int hashCode() {
// WARN: uniqueness needs to be relatively strong here
+ //CheckStyle:MagicNumber| OFF
int hash = 17;
hash += getArtifactId().hashCode() * 37;
hash += getModuleRevisionId().hashCode() * 37;
hash += getExtraAttributes().hashCode() * 37;
+ //CheckStyle:MagicNumber| ON
+
return hash;
}
@@ -96,30 +99,30 @@
* @return Returns the artifactId.
*/
public ArtifactId getArtifactId() {
- return _artifactId;
+ return artifactId;
}
public ModuleRevisionId getModuleRevisionId() {
- return _mrid;
+ return mrid;
}
public String getName() {
- return _artifactId.getName();
+ return artifactId.getName();
}
public String getType() {
- return _artifactId.getType();
+ return artifactId.getType();
}
public String getExt() {
- return _artifactId.getExt();
+ return artifactId.getExt();
}
/**
* @return Returns the revision.
*/
public String getRevision() {
- return _mrid.getRevision();
+ return mrid.getRevision();
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java Sat Jun 23 15:19:15 2007
@@ -126,7 +126,8 @@
throw new IllegalStateException("bad ivy file for " + mrid + ": " + ivyFile
+ ": " + e);
}
- } else if (!options.getPubrevision().equals(md.getModuleRevisionId().getRevision())) {
+ } else if (!options.getPubrevision().equals(
+ md.getModuleRevisionId().getRevision())) {
throw new IllegalArgumentException("cannot publish " + ivyFile + " as "
+ options.getPubrevision()
+ ": bad revision found in ivy file (Revision: "
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java Sat Jun 23 15:19:15 2007
@@ -20,7 +20,7 @@
/**
*
*/
-public class DownloadStatus {
+public final class DownloadStatus {
private String name;
private DownloadStatus(String name) {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNode.java Sat Jun 23 15:19:15 2007
@@ -92,9 +92,11 @@
}
public int hashCode() {
+ //CheckStyle:MagicNumber| OFF
int hash = 33;
hash += getNode().hashCode() * 17;
hash += getConf().hashCode() * 17;
+ //CheckStyle:MagicNumber| OFF
return hash;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java Sat Jun 23 15:19:15 2007
@@ -81,9 +81,11 @@
}
public int hashCode() {
+ //CheckStyle:MagicNumber| OFF
int hash = 31;
hash = hash * 13 + confs.hashCode();
hash = hash * 13 + mrid.hashCode();
+ //CheckStyle:MagicNumber| ON
return hash;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/IvyNodeEviction.java Sat Jun 23 15:19:15 2007
@@ -114,9 +114,11 @@
}
public int hashCode() {
+ //CheckStyle:MagicNumber| OFF
int hash = 33;
hash += getModuleId().hashCode() * 17;
hash += getConf().hashCode() * 17;
+ //CheckStyle:MagicNumber| ON
return hash;
}
}
@@ -348,7 +350,8 @@
return ret;
}
- public void setPendingConflicts(ModuleId moduleId, String rootModuleConf, Collection conflicts) {
+ public void setPendingConflicts(ModuleId moduleId, String rootModuleConf,
+ Collection conflicts) {
ModuleIdConf moduleIdConf = new ModuleIdConf(moduleId, rootModuleConf);
pendingConflicts.put(moduleIdConf, new HashSet(conflicts));
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java?view=diff&rev=550125&r1=550124&r2=550125
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java Sat Jun 23 15:19:15 2007
@@ -18,7 +18,6 @@
package org.apache.ivy.core.resolve;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URL;
@@ -200,7 +199,7 @@
* is way too long, we should use a class to store the settings of the resolve.
*/
public ResolveReport resolve(ModuleDescriptor md, ResolveOptions options)
- throws ParseException, IOException, FileNotFoundException {
+ throws ParseException, IOException {
DependencyResolver oldDictator = getDictatorResolver();
if (options.isUseCacheOnly()) {
setDictatorResolver(new CacheResolver(settings));
@@ -524,9 +523,9 @@
node.markEvicted(confs[i], null, null, null);
} else {
if (settings.debugConflictResolution()) {
- Message
- .debug(node.getId()
- + " isn't transitively evicted, at least one caller was not evicted");
+ Message.debug(node.getId()
+ + " isn't transitively evicted, at least one caller was"
+ + " not evicted");
}
}
}
@@ -741,9 +740,8 @@
if (settings.debugConflictResolution()) {
Message.debug("impossible to resolve conflicts for " + node + " in " + ancestor
+ " yet");
- Message
- .debug("setting all nodes as pending conflicts for later conflict resolution: "
- + conflicts);
+ Message.debug("setting all nodes as pending conflicts for later conflict"
+ + " resolution: " + conflicts);
}
ancestor.getNode().setPendingConflicts(node.getModuleId(), node.getRootModuleConf(),
conflicts);
@@ -824,7 +822,8 @@
for (Iterator iter = resolved.iterator(); iter.hasNext();) {
IvyNode sel = (IvyNode) iter.next();
if (!prevResolved.contains(sel)) {
- solved &= resolveConflict(node.gotoNode(sel), ancestor.getParent(), toevict);
+ solved &= resolveConflict(node.gotoNode(sel), ancestor.getParent(),
+ toevict);
}
}
}