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 xa...@apache.org on 2007/06/05 11:12:17 UTC
svn commit: r544446 [3/4] - in
/incubator/ivy/core/trunk/src/java/org/apache/ivy/core: ./ cache/ check/
deliver/ event/ event/download/ event/resolve/ install/ module/descriptor/
module/id/ module/status/ publish/ report/ resolve/ retrieve/ search/ set...
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=544446&r1=544445&r2=544446
==============================================================================
--- 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 Tue Jun 5 04:12:14 2007
@@ -34,78 +34,78 @@
public class IvyNodeCallers {
public static class Caller {
- private ModuleDescriptor _md;
- private ModuleRevisionId _mrid;
- private Map _confs = new HashMap(); // Map (String callerConf -> String[] dependencyConfs)
- private DependencyDescriptor _dd;
- private boolean _callerCanExclude;
+ private ModuleDescriptor md;
+ private ModuleRevisionId mrid;
+ private Map confs = new HashMap(); // Map (String callerConf -> String[] dependencyConfs)
+ private DependencyDescriptor dd;
+ private boolean callerCanExclude;
public Caller(ModuleDescriptor md, ModuleRevisionId mrid, DependencyDescriptor dd, boolean callerCanExclude) {
- _md = md;
- _mrid = mrid;
- _dd = dd;
- _callerCanExclude = callerCanExclude;
+ this.md = md;
+ this.mrid = mrid;
+ this.dd = dd;
+ this.callerCanExclude = callerCanExclude;
}
public void addConfiguration(String callerConf, String[] dependencyConfs) {
- String[] prevDepConfs = (String[])_confs.get(callerConf);
+ String[] prevDepConfs = (String[]) confs.get(callerConf);
if (prevDepConfs != null) {
Set newDepConfs = new HashSet(Arrays.asList(prevDepConfs));
newDepConfs.addAll(Arrays.asList(dependencyConfs));
- _confs.put(callerConf, (String[])newDepConfs.toArray(new String[newDepConfs.size()]));
+ confs.put(callerConf, (String[])newDepConfs.toArray(new String[newDepConfs.size()]));
} else {
- _confs.put(callerConf, dependencyConfs);
+ confs.put(callerConf, dependencyConfs);
}
}
public String[] getCallerConfigurations() {
- return (String[])_confs.keySet().toArray(new String[_confs.keySet().size()]);
+ return (String[]) confs.keySet().toArray(new String[confs.keySet().size()]);
}
public ModuleRevisionId getModuleRevisionId() {
- return _mrid;
+ return mrid;
}
public boolean equals(Object obj) {
if (! (obj instanceof Caller)) {
return false;
}
Caller other = (Caller)obj;
- return other._confs.equals(_confs)
- && _mrid.equals(other._mrid);
+ return other.confs.equals(confs)
+ && mrid.equals(other.mrid);
}
public int hashCode() {
int hash = 31;
- hash = hash * 13 + _confs.hashCode();
- hash = hash * 13 + _mrid.hashCode();
+ hash = hash * 13 + confs.hashCode();
+ hash = hash * 13 + mrid.hashCode();
return hash;
}
public String toString() {
- return _mrid.toString();
+ return mrid.toString();
}
public ModuleRevisionId getAskedDependencyId() {
- return _dd.getDependencyRevisionId();
+ return dd.getDependencyRevisionId();
}
public ModuleDescriptor getModuleDescriptor() {
- return _md;
+ return md;
}
public boolean canExclude() {
- return _callerCanExclude || _md.canExclude() || _dd.canExclude();
+ return callerCanExclude || md.canExclude() || dd.canExclude();
}
public DependencyDescriptor getDependencyDescriptor() {
- return _dd;
+ return dd;
}
}
// Map (String rootModuleConf -> Map (ModuleRevisionId -> Caller)): key in second map is used to easily get a caller by its mrid
- private Map _callersByRootConf = new HashMap();
+ private Map callersByRootConf = new HashMap();
// this map contains all the module ids calling this one (including transitively) as keys
// the mapped nodes (values) correspond to a direct caller from which the transitive caller comes
- private Map _allCallers = new HashMap(); // Map (ModuleId -> IvyNode)
+ private Map allCallers = new HashMap(); // Map (ModuleId -> IvyNode)
- private IvyNode _node;
+ private IvyNode node;
public IvyNodeCallers(IvyNode node) {
- _node = node;
+ this.node = node;
}
/**
@@ -119,13 +119,13 @@
public void addCaller(String rootModuleConf, IvyNode callerNode, String callerConf, String[] dependencyConfs, DependencyDescriptor dd) {
ModuleDescriptor md = callerNode.getDescriptor();
ModuleRevisionId mrid = callerNode.getId();
- if (mrid.getModuleId().equals(_node.getId().getModuleId())) {
- throw new IllegalArgumentException("a module is not authorized to depend on itself: "+_node.getId());
+ if (mrid.getModuleId().equals(node.getId().getModuleId())) {
+ throw new IllegalArgumentException("a module is not authorized to depend on itself: "+ node.getId());
}
- Map callers = (Map)_callersByRootConf.get(rootModuleConf);
+ Map callers = (Map) callersByRootConf.get(rootModuleConf);
if (callers == null) {
callers = new HashMap();
- _callersByRootConf.put(rootModuleConf, callers);
+ callersByRootConf.put(rootModuleConf, callers);
}
Caller caller = (Caller)callers.get(mrid);
if (caller == null) {
@@ -137,13 +137,13 @@
IvyNode parent = callerNode.getRealNode();
for (Iterator iter = parent.getAllCallersModuleIds().iterator(); iter.hasNext();) {
ModuleId mid = (ModuleId) iter.next();
- _allCallers.put(mid, parent);
+ allCallers.put(mid, parent);
}
- _allCallers.put(mrid.getModuleId(), callerNode);
+ allCallers.put(mrid.getModuleId(), callerNode);
}
public Caller[] getCallers(String rootModuleConf) {
- Map callers = (Map)_callersByRootConf.get(rootModuleConf);
+ Map callers = (Map) callersByRootConf.get(rootModuleConf);
if (callers == null) {
return new Caller[0];
}
@@ -152,7 +152,7 @@
public Caller[] getAllCallers() {
Set all = new HashSet();
- for (Iterator iter = _callersByRootConf.values().iterator(); iter.hasNext();) {
+ for (Iterator iter = callersByRootConf.values().iterator(); iter.hasNext();) {
Map callers = (Map)iter.next();
all.addAll(callers.values());
}
@@ -160,16 +160,16 @@
}
public Collection getAllCallersModuleIds() {
- return _allCallers.keySet();
+ return allCallers.keySet();
}
public void updateFrom(IvyNodeCallers callers, String rootModuleConf) {
- Map nodecallers = (Map)callers._callersByRootConf.get(rootModuleConf);
+ Map nodecallers = (Map)callers.callersByRootConf.get(rootModuleConf);
if (nodecallers != null) {
- Map thiscallers = (Map)_callersByRootConf.get(rootModuleConf);
+ Map thiscallers = (Map) callersByRootConf.get(rootModuleConf);
if (thiscallers == null) {
thiscallers = new HashMap();
- _callersByRootConf.put(rootModuleConf, thiscallers);
+ callersByRootConf.put(rootModuleConf, thiscallers);
}
for (Iterator iter = nodecallers.values().iterator(); iter.hasNext();) {
Caller caller = (Caller)iter.next();
@@ -181,7 +181,7 @@
}
public IvyNode getDirectCallerFor(ModuleId from) {
- return (IvyNode) _allCallers.get(from);
+ return (IvyNode) allCallers.get(from);
}
/**
@@ -194,10 +194,10 @@
return doesCallersExclude(rootModuleConf, artifact, new Stack());
}
boolean doesCallersExclude(String rootModuleConf, Artifact artifact, Stack callersStack) {
- if (callersStack.contains(_node.getId())) {
+ if (callersStack.contains(node.getId())) {
return false;
}
- callersStack.push(_node.getId());
+ callersStack.push(node.getId());
try {
Caller[] callers = getCallers(rootModuleConf);
if (callers.length == 0) {
@@ -230,7 +230,7 @@
return true;
}
// ... or if it is excluded by all its callers
- IvyNode c = _node.getData().getNode(md.getModuleRevisionId());
+ IvyNode c = node.getData().getNode(md.getModuleRevisionId());
if (c != null) {
return c.doesCallersExclude(rootModuleConf, artifact, callersStack);
} else {
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=544446&r1=544445&r2=544446
==============================================================================
--- 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 Tue Jun 5 04:12:14 2007
@@ -29,16 +29,16 @@
public class IvyNodeEviction {
public static class EvictionData {
- private IvyNode _parent; // can be null in case of transitive eviction
- private ConflictManager _conflictManager; // can be null in case of transitive eviction
- private Collection _selected; // Collection(IvyNode); can be null in case of transitive eviction
- private String _rootModuleConf;
+ private IvyNode parent; // can be null in case of transitive eviction
+ private ConflictManager conflictManager; // can be null in case of transitive eviction
+ private Collection selected; // Collection(IvyNode); can be null in case of transitive eviction
+ private String rootModuleConf;
public EvictionData(String rootModuleConf, IvyNode parent, ConflictManager conflictManager, Collection selected) {
- _rootModuleConf = rootModuleConf;
- _parent = parent;
- _conflictManager = conflictManager;
- _selected = selected;
+ this.rootModuleConf = rootModuleConf;
+ this.parent = parent;
+ this.conflictManager = conflictManager;
+ this.selected = selected;
for (Iterator iter = selected.iterator(); iter.hasNext();) {
Object o = (Object) iter.next();
if (! (o instanceof IvyNode)) {
@@ -48,35 +48,35 @@
}
public String toString() {
- if (_selected != null) {
- return _selected + " in "+ _parent+" ("+_conflictManager+") ["+_rootModuleConf+"]";
+ if (selected != null) {
+ return selected + " in "+ parent +" ("+ conflictManager +") ["+ rootModuleConf +"]";
} else {
- return "transitively ["+_rootModuleConf+"]";
+ return "transitively ["+ rootModuleConf +"]";
}
}
public ConflictManager getConflictManager() {
- return _conflictManager;
+ return conflictManager;
}
public IvyNode getParent() {
- return _parent;
+ return parent;
}
public Collection getSelected() {
- return _selected;
+ return selected;
}
public String getRootModuleConf() {
- return _rootModuleConf;
+ return rootModuleConf;
}
}
private static final class ModuleIdConf {
- private ModuleId _moduleId;
- private String _conf;
+ private ModuleId moduleId;
+ private String conf;
public ModuleIdConf(ModuleId mid, String conf) {
if (mid == null) {
@@ -85,16 +85,16 @@
if (conf == null) {
throw new NullPointerException("conf cannot be null");
}
- _moduleId = mid;
- _conf = conf;
+ moduleId = mid;
+ this.conf = conf;
}
public final String getConf() {
- return _conf;
+ return conf;
}
public final ModuleId getModuleId() {
- return _moduleId;
+ return moduleId;
}
public boolean equals(Object obj) {
if (!(obj instanceof ModuleIdConf)) {
@@ -111,25 +111,25 @@
}
}
- private IvyNode _node;
+ private IvyNode node;
- private Map _selectedDeps = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which node has been selected
- private Map _pendingConflicts = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which nodes are in pending conflict (conflict detected but not yet resolved)
+ private Map selectedDeps = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which node has been selected
+ private Map pendingConflicts = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which nodes are in pending conflict (conflict detected but not yet resolved)
- private Map _evictedDeps = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which node has been evicted
- private Map _evictedRevs = new HashMap(); // Map (ModuleIdConf -> Set(ModuleRevisionId)) // map indicating for each dependency which revision has been evicted
+ private Map evictedDeps = new HashMap(); // Map (ModuleIdConf -> Set(Node)) // map indicating for each dependency which node has been evicted
+ private Map evictedRevs = new HashMap(); // Map (ModuleIdConf -> Set(ModuleRevisionId)) // map indicating for each dependency which revision has been evicted
- private Map _evicted = new HashMap(); // Map (root module conf -> EvictionData) // indicates if the node is evicted in each root module conf
+ private Map evicted = new HashMap(); // Map (root module conf -> EvictionData) // indicates if the node is evicted in each root module conf
public IvyNodeEviction(IvyNode node) {
if (node == null) {
throw new NullPointerException("node must not be null");
}
- _node = node;
+ this.node = node;
}
public Collection getResolvedNodes(ModuleId mid, String rootModuleConf) {
- Collection resolved = (Collection)_selectedDeps.get(new ModuleIdConf(mid, rootModuleConf));
+ Collection resolved = (Collection) selectedDeps.get(new ModuleIdConf(mid, rootModuleConf));
Set ret = new HashSet();
if (resolved != null) {
for (Iterator iter = resolved.iterator(); iter.hasNext();) {
@@ -140,7 +140,7 @@
return ret;
}
public Collection getResolvedRevisions(ModuleId mid, String rootModuleConf) {
- Collection resolved = (Collection)_selectedDeps.get(new ModuleIdConf(mid, rootModuleConf));
+ Collection resolved = (Collection) selectedDeps.get(new ModuleIdConf(mid, rootModuleConf));
if (resolved == null) {
return new HashSet();
} else {
@@ -156,11 +156,11 @@
public void setResolvedNodes(ModuleId moduleId, String rootModuleConf, Collection resolved) {
ModuleIdConf moduleIdConf = new ModuleIdConf(moduleId, rootModuleConf);
- _selectedDeps.put(moduleIdConf, new HashSet(resolved));
+ selectedDeps.put(moduleIdConf, new HashSet(resolved));
}
public Collection getEvictedNodes(ModuleId mid, String rootModuleConf) {
- Collection resolved = (Collection)_evictedDeps.get(new ModuleIdConf(mid, rootModuleConf));
+ Collection resolved = (Collection) evictedDeps.get(new ModuleIdConf(mid, rootModuleConf));
Set ret = new HashSet();
if (resolved != null) {
for (Iterator iter = resolved.iterator(); iter.hasNext();) {
@@ -171,7 +171,7 @@
return ret;
}
public Collection getEvictedRevisions(ModuleId mid, String rootModuleConf) {
- Collection evicted = (Collection)_evictedRevs.get(new ModuleIdConf(mid, rootModuleConf));
+ Collection evicted = (Collection) evictedRevs.get(new ModuleIdConf(mid, rootModuleConf));
if (evicted == null) {
return new HashSet();
} else {
@@ -181,34 +181,34 @@
public void setEvictedNodes(ModuleId moduleId, String rootModuleConf, Collection evicted) {
ModuleIdConf moduleIdConf = new ModuleIdConf(moduleId, rootModuleConf);
- _evictedDeps.put(moduleIdConf, new HashSet(evicted));
+ evictedDeps.put(moduleIdConf, new HashSet(evicted));
Collection evictedRevs = new HashSet();
for (Iterator iter = evicted.iterator(); iter.hasNext();) {
IvyNode node = (IvyNode)iter.next();
evictedRevs.add(node.getId());
evictedRevs.add(node.getResolvedId());
}
- _evictedRevs.put(moduleIdConf, evictedRevs);
+ this.evictedRevs.put(moduleIdConf, evictedRevs);
}
public boolean isEvicted(String rootModuleConf) {
cleanEvicted();
- IvyNode root = _node.getRoot();
- return root != _node
- && !root.getResolvedRevisions(
- _node.getId().getModuleId(),
+ IvyNode root = node.getRoot();
+ return root != node
+ && !root.getResolvedRevisions(
+ node.getId().getModuleId(),
rootModuleConf)
- .contains(_node.getResolvedId())
+ .contains(node.getResolvedId())
&& getEvictedData(rootModuleConf) != null;
}
public boolean isCompletelyEvicted() {
cleanEvicted();
- if (_node.isRoot()) {
+ if (node.isRoot()) {
return false;
}
- String[] rootModuleConfigurations = _node.getRootModuleConfigurations();
+ String[] rootModuleConfigurations = node.getRootModuleConfigurations();
for (int i = 0; i < rootModuleConfigurations.length; i++) {
if (!isEvicted(rootModuleConfigurations[i])) {
return false;
@@ -219,9 +219,9 @@
private void cleanEvicted() {
// check if it was evicted by a node that we are now the real node for
- for (Iterator iter = _evicted.keySet().iterator(); iter.hasNext();) {
+ for (Iterator iter = evicted.keySet().iterator(); iter.hasNext();) {
String rootModuleConf = (String)iter.next();
- EvictionData ed = (EvictionData)_evicted.get(rootModuleConf);
+ EvictionData ed = (EvictionData) evicted.get(rootModuleConf);
Collection sel = ed.getSelected();
if (sel != null) {
for (Iterator iterator = sel.iterator(); iterator.hasNext();) {
@@ -242,16 +242,16 @@
}
public void markEvicted(EvictionData evictionData) {
- _evicted.put(evictionData.getRootModuleConf(), evictionData);
+ evicted.put(evictionData.getRootModuleConf(), evictionData);
}
public EvictionData getEvictedData(String rootModuleConf) {
cleanEvicted();
- return (EvictionData)_evicted.get(rootModuleConf);
+ return (EvictionData) evicted.get(rootModuleConf);
}
public String[] getEvictedConfs() {
cleanEvicted();
- return (String[])_evicted.keySet().toArray(new String[_evicted.keySet().size()]);
+ return (String[]) evicted.keySet().toArray(new String[evicted.keySet().size()]);
}
/**
@@ -261,7 +261,7 @@
*/
public Collection getAllEvictingNodes() {
Collection allEvictingNodes = null;
- for (Iterator iter = _evicted.values().iterator(); iter.hasNext();) {
+ for (Iterator iter = evicted.values().iterator(); iter.hasNext();) {
EvictionData ed = (EvictionData)iter.next();
Collection selected = ed.getSelected();
if (selected != null) {
@@ -276,7 +276,7 @@
public Collection getAllEvictingConflictManagers() {
Collection ret = new HashSet();
- for (Iterator iter = _evicted.values().iterator(); iter.hasNext();) {
+ for (Iterator iter = evicted.values().iterator(); iter.hasNext();) {
EvictionData ed = (EvictionData)iter.next();
ret.add(ed.getConflictManager());
}
@@ -295,20 +295,20 @@
* @return
*/
public EvictionData getEvictionDataInRoot(String rootModuleConf, IvyNode ancestor) {
- Collection selectedNodes = _node.getRoot().getResolvedNodes(_node.getModuleId(), rootModuleConf);
+ Collection selectedNodes = node.getRoot().getResolvedNodes(node.getModuleId(), rootModuleConf);
for (Iterator iter = selectedNodes.iterator(); iter.hasNext();) {
IvyNode node = (IvyNode)iter.next();
- if (node.getResolvedId().equals(_node.getResolvedId())) {
+ if (node.getResolvedId().equals(this.node.getResolvedId())) {
// the node is part of the selected ones for the root: no eviction data to return
return null;
}
}
// we didn't find this mrid in the selected ones for the root: it has been previously evicted
- return new EvictionData(rootModuleConf, ancestor, _node.getRoot().getConflictManager(_node.getModuleId()), selectedNodes);
+ return new EvictionData(rootModuleConf, ancestor, node.getRoot().getConflictManager(node.getModuleId()), selectedNodes);
}
public Collection getPendingConflicts(String rootModuleConf, ModuleId mid) {
- Collection resolved = (Collection)_pendingConflicts.get(new ModuleIdConf(mid, rootModuleConf));
+ Collection resolved = (Collection) pendingConflicts.get(new ModuleIdConf(mid, rootModuleConf));
Set ret = new HashSet();
if (resolved != null) {
for (Iterator iter = resolved.iterator(); iter.hasNext();) {
@@ -321,7 +321,7 @@
public void setPendingConflicts(ModuleId moduleId, String rootModuleConf, Collection conflicts) {
ModuleIdConf moduleIdConf = new ModuleIdConf(moduleId, rootModuleConf);
- _pendingConflicts.put(moduleIdConf, new HashSet(conflicts));
+ pendingConflicts.put(moduleIdConf, new HashSet(conflicts));
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveData.java Tue Jun 5 04:12:14 2007
@@ -32,14 +32,14 @@
public class ResolveData {
- private ResolveEngine _engine;
- private Map _visitData; // shared map of all visit data: Map (ModuleRevisionId -> VisitData)
- private ConfigurationResolveReport _report;
+ private ResolveEngine engine;
+ private Map visitData; // shared map of all visit data: Map (ModuleRevisionId -> VisitData)
+ private ConfigurationResolveReport report;
- private ResolveOptions _options;
+ private ResolveOptions options;
public ResolveData(ResolveData data, boolean validate) {
- this(data._engine, new ResolveOptions(data._options).setValidate(validate), data._report, data._visitData);
+ this(data.engine, new ResolveOptions(data.options).setValidate(validate), data.report, data.visitData);
}
public ResolveData(ResolveEngine engine, ResolveOptions options) {
@@ -51,10 +51,10 @@
}
public ResolveData(ResolveEngine engine, ResolveOptions options, ConfigurationResolveReport report, Map visitData) {
- _engine = engine;
- _report = report;
- _visitData = visitData;
- _options = options;
+ this.engine = engine;
+ this.report = report;
+ this.visitData = visitData;
+ this.options = options;
}
@@ -64,12 +64,12 @@
* @return
*/
public Map getVisitDataMap() {
- return _visitData;
+ return visitData;
}
public ConfigurationResolveReport getReport() {
- return _report;
+ return report;
}
@@ -81,7 +81,7 @@
public Collection getNodes() {
Collection nodes = new ArrayList();
- for (Iterator iter = _visitData.values().iterator(); iter.hasNext();) {
+ for (Iterator iter = visitData.values().iterator(); iter.hasNext();) {
VisitData vdata = (VisitData) iter.next();
nodes.add(vdata.getNode());
}
@@ -89,11 +89,11 @@
}
public Collection getNodeIds() {
- return _visitData.keySet();
+ return visitData.keySet();
}
public VisitData getVisitData(ModuleRevisionId mrid) {
- return (VisitData) _visitData.get(mrid);
+ return (VisitData) visitData.get(mrid);
}
public void register(VisitNode node) {
@@ -105,7 +105,7 @@
if (visitData == null) {
visitData = new VisitData(node.getNode());
visitData.addVisitNode(node);
- _visitData.put(mrid, visitData);
+ this.visitData.put(mrid, visitData);
} else {
visitData.setNode(node.getNode());
visitData.addVisitNode(node);
@@ -130,46 +130,46 @@
throw new IllegalArgumentException("impossible to replace node with "+node+". No registered node found for "+node.getId()+".");
}
// replace visit data in Map (discards old one)
- _visitData.put(mrid, keptVisitData);
+ this.visitData.put(mrid, keptVisitData);
// update visit data with discarde visit nodes
keptVisitData.addVisitNodes(rootModuleConf, visitData.getVisitNodes(rootModuleConf));
}
public void setReport(ConfigurationResolveReport report) {
- _report = report;
+ this.report = report;
}
public Date getDate() {
- return _options.getDate();
+ return options.getDate();
}
public boolean isValidate() {
- return _options.isValidate();
+ return options.isValidate();
}
public boolean isTransitive() {
- return _options.isTransitive();
+ return options.isTransitive();
}
public ResolveOptions getOptions() {
- return _options;
+ return options;
}
public CacheManager getCacheManager() {
- return _options.getCache();
+ return options.getCache();
}
public IvySettings getSettings() {
- return _engine.getSettings();
+ return engine.getSettings();
}
public EventManager getEventManager() {
- return _engine.getEventManager();
+ return engine.getEventManager();
}
public ResolveEngine getEngine() {
- return _engine;
+ return engine;
}
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=544446&r1=544445&r2=544446
==============================================================================
--- 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 Tue Jun 5 04:12:14 2007
@@ -79,13 +79,13 @@
* @see ResolveOptions
*/
public class ResolveEngine {
- private IvySettings _settings;
- private EventManager _eventManager;
- private SortEngine _sortEngine;
+ private IvySettings settings;
+ private EventManager eventManager;
+ private SortEngine sortEngine;
- private Set _fetchedSet = new HashSet();
- private DependencyResolver _dictatorResolver;
+ private Set fetchedSet = new HashSet();
+ private DependencyResolver dictatorResolver;
/**
* Constructs a ResolveEngine.
@@ -95,9 +95,9 @@
* @param sortEngine the sort engine to use to sort modules before producing the dependency resolution report. Must not be null.
*/
public ResolveEngine(IvySettings settings, EventManager eventManager, SortEngine sortEngine) {
- _settings = settings;
- _eventManager = eventManager;
- _sortEngine = sortEngine;
+ this.settings = settings;
+ this.eventManager = eventManager;
+ this.sortEngine = sortEngine;
}
/**
@@ -106,7 +106,7 @@
* @return the currently configured dictator resolver, may be null.
*/
public DependencyResolver getDictatorResolver() {
- return _dictatorResolver;
+ return dictatorResolver;
}
/**
@@ -116,8 +116,8 @@
* null if regular settings should used
*/
public void setDictatorResolver(DependencyResolver dictatorResolver) {
- _dictatorResolver = dictatorResolver;
- _settings.setDictatorResolver(dictatorResolver);
+ this.dictatorResolver = dictatorResolver;
+ settings.setDictatorResolver(dictatorResolver);
}
public ResolveReport resolve(File ivySource) throws ParseException, IOException {
@@ -168,7 +168,7 @@
URLResource res = new URLResource(ivySource);
ModuleDescriptorParser parser = ModuleDescriptorParserRegistry.getInstance().getParser(res);
Message.verbose("using "+parser+" to parse "+ivySource);
- ModuleDescriptor md = parser.parseDescriptor(_settings, ivySource, options.isValidate());
+ ModuleDescriptor md = parser.parseDescriptor(settings, ivySource, options.isValidate());
String revision = options.getRevision();
if (revision == null && md.getResolvedModuleRevisionId().getRevision() == null) {
revision = Ivy.getWorkingRevision();
@@ -188,7 +188,7 @@
public ResolveReport resolve(ModuleDescriptor md, ResolveOptions options) throws ParseException, IOException, FileNotFoundException {
DependencyResolver oldDictator = getDictatorResolver();
if (options.isUseCacheOnly()) {
- setDictatorResolver(new CacheResolver(_settings));
+ setDictatorResolver(new CacheResolver(settings));
}
try {
CacheManager cacheManager = options.getCache();
@@ -209,7 +209,7 @@
options.setResolveId(ResolveOptions.getDefaultResolveId(md));
}
- _eventManager.fireIvyEvent(new StartResolveEvent(md, confs));
+ eventManager.fireIvyEvent(new StartResolveEvent(md, confs));
long start = System.currentTimeMillis();
Message.info(":: resolving dependencies :: "+md.getResolvedModuleRevisionId()+(options.isTransitive()?"":" [not transitive]"));
@@ -262,7 +262,7 @@
outputReport(report, cacheManager.getCache());
}
- _eventManager.fireIvyEvent(new EndResolveEvent(md, confs, report));
+ eventManager.fireIvyEvent(new EndResolveEvent(md, confs, report));
return report;
} finally {
setDictatorResolver(oldDictator);
@@ -273,7 +273,7 @@
Message.info(":: resolution report ::");
report.setProblemMessages(Message.getProblems());
// output report
- report.output(_settings.getReportOutputters(), cache);
+ report.output(settings.getReportOutputters(), cache);
Message.verbose("\tresolve done ("+report.getResolveTime()+"ms resolve - "+report.getDownloadTime()+"ms download)");
Message.sumupProblems();
@@ -283,7 +283,7 @@
long start = System.currentTimeMillis();
IvyNode[] dependencies = (IvyNode[]) report.getDependencies().toArray(new IvyNode[report.getDependencies().size()]);
- _eventManager.fireIvyEvent(new PrepareDownloadEvent((Artifact[])report.getArtifacts().toArray(new Artifact[report.getArtifacts().size()])));
+ eventManager.fireIvyEvent(new PrepareDownloadEvent((Artifact[])report.getArtifacts().toArray(new Artifact[report.getArtifacts().size()])));
for (int i = 0; i < dependencies.length; i++) {
checkInterrupted();
@@ -292,7 +292,7 @@
DependencyResolver resolver = dependencies[i].getModuleRevision()
.getArtifactResolver();
Artifact[] selectedArtifacts = dependencies[i].getSelectedArtifacts(artifactFilter);
- DownloadReport dReport = resolver.download(selectedArtifacts, new DownloadOptions(_settings, cacheManager, _eventManager, useOrigin));
+ DownloadReport dReport = resolver.download(selectedArtifacts, new DownloadOptions(settings, cacheManager, eventManager, useOrigin));
ArtifactDownloadReport[] adrs = dReport.getArtifactsReports();
for (int j = 0; j < adrs.length; j++) {
if (adrs[j].getDownloadStatus() == DownloadStatus.FAILED) {
@@ -333,8 +333,8 @@
* @return a report concerning the download
*/
public ArtifactDownloadReport download(Artifact artifact, CacheManager cacheManager, boolean useOrigin) {
- DependencyResolver resolver = _settings.getResolver(artifact.getModuleRevisionId().getModuleId());
- DownloadReport r = resolver.download(new Artifact[] {artifact}, new DownloadOptions(_settings, cacheManager, _eventManager, useOrigin));
+ DependencyResolver resolver = settings.getResolver(artifact.getModuleRevisionId().getModuleId());
+ DownloadReport r = resolver.download(new Artifact[] {artifact}, new DownloadOptions(settings, cacheManager, eventManager, useOrigin));
return r.getArtifactReport(artifact);
}
@@ -353,7 +353,7 @@
*/
public IvyNode[] getDependencies(URL ivySource, ResolveOptions options) throws ParseException, IOException {
return getDependencies(ModuleDescriptorParserRegistry.getInstance()
- .parseDescriptor(_settings, ivySource, options.isValidate()),
+ .parseDescriptor(settings, ivySource, options.isValidate()),
options, null);
}
@@ -396,7 +396,7 @@
Message.verbose("resolving dependencies for configuration '"+confs[i]+"'");
// for each configuration we clear the cache of what's been fetched
- _fetchedSet.clear();
+ fetchedSet.clear();
Configuration configuration = md.getConfiguration(confs[i]);
if (configuration == null) {
@@ -437,7 +437,7 @@
dependencies.add(dep);
}
}
- List sortedDependencies = _sortEngine.sortNodes(dependencies);
+ List sortedDependencies = sortEngine.sortNodes(dependencies);
Collections.reverse(sortedDependencies);
// handle transitive eviction now:
@@ -450,7 +450,7 @@
if (!node.isCompletelyEvicted()) {
for (int i = 0; i < confs.length; i++) {
IvyNodeCallers.Caller[] callers = node.getCallers(confs[i]);
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("checking if "+node.getId()+" is transitively evicted in "+confs[i]);
}
boolean allEvicted = callers.length > 0;
@@ -467,7 +467,7 @@
allEvicted = false;
break;
} else {
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("caller "+callerNode.getId()+" of "+node.getId()+" is evicted");
}
}
@@ -477,7 +477,7 @@
Message.verbose("all callers are evicted for "+node+": evicting too");
node.markEvicted(confs[i], null, null, null);
} else {
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug(node.getId()+" isn't transitively evicted, at least one caller was not evicted");
}
}
@@ -535,7 +535,7 @@
}
}
}
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug(node.getId()+" => dependencies resolved in "+conf+" ("+(System.currentTimeMillis()-start)+"ms)");
}
}
@@ -609,10 +609,10 @@
ModuleRevisionId moduleRevisionId = node.getResolvedId();
String key = moduleId.getOrganisation()+"|"+moduleId.getName()+"|"+moduleRevisionId.getRevision() +
"|" + conf;
- if (_fetchedSet.contains(key)) {
+ if (fetchedSet.contains(key)) {
return true;
}
- _fetchedSet.add(key);
+ fetchedSet.add(key);
return false;
}
@@ -647,12 +647,12 @@
EvictionData evictionData = node.getEvictionDataInRoot(node.getRootModuleConf(), ancestor);
if (evictionData != null) {
// node has been previously evicted in an ancestor: we mark it as evicted
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug(node+" was previously evicted in root module conf "+node.getRootModuleConf());
}
node.markEvicted(evictionData);
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("evicting "+node+" by "+evictionData);
}
}
@@ -667,7 +667,7 @@
resolvedNodes.addAll(ancestor.getNode().getPendingConflicts(node.getRootModuleConf(), node.getModuleId()));
Collection conflicts = computeConflicts(node, ancestor, toevict, resolvedNodes);
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("found conflicting revisions for "+node+" in "+ancestor+": "+conflicts);
}
@@ -675,7 +675,7 @@
Collection resolved = conflictManager.resolveConflicts(ancestor.getNode(), conflicts);
if (resolved == null) {
- if (_settings.debugConflictResolution()) {
+ 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);
}
@@ -683,7 +683,7 @@
return false;
}
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("selected revisions for "+node+" in "+ancestor+": "+resolved);
}
if (resolved.contains(node.getNode())) {
@@ -697,7 +697,7 @@
IvyNode te = (IvyNode)iter.next();
te.markEvicted(node.getRootModuleConf(), ancestor.getNode(), conflictManager, resolved);
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("evicting "+te+" by "+te.getEvictedData(node.getRootModuleConf()));
}
}
@@ -717,7 +717,7 @@
} else {
// node has been evicted for the current parent
if (resolved.isEmpty()) {
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.verbose("conflict manager '"+conflictManager+"' evicted all revisions among "+conflicts);
}
}
@@ -735,7 +735,7 @@
node.markEvicted(ancestor, conflictManager, resolved);
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("evicting "+node+" by "+node.getEvictedData());
}
@@ -789,7 +789,7 @@
private boolean checkConflictSolvedSelected(VisitNode node, VisitNode ancestor) {
if (ancestor.getResolvedRevisions(node.getModuleId()).contains(node.getResolvedId())) {
// resolve conflict has already be done with node with the same id
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("conflict resolution already done for "+node+" in "+ancestor);
}
return true;
@@ -800,7 +800,7 @@
private boolean checkConflictSolvedEvicted(VisitNode node, VisitNode ancestor) {
if (ancestor.getEvictedRevisions(node.getModuleId()).contains(node.getResolvedId())) {
// resolve conflict has already be done with node with the same id
- if (_settings.debugConflictResolution()) {
+ if (settings.debugConflictResolution()) {
Message.debug("conflict resolution already done for "+node+" in "+ancestor);
}
return true;
@@ -809,7 +809,7 @@
}
public ResolvedModuleRevision findModule(ModuleRevisionId id, ResolveOptions options) {
- DependencyResolver r = _settings.getResolver(id.getModuleId());
+ DependencyResolver r = settings.getResolver(id.getModuleId());
if (r == null) {
throw new IllegalStateException("no resolver found for "+id.getModuleId());
}
@@ -832,15 +832,15 @@
}
public EventManager getEventManager() {
- return _eventManager;
+ return eventManager;
}
public IvySettings getSettings() {
- return _settings;
+ return settings;
}
public SortEngine getSortEngine() {
- return _sortEngine;
+ return sortEngine;
}
private void checkInterrupted() {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitData.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitData.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitData.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitData.java Tue Jun 5 04:12:14 2007
@@ -36,16 +36,16 @@
/**
* A node in the graph of module dependencies resolution
*/
- private IvyNode _node;
+ private IvyNode node;
/**
* The associated visit nodes, per rootModuleConf
* Note that the value is a List, because a node can be visited from
* several parents during the resolution process
*/
- private Map _visitNodes = new HashMap(); // Map (String rootModuleConf -> List(VisitNode))
+ private Map visitNodes = new HashMap(); // Map (String rootModuleConf -> List(VisitNode))
public VisitData(IvyNode node) {
- _node = node;
+ this.node = node;
}
public void addVisitNode(VisitNode node) {
@@ -54,20 +54,20 @@
}
public List getVisitNodes(String rootModuleConf) {
- List visits = (List) _visitNodes.get(rootModuleConf);
+ List visits = (List) visitNodes.get(rootModuleConf);
if (visits == null) {
visits = new ArrayList();
- _visitNodes.put(rootModuleConf, visits);
+ visitNodes.put(rootModuleConf, visits);
}
return visits;
}
public IvyNode getNode() {
- return _node;
+ return node;
}
public void setNode(IvyNode node) {
- _node = node;
+ this.node = node;
}
public void addVisitNodes(String rootModuleConf, List visitNodes) {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java Tue Jun 5 04:12:14 2007
@@ -56,53 +56,53 @@
/**
* The node which is currently visited
*/
- private IvyNode _node;
+ private IvyNode node;
/**
* Represents the current parent of the node during ivy visit
* of dependency graph.
*/
- private VisitNode _parent = null;
+ private VisitNode parent = null;
/**
* The root node of the current visit
* It is null until it is required, see getRoot
*/
- private VisitNode _root = null;
+ private VisitNode root = null;
/**
* Direct path from root to this node.
* Note that the colleciton is ordered but is not a list implementation
* This collection is null until it is required, see getPath
*/
- private Collection _path = null; // Collection(VisitNode)
+ private Collection path = null; // Collection(VisitNode)
/**
* The configuration of the parent module in the current visit
*/
- private String _parentConf = null;
+ private String parentConf = null;
/**
* The configuration requested by the parent
* Note that this is the actual conf requested by the parent, not
* a configuration extended by the requested conf which actually
* trigger the node visit
*/
- private String _requestedConf;
+ private String requestedConf;
/**
* The root configuration which is currently visited
*/
- private String _rootModuleConf;
+ private String rootModuleConf;
/**
* Shared ResolveData instance, which can be used
* to get info on the current resolve process
*/
- private ResolveData _data;
+ private ResolveData data;
/**
* Boolean.TRUE if a node with a same module id as the one visited
* has already been visited in the current path.
* null if not computed yet
* Boolean.FALSE otherwise
*/
- private Boolean _isCircular;
+ private Boolean isCircular;
public VisitNode(ResolveData data, IvyNode node, VisitNode parent, String rootModuleConf, String parentConf) {
@@ -115,61 +115,61 @@
if (rootModuleConf == null) {
throw new NullPointerException("rootModuleConf must not be null");
}
- _data = data;
- _node = node;
- _parent = parent;
- _rootModuleConf = rootModuleConf;
- _parentConf = parentConf;
+ this.data = data;
+ this.node = node;
+ this.parent = parent;
+ this.rootModuleConf = rootModuleConf;
+ this.parentConf = parentConf;
// we do not register if this is a root module (root == no parent)
- init(data, _parent != null);
+ init(data, this.parent != null);
}
private void init(ResolveData data, boolean register) {
- _data = data;
+ this.data = data;
if (register) {
- _data.register(this);
+ this.data.register(this);
}
}
public IvyNode getNode() {
- return _node;
+ return node;
}
/**
* @return Returns the configuration requested by the parent
*/
public String getRequestedConf() {
- return _requestedConf;
+ return requestedConf;
}
public void setRequestedConf(String requestedConf) {
- _requestedConf = requestedConf;
+ this.requestedConf = requestedConf;
}
public VisitNode getParent() {
- return _parent;
+ return parent;
}
public VisitNode getRoot() {
- if (_root == null) {
- _root = computeRoot();
+ if (root == null) {
+ root = computeRoot();
}
- return _root;
+ return root;
}
public Collection getPath() {
- if (_path == null) {
- _path = computePath();
+ if (path == null) {
+ path = computePath();
}
- return _path;
+ return path;
}
private Collection computePath() {
- if (_parent != null) {
- Collection p = new LinkedHashSet(_parent.getPath());
+ if (parent != null) {
+ Collection p = new LinkedHashSet(parent.getPath());
p.add(this);
return p;
} else {
@@ -178,25 +178,25 @@
}
private VisitNode computeRoot() {
- if (_node.isRoot()) {
+ if (node.isRoot()) {
return this;
- } else if (_parent != null) {
- return _parent.getRoot();
+ } else if (parent != null) {
+ return parent.getRoot();
} else {
return null;
}
}
public String getParentConf() {
- return _parentConf;
+ return parentConf;
}
public void setParentConf(String parentConf) {
- _parentConf = parentConf;
+ this.parentConf = parentConf;
}
public String getRootModuleConf() {
- return _rootModuleConf;
+ return rootModuleConf;
}
public static VisitNode getRoot(VisitNode parent) {
@@ -222,8 +222,8 @@
* transitive.
*/
public boolean isTransitive() {
- return (_data.isTransitive() &&
- _node.getDependencyDescriptor(getParentNode()).isTransitive() &&
+ return (data.isTransitive() &&
+ node.getDependencyDescriptor(getParentNode()).isTransitive() &&
isParentConfTransitive() );
}
@@ -252,11 +252,11 @@
* @return the 'real' node currently visited.
*/
public IvyNode getRealNode() {
- IvyNode node = _node.getRealNode();
+ IvyNode node = this.node.getRealNode();
if (node != null) {
return node;
} else {
- return _node;
+ return this.node;
}
}
@@ -265,23 +265,23 @@
* See getRealNode for details about what a 'real' node is.
*/
public void useRealNode() {
- if (_parent != null) { // use real node make sense only for non root module
- IvyNode node = _data.getNode(_node.getId());
- if (node != null && node != _node) {
- _node = node;
+ if (parent != null) { // use real node make sense only for non root module
+ IvyNode node = data.getNode(this.node.getId());
+ if (node != null && node != this.node) {
+ this.node = node;
}
}
}
public boolean loadData(String conf, boolean shouldBePublic) {
- boolean loaded = _node.loadData(_rootModuleConf, getParentNode(), _parentConf, conf, shouldBePublic);
+ boolean loaded = node.loadData(rootModuleConf, getParentNode(), parentConf, conf, shouldBePublic);
if (loaded) {
useRealNode();
// if the revision was a dynamic one (which has now be resolved)
// we now register this node on the resolved id
- if (_data.getSettings().getVersionMatcher().isDynamic(getId())) {
- _data.register(_node.getResolvedId(), this);
+ if (data.getSettings().getVersionMatcher().isDynamic(getId())) {
+ data.register(node.getResolvedId(), this);
}
}
@@ -289,7 +289,7 @@
}
public Collection getDependencies(String conf) {
- Collection deps = _node.getDependencies(_rootModuleConf, conf, _requestedConf);
+ Collection deps = node.getDependencies(rootModuleConf, conf, requestedConf);
Collection ret = new ArrayList(deps.size());
for (Iterator iter = deps.iterator(); iter.hasNext();) {
IvyNode depNode = (IvyNode) iter.next();
@@ -312,19 +312,19 @@
if (!getModuleId().equals(node.getModuleId())) {
throw new IllegalArgumentException("you can't use gotoNode for a node which does not represent the same Module as the one represented by this node.\nCurrent node module id="+getModuleId()+" Given node module id="+node.getModuleId());
}
- VisitData visitData = _data.getVisitData(node.getId());
+ VisitData visitData = data.getVisitData(node.getId());
if (visitData == null) {
throw new IllegalArgumentException("you can't use gotoNode with a node which has not been visited yet.\nGiven node id="+node.getId());
}
- for (Iterator iter = visitData.getVisitNodes(_rootModuleConf).iterator(); iter.hasNext();) {
+ for (Iterator iter = visitData.getVisitNodes(rootModuleConf).iterator(); iter.hasNext();) {
VisitNode vnode = (VisitNode) iter.next();
- if ((_parent == null && vnode.getParent() == null) ||
- (_parent != null && _parent.getId().equals(vnode.getParent().getId()))) {
+ if ((parent == null && vnode.getParent() == null) ||
+ (parent != null && parent.getId().equals(vnode.getParent().getId()))) {
return vnode;
}
}
// the node has not yet been visited from the current parent, we create a new visit node
- return traverse(_parent, _parentConf, node);
+ return traverse(parent, parentConf, node);
}
private VisitNode traverseChild(String parentConf, IvyNode child) {
@@ -339,7 +339,7 @@
// we do not use the new parent, but the first one, to always be able to go up to the root
// parent = getVisitNode(depNode).getParent();
}
- return new VisitNode(_data, node, parent, _rootModuleConf, parentConf);
+ return new VisitNode(data, node, parent, rootModuleConf, parentConf);
}
private ModuleRevisionId[] toMrids(Collection path, ModuleRevisionId last) {
@@ -354,43 +354,43 @@
}
public ModuleRevisionId getResolvedId() {
- return _node.getResolvedId();
+ return node.getResolvedId();
}
public void updateConfsToFetch(Collection confs) {
- _node.updateConfsToFetch(confs);
+ node.updateConfsToFetch(confs);
}
public ModuleRevisionId getId() {
- return _node.getId();
+ return node.getId();
}
public boolean isEvicted() {
- return _node.isEvicted(_rootModuleConf);
+ return node.isEvicted(rootModuleConf);
}
public String[] getRealConfs(String conf) {
- return _node.getRealConfs(conf);
+ return node.getRealConfs(conf);
}
public boolean hasProblem() {
- return _node.hasProblem();
+ return node.hasProblem();
}
public Configuration getConfiguration(String conf) {
- return _node.getConfiguration(conf);
+ return node.getConfiguration(conf);
}
public EvictionData getEvictedData() {
- return _node.getEvictedData(_rootModuleConf);
+ return node.getEvictedData(rootModuleConf);
}
public DependencyDescriptor getDependencyDescriptor() {
- return _node.getDependencyDescriptor(getParentNode());
+ return node.getDependencyDescriptor(getParentNode());
}
private IvyNode getParentNode() {
- return _parent==null?null:_parent.getNode();
+ return parent ==null?null: parent.getNode();
}
@@ -399,45 +399,45 @@
* @return
*/
public boolean isCircular() {
- if (_isCircular == null) {
- if (_parent != null) {
- _isCircular = Boolean.FALSE; // asumme it's false, and see if it isn't by checking the parent path
- for (Iterator iter = _parent.getPath().iterator(); iter.hasNext();) {
+ if (isCircular == null) {
+ if (parent != null) {
+ isCircular = Boolean.FALSE; // asumme it's false, and see if it isn't by checking the parent path
+ for (Iterator iter = parent.getPath().iterator(); iter.hasNext();) {
VisitNode ancestor = (VisitNode) iter.next();
if (getId().getModuleId().equals(ancestor.getId().getModuleId())) {
- _isCircular = Boolean.TRUE;
+ isCircular = Boolean.TRUE;
break;
}
}
} else {
- _isCircular = Boolean.FALSE;
+ isCircular = Boolean.FALSE;
}
}
- return _isCircular.booleanValue();
+ return isCircular.booleanValue();
}
public String[] getConfsToFetch() {
- return _node.getConfsToFetch();
+ return node.getConfsToFetch();
}
public String[] getRequiredConfigurations(VisitNode in, String inConf) {
- return _node.getRequiredConfigurations(in.getNode(), inConf);
+ return node.getRequiredConfigurations(in.getNode(), inConf);
}
public ModuleId getModuleId() {
- return _node.getModuleId();
+ return node.getModuleId();
}
public Collection getResolvedRevisions(ModuleId mid) {
- return _node.getResolvedRevisions(mid, _rootModuleConf);
+ return node.getResolvedRevisions(mid, rootModuleConf);
}
public void markEvicted(EvictionData evictionData) {
- _node.markEvicted(evictionData);
+ node.markEvicted(evictionData);
}
public String[] getRequiredConfigurations() {
- return _node.getRequiredConfigurations();
+ return node.getRequiredConfigurations();
}
/**
@@ -450,34 +450,34 @@
* @param selected a Collection of {@link IvyNode} which have been selected
*/
public void markEvicted(VisitNode parent, ConflictManager conflictManager, Collection selected) {
- _node.markEvicted(_rootModuleConf, parent.getNode(), conflictManager, selected);
+ node.markEvicted(rootModuleConf, parent.getNode(), conflictManager, selected);
}
public ModuleDescriptor getDescriptor() {
- return _node.getDescriptor();
+ return node.getDescriptor();
}
public EvictionData getEvictionDataInRoot(String rootModuleConf, VisitNode ancestor) {
- return _node.getEvictionDataInRoot(rootModuleConf, ancestor.getNode());
+ return node.getEvictionDataInRoot(rootModuleConf, ancestor.getNode());
}
public Collection getEvictedRevisions(ModuleId moduleId) {
- return _node.getEvictedRevisions(moduleId, _rootModuleConf);
+ return node.getEvictedRevisions(moduleId, rootModuleConf);
}
// public void setRootModuleConf(String rootModuleConf) {
-// if (_rootModuleConf != null && !_rootModuleConf.equals(rootModuleConf)) {
+// if (rootModuleConf != null && !rootModuleConf.equals(rootModuleConf)) {
// _confsToFetch.clear(); // we change of root module conf => we discard all confs to fetch
// }
-// if (rootModuleConf != null && rootModuleConf.equals(_rootModuleConf)) {
+// if (rootModuleConf != null && rootModuleConf.equals(rootModuleConf)) {
// _selectedDeps.put(new ModuleIdConf(_id.getModuleId(), rootModuleConf), Collections.singleton(this));
// }
-// _rootModuleConf = rootModuleConf;
+// rootModuleConf = rootModuleConf;
// }
public String toString() {
- return _node.toString();
+ return node.toString();
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java Tue Jun 5 04:12:14 2007
@@ -51,10 +51,10 @@
import org.apache.ivy.util.Message;
public class RetrieveEngine {
- private IvySettings _settings;
+ private IvySettings settings;
public RetrieveEngine(IvySettings settings) {
- _settings = settings;
+ this.settings = settings;
}
/**
@@ -70,11 +70,11 @@
public int retrieve(ModuleRevisionId mrid, String destFilePattern, RetrieveOptions options) throws IOException {
ModuleId moduleId = mrid.getModuleId();
Message.info(":: retrieving :: "+moduleId+(options.isSync()?" [sync]":""));
- Message.verbose("\tcheckUpToDate="+_settings.isCheckUpToDate());
+ Message.verbose("\tcheckUpToDate="+ settings.isCheckUpToDate());
long start = System.currentTimeMillis();
- destFilePattern = IvyPatternHelper.substituteVariables(destFilePattern, _settings.getVariables());
- String destIvyPattern = IvyPatternHelper.substituteVariables(options.getDestIvyPattern(), _settings.getVariables());
+ destFilePattern = IvyPatternHelper.substituteVariables(destFilePattern, settings.getVariables());
+ String destIvyPattern = IvyPatternHelper.substituteVariables(options.getDestIvyPattern(), settings.getVariables());
CacheManager cacheManager = getCacheManager(options);
String[] confs = getConfs(mrid, options);
@@ -109,7 +109,7 @@
for (Iterator it2 = dest.iterator(); it2.hasNext();) {
IvyContext.getContext().checkInterrupted();
File destFile = new File((String)it2.next());
- if (!_settings.isCheckUpToDate() || !upToDate(archive, destFile)) {
+ if (!settings.isCheckUpToDate() || !upToDate(archive, destFile)) {
Message.verbose("\t\tto "+destFile);
if (options.isMakeSymlinks()) {
FileUtil.symlink(archive, destFile, null, true);
@@ -147,7 +147,7 @@
}
}
}
- Message.info("\t"+targetsCopied+" artifacts copied"+(_settings.isCheckUpToDate()?(", "+targetsUpToDate+" already retrieved"):""));
+ Message.info("\t"+targetsCopied+" artifacts copied"+(settings.isCheckUpToDate()?(", "+targetsUpToDate+" already retrieved"):""));
Message.verbose("\tretrieve done ("+(System.currentTimeMillis()-start)+"ms)");
return targetsCopied;
@@ -166,7 +166,7 @@
URLResource res = new URLResource(ivySource);
ModuleDescriptorParser parser = ModuleDescriptorParserRegistry.getInstance().getParser(res);
Message.debug("using "+parser+" to parse "+ivyFile);
- ModuleDescriptor md = parser.parseDescriptor(_settings, ivySource, false);
+ ModuleDescriptor md = parser.parseDescriptor(settings, ivySource, false);
confs = md.getConfigurationsNames();
options.setConfs(confs);
} catch (IOException e) {
@@ -219,7 +219,7 @@
CacheManager cacheManager = getCacheManager(options);
String[] confs = getConfs(mrid, options);
- String destIvyPattern = IvyPatternHelper.substituteVariables(options.getDestIvyPattern(), _settings.getVariables());
+ String destIvyPattern = IvyPatternHelper.substituteVariables(options.getDestIvyPattern(), settings.getVariables());
// find what we must retrieve where
final Map artifactsToCopy = new HashMap(); // Artifact source -> Set (String copyDestAbsolutePath)
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java Tue Jun 5 04:12:14 2007
@@ -22,29 +22,29 @@
public class ModuleEntry {
- private OrganisationEntry _organisationEntry;
- private String _module;
+ private OrganisationEntry organisationEntry;
+ private String module;
public ModuleEntry(OrganisationEntry org, String name) {
- _organisationEntry = org;
- _module = name;
+ organisationEntry = org;
+ module = name;
}
public String getOrganisation() {
- return _organisationEntry.getOrganisation();
+ return organisationEntry.getOrganisation();
}
public DependencyResolver getResolver() {
- return _organisationEntry.getResolver();
+ return organisationEntry.getResolver();
}
public String getModule() {
- return _module;
+ return module;
}
public OrganisationEntry getOrganisationEntry() {
- return _organisationEntry;
+ return organisationEntry;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java Tue Jun 5 04:12:14 2007
@@ -21,20 +21,20 @@
public class OrganisationEntry {
- private DependencyResolver _resolver;
- private String _organisation;
+ private DependencyResolver resolver;
+ private String organisation;
public OrganisationEntry(DependencyResolver resolver, String organisation) {
- _resolver = resolver;
- _organisation = organisation;
+ this.resolver = resolver;
+ this.organisation = organisation;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public DependencyResolver getResolver() {
- return _resolver;
+ return resolver;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java Tue Jun 5 04:12:14 2007
@@ -23,37 +23,37 @@
public class RevisionEntry {
- private ModuleEntry _moduleEntry;
- private String _revision;
+ private ModuleEntry moduleEntry;
+ private String revision;
public RevisionEntry(ModuleEntry mod, String name) {
- _moduleEntry = mod;
- _revision = name;
+ moduleEntry = mod;
+ revision = name;
}
public ModuleEntry getModuleEntry() {
- return _moduleEntry;
+ return moduleEntry;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public String getModule() {
- return _moduleEntry.getModule();
+ return moduleEntry.getModule();
}
public String getOrganisation() {
- return _moduleEntry.getOrganisation();
+ return moduleEntry.getOrganisation();
}
public OrganisationEntry getOrganisationEntry() {
- return _moduleEntry.getOrganisationEntry();
+ return moduleEntry.getOrganisationEntry();
}
public DependencyResolver getResolver() {
- return _moduleEntry.getResolver();
+ return moduleEntry.getResolver();
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java Tue Jun 5 04:12:14 2007
@@ -40,10 +40,10 @@
import org.apache.ivy.util.Message;
public class SearchEngine {
- private IvySettings _settings;
+ private IvySettings settings;
public SearchEngine(IvySettings settings) {
- _settings = settings;
+ this.settings = settings;
}
/**
@@ -55,7 +55,7 @@
*/
public String[] listTokenValues(String token, Map otherTokenValues) {
List r = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
r.addAll(Arrays.asList(resolver.listTokenValues(token, otherTokenValues)));
}
@@ -64,7 +64,7 @@
public OrganisationEntry[] listOrganisationEntries() {
List entries = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
entries.addAll(Arrays.asList(resolver.listOrganisations()));
}
@@ -72,7 +72,7 @@
}
public String[] listOrganisations() {
Collection orgs = new HashSet();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
OrganisationEntry[] entries = resolver.listOrganisations();
if (entries != null) {
@@ -87,7 +87,7 @@
}
public ModuleEntry[] listModuleEntries(OrganisationEntry org) {
List entries = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
entries.addAll(Arrays.asList(resolver.listModules(org)));
}
@@ -95,7 +95,7 @@
}
public String[] listModules(String org) {
List mods = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
ModuleEntry[] entries = resolver.listModules(new OrganisationEntry(resolver, org));
if (entries != null) {
@@ -110,7 +110,7 @@
}
public RevisionEntry[] listRevisionEntries(ModuleEntry module) {
List entries = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
entries.addAll(Arrays.asList(resolver.listRevisions(module)));
}
@@ -118,7 +118,7 @@
}
public String[] listRevisions(String org, String module) {
List revs = new ArrayList();
- for (Iterator iter = _settings.getResolvers().iterator(); iter.hasNext();) {
+ for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
RevisionEntry[] entries = resolver.listRevisions(new ModuleEntry(new OrganisationEntry(resolver, org), module));
if (entries != null) {
@@ -190,7 +190,7 @@
tokenValues.put(IvyPatternHelper.MODULE_KEY, mods[j]);
String[] branches = listTokenValues(IvyPatternHelper.BRANCH_KEY, tokenValues);
if (branches == null || branches.length == 0) {
- branches = new String[] {_settings.getDefaultBranch(new ModuleId(orgs[i], mods[j]))};
+ branches = new String[] {settings.getDefaultBranch(new ModuleId(orgs[i], mods[j]))};
}
for (int k = 0; k < branches.length; k++) {
if (branches[k] == null || branchMatcher.matches(branches[k])) {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java Tue Jun 5 04:12:14 2007
@@ -21,13 +21,13 @@
*
*/
public class IvyPattern {
- private String _pattern;
+ private String pattern;
public String getPattern() {
- return _pattern;
+ return pattern;
}
public void setPattern(String pattern) {
- _pattern = pattern;
+ this.pattern = pattern;
}
}