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 ma...@apache.org on 2007/06/27 21:05:28 UTC
svn commit: r551326 - in
/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict:
AbstractConflictManager.java FixedConflictManager.java
LatestConflictManager.java
Author: maartenc
Date: Wed Jun 27 14:05:26 2007
New Revision: 551326
URL: http://svn.apache.org/viewvc?view=rev&rev=551326
Log:
updated code style
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java?view=diff&rev=551326&r1=551325&r2=551326
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java Wed Jun 27 14:05:26 2007
@@ -21,27 +21,27 @@
import org.apache.ivy.plugins.IvySettingsAware;
public abstract class AbstractConflictManager implements ConflictManager, IvySettingsAware {
- private String _name;
+ private String name;
- private IvySettings _settings;
+ private IvySettings settings;
public IvySettings getSettings() {
- return _settings;
+ return settings;
}
- public void setSettings(IvySettings ivy) {
- _settings = ivy;
+ public void setSettings(IvySettings settings) {
+ this.settings = settings;
}
public String getName() {
- return _name;
+ return name;
}
public void setName(String name) {
- _name = name;
+ this.name = name;
}
public String toString() {
- return _name;
+ return name;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java?view=diff&rev=551326&r1=551325&r2=551326
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java Wed Jun 27 14:05:26 2007
@@ -25,11 +25,11 @@
import org.apache.ivy.core.resolve.IvyNode;
public class FixedConflictManager extends AbstractConflictManager {
- private Collection _revs;
+ private Collection revisions;
public FixedConflictManager(String[] revs) {
- _revs = Arrays.asList(revs);
- setName("fixed" + _revs);
+ revisions = Arrays.asList(revs);
+ setName("fixed" + revisions);
}
public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
@@ -37,7 +37,7 @@
for (Iterator iter = conflicts.iterator(); iter.hasNext();) {
IvyNode node = (IvyNode) iter.next();
String revision = node.getResolvedId().getRevision();
- if (_revs.contains(revision)) {
+ if (revisions.contains(revision)) {
resolved.add(node);
}
}
@@ -45,7 +45,7 @@
}
public Collection getRevs() {
- return _revs;
+ return revisions;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java?view=diff&rev=551326&r1=551325&r2=551326
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java Wed Jun 27 14:05:26 2007
@@ -33,15 +33,15 @@
public static class NoConflictResolvedYetException extends RuntimeException {
}
- private static class IvyNodeArtifactInfo implements ArtifactInfo {
- private final IvyNode _node;
+ private static final class IvyNodeArtifactInfo implements ArtifactInfo {
+ private final IvyNode node;
private IvyNodeArtifactInfo(IvyNode dep) {
- _node = dep;
+ node = dep;
}
public long getLastModified() {
- long lastModified = _node.getLastModified();
+ long lastModified = node.getLastModified();
if (lastModified == 0) {
// if the last modified timestamp is unknown, we can't resolve
// the conflicts now, and trigger an exception which will be catched
@@ -53,28 +53,28 @@
}
public String getRevision() {
- return _node.getResolvedId().getRevision();
+ return node.getResolvedId().getRevision();
}
public IvyNode getNode() {
- return _node;
+ return node;
}
}
- private LatestStrategy _strategy;
+ private LatestStrategy strategy;
- private String _strategyName;
+ private String strategyName;
public LatestConflictManager() {
}
public LatestConflictManager(LatestStrategy strategy) {
- _strategy = strategy;
+ this.strategy = strategy;
}
public LatestConflictManager(String name, LatestStrategy strategy) {
setName(name);
- _strategy = strategy;
+ this.strategy = strategy;
}
public Collection resolveConflicts(IvyNode parent, Collection conflicts) {
@@ -113,18 +113,18 @@
}
public LatestStrategy getStrategy() {
- if (_strategy == null) {
- if (_strategyName != null) {
- _strategy = getSettings().getLatestStrategy(_strategyName);
- if (_strategy == null) {
- Message.error("unknown latest strategy: " + _strategyName);
- _strategy = getSettings().getDefaultLatestStrategy();
+ if (strategy == null) {
+ if (strategyName != null) {
+ strategy = getSettings().getLatestStrategy(strategyName);
+ if (strategy == null) {
+ Message.error("unknown latest strategy: " + strategyName);
+ strategy = getSettings().getDefaultLatestStrategy();
}
} else {
- _strategy = getSettings().getDefaultLatestStrategy();
+ strategy = getSettings().getDefaultLatestStrategy();
}
}
- return _strategy;
+ return strategy;
}
/**
@@ -133,14 +133,14 @@
* @param latestStrategy
*/
public void setLatest(String strategyName) {
- _strategyName = strategyName;
+ this.strategyName = strategyName;
}
public void setStrategy(LatestStrategy strategy) {
- _strategy = strategy;
+ this.strategy = strategy;
}
public String toString() {
- return _strategy != null ? String.valueOf(_strategy) : _strategyName;
+ return strategy != null ? String.valueOf(strategy) : strategyName;
}
}