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 [1/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...
Author: xavier
Date: Tue Jun 5 04:12:14 2007
New Revision: 544446
URL: http://svn.apache.org/viewvc?view=rev&rev=544446
Log:
Code convention for instance variable: org.apache.ivy.core (IVY-518) (thanks to Stephane Bailliez)
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheManager.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/check/CheckEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverOptions.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/EventManager.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java
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/ModuleId.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/Status.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/status/StatusManager.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/ArtifactDownloadReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/DownloadStatus.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/report/ResolveReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DefaultModuleRevision.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/DownloadOptions.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/ResolveData.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/ResolveEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitData.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/resolve/VisitNode.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/ModuleEntry.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/OrganisationEntry.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/RevisionEntry.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/search/SearchEngine.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyPattern.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/sort/SortEngine.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java Tue Jun 5 04:12:14 2007
@@ -45,25 +45,25 @@
*/
public class IvyContext {
- private static ThreadLocal _current = new ThreadLocal();
+ private static ThreadLocal current = new ThreadLocal();
- private Ivy _defaultIvy;
- private WeakReference _ivy = new WeakReference(null);
- private File _cache;
- private MessageImpl _messageImpl;
- private Stack _resolver = new Stack(); // Stack(DependencyResolver)
+ private Ivy defaultIvy;
+ private WeakReference ivy = new WeakReference(null);
+ private File cache;
+ private MessageImpl messageImpl;
+ private Stack resolver = new Stack(); // Stack(DependencyResolver)
- private Map _contextMap = new HashMap();
+ private Map contextMap = new HashMap();
- private Thread _operatingThread;
+ private Thread operatingThread;
public static IvyContext getContext() {
- IvyContext cur = (IvyContext)_current.get();
+ IvyContext cur = (IvyContext) current.get();
if (cur == null) {
cur = new IvyContext();
- _current.set(cur);
+ current.set(cur);
}
return cur;
}
@@ -75,7 +75,7 @@
* @param context the new context to use in this thread.
*/
public static void setContext(IvyContext context) {
- _current.set(context);
+ current.set(context);
}
/**
@@ -88,29 +88,29 @@
* @return the current ivy instance
*/
public Ivy getIvy() {
- Ivy ivy = (Ivy)_ivy.get();
+ Ivy ivy = (Ivy) this.ivy.get();
return ivy == null ? getDefaultIvy() : ivy;
}
private Ivy getDefaultIvy() {
- if (_defaultIvy == null) {
- _defaultIvy = Ivy.newInstance();
+ if (defaultIvy == null) {
+ defaultIvy = Ivy.newInstance();
try {
- _defaultIvy.configureDefault();
+ defaultIvy.configureDefault();
} catch (Exception e) {
}
}
- return _defaultIvy;
+ return defaultIvy;
}
public void setIvy(Ivy ivy) {
- _ivy = new WeakReference(ivy);
- _operatingThread = Thread.currentThread();
+ this.ivy = new WeakReference(ivy);
+ operatingThread = Thread.currentThread();
}
public File getCache() {
- return _cache == null ? getSettings().getDefaultCache() : _cache;
+ return cache == null ? getSettings().getDefaultCache() : cache;
}
public void setCache(File cache) {
- _cache = cache;
+ this.cache = cache;
}
public IvySettings getSettings() {
@@ -122,12 +122,12 @@
}
public Object get(String key) {
- WeakReference ref = (WeakReference) _contextMap.get(key);
+ WeakReference ref = (WeakReference) contextMap.get(key);
return ref == null ? null : ref.get();
}
public void set(String key, Object value) {
- _contextMap.put(key, new WeakReference(value));
+ contextMap.put(key, new WeakReference(value));
}
/**
@@ -137,8 +137,8 @@
* @return top object from the list (index 0) or null if no key or list empty
*/
public Object peek(String key){
- synchronized(_contextMap){
- Object o=_contextMap.get(key);
+ synchronized(contextMap){
+ Object o= contextMap.get(key);
if(o==null) return null;
if(o instanceof List){
if(((List)o).size()==0) return null;
@@ -157,8 +157,8 @@
* @return top object from the list (index 0) or null if no key or list empty
*/
public Object pop(String key){
- synchronized(_contextMap){
- Object o=_contextMap.get(key);
+ synchronized(contextMap){
+ Object o= contextMap.get(key);
if(o==null) return null;
if(o instanceof List){
if(((List)o).size()==0) return null;
@@ -178,8 +178,8 @@
* @return true if the r
*/
public boolean pop(String key, Object expectedValue){
- synchronized(_contextMap){
- Object o=_contextMap.get(key);
+ synchronized(contextMap){
+ Object o= contextMap.get(key);
if(o==null) return false;
if(o instanceof List){
if(((List)o).size()==0) return false;
@@ -202,9 +202,9 @@
* @param value value to be saved under the key
*/
public void push(String key, Object value){
- synchronized(_contextMap){
- if(!_contextMap.containsKey(key)) _contextMap.put(key, new LinkedList());
- Object o=_contextMap.get(key);
+ synchronized(contextMap){
+ if(!contextMap.containsKey(key)) contextMap.put(key, new LinkedList());
+ Object o= contextMap.get(key);
if(o instanceof List){
((List)o).add(0,value);
} else {
@@ -214,7 +214,7 @@
}
public Thread getOperatingThread() {
- return _operatingThread;
+ return operatingThread;
}
@@ -223,11 +223,11 @@
* because Message is used at a lot of place.
*/
public MessageImpl getMessageImpl() {
- return _messageImpl;
+ return messageImpl;
}
public void setMessageImpl(MessageImpl impl) {
- _messageImpl = impl;
+ messageImpl = impl;
}
public EventManager getEventManager() {
@@ -243,15 +243,15 @@
}
public DependencyResolver getResolver() {
- return (DependencyResolver) _resolver.peek();
+ return (DependencyResolver) resolver.peek();
}
public void pushResolver(DependencyResolver resolver) {
- _resolver.push(resolver);
+ this.resolver.push(resolver);
}
public void popResolver() {
- _resolver.pop();
+ resolver.pop();
}
// should be better to use context to store this kind of information, but not yet ready to do so...
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/IvyThread.java Tue Jun 5 04:12:14 2007
@@ -27,7 +27,7 @@
* @see IvyContext
*/
public class IvyThread extends Thread {
- private IvyContext _context = IvyContext.getContext();
+ private IvyContext context = IvyContext.getContext();
public IvyThread() {
super();
@@ -67,6 +67,6 @@
}
protected void initContext() {
- IvyContext.setContext(_context);
+ IvyContext.setContext(context);
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java Tue Jun 5 04:12:14 2007
@@ -23,8 +23,8 @@
* @see org.apache.ivy.plugins.resolver.util.ResolvedResource
*/
public class ArtifactOrigin {
- private boolean _isLocal;
- private String _location;
+ private boolean isLocal;
+ private String location;
/**
* Create a new instance
@@ -33,8 +33,8 @@
* @param location the location of the resource (normally a url)
*/
public ArtifactOrigin(boolean isLocal, String location) {
- _isLocal = isLocal;
- _location = location;
+ this.isLocal = isLocal;
+ this.location = location;
}
/**
@@ -43,7 +43,7 @@
* @return <code>boolean</code> value indicating if the resource is local.
*/
public boolean isLocal() {
- return _isLocal;
+ return isLocal;
}
/**
@@ -52,11 +52,11 @@
* @return the location of the resource
*/
public String getLocation() {
- return _location;
+ return location;
}
public String toString() {
- return "ArtifactOrigin { _isLocal=" + _isLocal + ", _location=" + _location + "}";
+ return "ArtifactOrigin { isLocal=" + isLocal + ", location=" + location + "}";
}
public boolean equals(Object o) {
@@ -65,16 +65,16 @@
ArtifactOrigin that = (ArtifactOrigin) o;
- if (_isLocal != that._isLocal) return false;
- if (!_location.equals(that._location)) return false;
+ if (isLocal != that.isLocal) return false;
+ if (!location.equals(that.location)) return false;
return true;
}
public int hashCode() {
int result;
- result = (_isLocal ? 1 : 0);
- result = 31 * result + _location.hashCode();
+ result = (isLocal ? 1 : 0);
+ result = 31 * result + location.hashCode();
return result;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheManager.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/cache/CacheManager.java Tue Jun 5 04:12:14 2007
@@ -25,7 +25,6 @@
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.module.id.ArtifactRevisionId;
import org.apache.ivy.core.resolve.DefaultModuleRevision;
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
import org.apache.ivy.core.settings.IvySettings;
@@ -43,37 +42,37 @@
return getInstance(settings, settings.getDefaultCache());
}
- private IvySettings _settings;
- private File _cache;
+ private IvySettings settings;
+ private File cache;
public CacheManager(IvySettings settings, File cache) {
- _settings = settings;
- _cache = cache;
+ this.settings = settings;
+ this.cache = cache;
}
public File getResolvedIvyFileInCache(ModuleRevisionId mrid) {
- String file = IvyPatternHelper.substitute(_settings.getCacheResolvedIvyPattern(), mrid.getOrganisation(), mrid.getName(), mrid.getRevision(), "ivy", "ivy", "xml");
- return new File(_cache, file);
+ String file = IvyPatternHelper.substitute(settings.getCacheResolvedIvyPattern(), mrid.getOrganisation(), mrid.getName(), mrid.getRevision(), "ivy", "ivy", "xml");
+ return new File(cache, file);
}
public File getResolvedIvyPropertiesInCache(ModuleRevisionId mrid) {
- String file = IvyPatternHelper.substitute(_settings.getCacheResolvedIvyPropertiesPattern(), mrid.getOrganisation(), mrid.getName(), mrid.getRevision(), "ivy", "ivy", "xml");
- return new File(_cache, file);
+ String file = IvyPatternHelper.substitute(settings.getCacheResolvedIvyPropertiesPattern(), mrid.getOrganisation(), mrid.getName(), mrid.getRevision(), "ivy", "ivy", "xml");
+ return new File(cache, file);
}
public File getIvyFileInCache(ModuleRevisionId mrid) {
- String file = IvyPatternHelper.substitute(_settings.getCacheIvyPattern(), DefaultArtifact.newIvyArtifact(mrid, null));
- return new File(_cache, file);
+ String file = IvyPatternHelper.substitute(settings.getCacheIvyPattern(), DefaultArtifact.newIvyArtifact(mrid, null));
+ return new File(cache, file);
}
public File getConfigurationResolveReportInCache(String resolveId, String conf) {
- return new File(_cache, resolveId + "-" + conf + ".xml");
+ return new File(cache, resolveId + "-" + conf + ".xml");
}
public File[] getConfigurationResolveReportsInCache(final String resolveId) {
final String prefix = resolveId + "-";
final String suffix = ".xml";
- return _cache.listFiles(new FilenameFilter() {
+ return cache.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return (name.startsWith(prefix) && name.endsWith(suffix));
}
@@ -98,7 +97,7 @@
*
*/
public File getArchiveFileInCache(Artifact artifact, ArtifactOrigin origin) {
- File archive = new File(_cache, getArchivePathInCache(artifact, origin));
+ File archive = new File(cache, getArchivePathInCache(artifact, origin));
if (!archive.exists() && origin != null && origin.isLocal()) {
File original = new File(origin.getLocation());
if (original.exists()) {
@@ -119,17 +118,17 @@
if (useOrigin && origin != null && origin.isLocal()) {
return new File(origin.getLocation());
} else {
- return new File(_cache, getArchivePathInCache(artifact, origin));
+ return new File(cache, getArchivePathInCache(artifact, origin));
}
}
public String getArchivePathInCache(Artifact artifact) {
- return IvyPatternHelper.substitute(_settings.getCacheArtifactPattern(), artifact);
+ return IvyPatternHelper.substitute(settings.getCacheArtifactPattern(), artifact);
}
public String getArchivePathInCache(Artifact artifact, ArtifactOrigin origin) {
- return IvyPatternHelper.substitute(_settings.getCacheArtifactPattern(), artifact, origin);
+ return IvyPatternHelper.substitute(settings.getCacheArtifactPattern(), artifact, origin);
}
/**
@@ -233,29 +232,29 @@
}
private PropertiesFile getCachedDataFile(ModuleRevisionId mRevId) {
- return new PropertiesFile(new File(_cache, IvyPatternHelper.substitute(_settings.getCacheDataFilePattern(),mRevId)), "ivy cached data file for "+mRevId);
+ return new PropertiesFile(new File(cache, IvyPatternHelper.substitute(settings.getCacheDataFilePattern(),mRevId)), "ivy cached data file for "+mRevId);
}
public ResolvedModuleRevision findModuleInCache(ModuleRevisionId mrid, boolean validate) {
// first, check if it is in cache
- if (!_settings.getVersionMatcher().isDynamic(mrid)) {
+ if (!settings.getVersionMatcher().isDynamic(mrid)) {
File ivyFile = getIvyFileInCache(mrid);
if (ivyFile.exists()) {
// found in cache !
try {
- ModuleDescriptor depMD = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, ivyFile.toURL(), validate);
+ ModuleDescriptor depMD = XmlModuleDescriptorParser.getInstance().parseDescriptor(settings, ivyFile.toURL(), validate);
String resolverName = getSavedResolverName(depMD);
String artResolverName = getSavedArtResolverName(depMD);
- DependencyResolver resolver = _settings.getResolver(resolverName);
+ DependencyResolver resolver = settings.getResolver(resolverName);
if (resolver == null) {
Message.debug("\tresolver not found: "+resolverName+" => trying to use the one configured for "+mrid);
- resolver = _settings.getResolver(depMD.getResolvedModuleRevisionId().getModuleId());
+ resolver = settings.getResolver(depMD.getResolvedModuleRevisionId().getModuleId());
if (resolver != null) {
Message.debug("\tconfigured resolver found for "+depMD.getResolvedModuleRevisionId()+": "+resolver.getName()+": saving this data");
saveResolver(depMD, resolver.getName());
}
}
- DependencyResolver artResolver = _settings.getResolver(artResolverName);
+ DependencyResolver artResolver = settings.getResolver(artResolverName);
if (artResolver == null) {
artResolver = resolver;
}
@@ -278,11 +277,11 @@
public String toString() {
- return "cache: "+String.valueOf(_cache);
+ return "cache: "+String.valueOf(cache);
}
public File getCache() {
- return _cache;
+ return cache;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/check/CheckEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/check/CheckEngine.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/check/CheckEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/check/CheckEngine.java Tue Jun 5 04:12:14 2007
@@ -39,13 +39,13 @@
import org.apache.ivy.util.Message;
public class CheckEngine {
- private IvySettings _settings;
- private ResolveEngine _resolveEngine;
+ private IvySettings settings;
+ private ResolveEngine resolveEngine;
public CheckEngine(IvySettings settings, ResolveEngine resolveEngine) {
- _settings = settings;
- _resolveEngine = resolveEngine;
+ this.settings = settings;
+ this.resolveEngine = resolveEngine;
}
@@ -61,11 +61,11 @@
try {
boolean result = true;
// parse ivy file
- ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor(_settings, ivyFile, _settings.doValidate());
+ ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor(settings, ivyFile, settings.doValidate());
// check publications if possible
if (resolvername != null) {
- DependencyResolver resolver = _settings.getResolver(resolvername);
+ DependencyResolver resolver = settings.getResolver(resolvername);
String[] confs = md.getConfigurationsNames();
Set artifacts = new HashSet();
for (int i = 0; i < confs.length; i++) {
@@ -82,7 +82,7 @@
// check dependencies
DependencyDescriptor[] dds = md.getDependencies();
- ResolveData data = new ResolveData(_resolveEngine, new ResolveOptions().setCache(CacheManager.getInstance(_settings)));
+ ResolveData data = new ResolveData(resolveEngine, new ResolveOptions().setCache(CacheManager.getInstance(settings)));
for (int i = 0; i < dds.length; i++) {
// check master confs
String[] masterConfs = dds[i].getModuleConfigurations();
@@ -93,7 +93,7 @@
}
}
// resolve
- DependencyResolver resolver = _settings.getResolver(dds[i].getDependencyId());
+ DependencyResolver resolver = settings.getResolver(dds[i].getDependencyId());
ResolvedModuleRevision rmr = resolver.getDependency(dds[i], data);
if (rmr == null) {
Message.info("dependency not found in "+ivyFile+":\n\t"+dds[i]);
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverEngine.java Tue Jun 5 04:12:14 2007
@@ -44,10 +44,10 @@
import org.xml.sax.SAXException;
public class DeliverEngine {
- private IvySettings _settings;
+ private IvySettings settings;
public DeliverEngine(IvySettings settings) {
- _settings = settings;
+ this.settings = settings;
}
/**
@@ -91,7 +91,7 @@
Message.info(":: delivering :: "+mrid+" :: "+revision+" :: "+options.getStatus()+" :: "+options.getPubdate());
Message.verbose("\toptions = "+options);
long start = System.currentTimeMillis();
- destIvyPattern = _settings.substitute(destIvyPattern);
+ destIvyPattern = settings.substitute(destIvyPattern);
// 1) find the resolved module descriptor in cache
File ivyFile = options.getCache().getResolvedIvyFileInCache(mrid);
@@ -102,7 +102,7 @@
URL ivyFileURL = null;
try {
ivyFileURL = ivyFile.toURL();
- md = XmlModuleDescriptorParser.getInstance().parseDescriptor(_settings, ivyFileURL, options.isValidate());
+ md = XmlModuleDescriptorParser.getInstance().parseDescriptor(settings, ivyFileURL, options.isValidate());
md.setResolvedModuleRevisionId(ModuleRevisionId.newInstance(mrid, revision));
md.setResolvedPublicationDate(options.getPubdate());
} catch (MalformedURLException e) {
@@ -159,7 +159,7 @@
confsToRemove.removeAll(Arrays.asList(confs));
try {
- XmlModuleDescriptorUpdater.update(_settings, ivyFileURL,
+ XmlModuleDescriptorUpdater.update(settings, ivyFileURL,
new File(publishedIvy),
resolvedDependencies, options.getStatus(), revision, options.getPubdate(), null, true, (
String[]) confsToRemove.toArray(new String[confsToRemove.size()]));
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverOptions.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverOptions.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverOptions.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/deliver/DeliverOptions.java Tue Jun 5 04:12:14 2007
@@ -26,14 +26,14 @@
* A set of options used to do a deliver.
*/
public class DeliverOptions {
- private String _status;
- private Date _pubdate;
- private CacheManager _cache;
- private PublishingDependencyRevisionResolver _pdrResolver = new DefaultPublishingDRResolver();
- private boolean _validate = true;
- private boolean _resolveDynamicRevisions = true;
- private String _resolveId;
- private String[] _confs;
+ private String status;
+ private Date pubdate;
+ private CacheManager cache;
+ private PublishingDependencyRevisionResolver pdrResolver = new DefaultPublishingDRResolver();
+ private boolean validate = true;
+ private boolean resolveDynamicRevisions = true;
+ private String resolveId;
+ private String[] confs;
/**
* Returns an instance of DeliverOptions with options corresponding to default values
@@ -60,21 +60,21 @@
* Creates an instance of DeliverOptions with all options explicitly set.
*/
public DeliverOptions(String status, Date pubDate, CacheManager cache, PublishingDependencyRevisionResolver pdrResolver, boolean validate, boolean resolveDynamicRevisions, String[] confs) {
- _status = status;
- _pubdate = pubDate;
- _cache = cache;
- _pdrResolver = pdrResolver;
- _validate = validate;
- _resolveDynamicRevisions = resolveDynamicRevisions;
- _confs = confs;
+ this.status = status;
+ this.pubdate = pubDate;
+ this.cache = cache;
+ this.pdrResolver = pdrResolver;
+ this.validate = validate;
+ this.resolveDynamicRevisions = resolveDynamicRevisions;
+ this.confs = confs;
}
public CacheManager getCache() {
- return _cache;
+ return cache;
}
public DeliverOptions setCache(CacheManager cache) {
- _cache = cache;
+ this.cache = cache;
return this;
}
@@ -90,7 +90,7 @@
* @return the pdrResolver that will be used during deliver
*/
public PublishingDependencyRevisionResolver getPdrResolver() {
- return _pdrResolver;
+ return pdrResolver;
}
/**
@@ -106,34 +106,34 @@
* for easy method chaining
*/
public DeliverOptions setPdrResolver(PublishingDependencyRevisionResolver pdrResolver) {
- _pdrResolver = pdrResolver;
+ this.pdrResolver = pdrResolver;
return this;
}
public boolean isResolveDynamicRevisions() {
- return _resolveDynamicRevisions;
+ return resolveDynamicRevisions;
}
public DeliverOptions setResolveDynamicRevisions(boolean resolveDynamicRevisions) {
- _resolveDynamicRevisions = resolveDynamicRevisions;
+ this.resolveDynamicRevisions = resolveDynamicRevisions;
return this;
}
public boolean isValidate() {
- return _validate;
+ return validate;
}
public DeliverOptions setValidate(boolean validate) {
- _validate = validate;
+ this.validate = validate;
return this;
}
public Date getPubdate() {
- return _pubdate;
+ return pubdate;
}
public DeliverOptions setPubdate(Date pubdate) {
- _pubdate = pubdate;
+ this.pubdate = pubdate;
return this;
}
@@ -143,7 +143,7 @@
* @return the status to which the module should be delivered
*/
public String getStatus() {
- return _status;
+ return status;
}
/**
@@ -153,7 +153,7 @@
* for easy method chaining
*/
public DeliverOptions setStatus(String status) {
- _status = status;
+ this.status = status;
return this;
}
@@ -162,7 +162,7 @@
* @return the id of a previous resolve
*/
public String getResolveId() {
- return _resolveId;
+ return resolveId;
}
/**
@@ -172,7 +172,7 @@
* for easy method chaining
*/
public DeliverOptions setResolveId(String resolveId) {
- _resolveId = resolveId;
+ this.resolveId = resolveId;
return this;
}
@@ -182,7 +182,7 @@
* @return the configurations to deliver
*/
public String[] getConfs() {
- return _confs;
+ return confs;
}
/**
@@ -192,12 +192,12 @@
* for easy method chaining
*/
public DeliverOptions setConfs(String[] confs) {
- _confs = confs;
+ this.confs = confs;
return this;
}
public String toString() {
- return "status="+_status+" pubdate="+_pubdate+" validate="+_validate+" resolveDynamicRevisions="+_resolveDynamicRevisions+" cache="+_cache+" resolveId="+_resolveId;
+ return "status="+ status +" pubdate="+ pubdate +" validate="+ validate +" resolveDynamicRevisions="+ resolveDynamicRevisions +" cache="+ cache +" resolveId="+ resolveId;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/EventManager.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/EventManager.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/EventManager.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/EventManager.java Tue Jun 5 04:12:14 2007
@@ -27,10 +27,10 @@
public class EventManager implements TransferListener {
- private EventListenerList _listeners = new EventListenerList();
+ private EventListenerList listeners = new EventListenerList();
public void addIvyListener(IvyListener listener) {
- _listeners.add(IvyListener.class, listener);
+ listeners.add(IvyListener.class, listener);
}
public void addIvyListener(IvyListener listener, String eventName) {
@@ -38,26 +38,26 @@
}
public void addIvyListener(IvyListener listener, Filter filter) {
- _listeners.add(IvyListener.class, new FilteredIvyListener(listener, filter));
+ listeners.add(IvyListener.class, new FilteredIvyListener(listener, filter));
}
public void removeIvyListener(IvyListener listener) {
- _listeners.remove(IvyListener.class, listener);
- IvyListener[] listeners = (IvyListener[])_listeners.getListeners(IvyListener.class);
+ listeners.remove(IvyListener.class, listener);
+ IvyListener[] listeners = (IvyListener[]) this.listeners.getListeners(IvyListener.class);
for (int i = 0; i < listeners.length; i++) {
if (listeners[i] instanceof FilteredIvyListener) {
if (listener.equals(((FilteredIvyListener)listeners[i]).getIvyListener())) {
- _listeners.remove(IvyListener.class, listeners[i]);
+ this.listeners.remove(IvyListener.class, listeners[i]);
}
}
}
}
public boolean hasIvyListener(IvyListener listener) {
- return Arrays.asList(_listeners.getListeners(IvyListener.class)).contains(listener);
+ return Arrays.asList(listeners.getListeners(IvyListener.class)).contains(listener);
}
public void fireIvyEvent(IvyEvent evt) {
- Object[] listeners = _listeners.getListenerList();
+ Object[] listeners = this.listeners.getListenerList();
for (int i = listeners.length-2; i>=0; i-=2) {
if (listeners[i]==IvyListener.class) {
((IvyListener)listeners[i+1]).progress(evt);
@@ -66,18 +66,18 @@
}
public void addTransferListener(TransferListener listener) {
- _listeners.add(TransferListener.class, listener);
+ listeners.add(TransferListener.class, listener);
}
public void removeTransferListener(TransferListener listener) {
- _listeners.remove(TransferListener.class, listener);
+ listeners.remove(TransferListener.class, listener);
}
public boolean hasTransferListener(TransferListener listener) {
- return Arrays.asList(_listeners.getListeners(TransferListener.class)).contains(listener);
+ return Arrays.asList(listeners.getListeners(TransferListener.class)).contains(listener);
}
protected void fireTransferEvent(TransferEvent evt) {
- Object[] listeners = _listeners.getListenerList();
+ Object[] listeners = this.listeners.getListenerList();
for (int i = listeners.length-2; i>=0; i-=2) {
if (listeners[i]==TransferListener.class) {
((TransferListener)listeners[i+1]).transferProgress(evt);
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/FilteredIvyListener.java Tue Jun 5 04:12:14 2007
@@ -20,25 +20,25 @@
import org.apache.ivy.util.filter.Filter;
public class FilteredIvyListener implements IvyListener {
- private IvyListener _listener;
- private Filter _filter;
+ private IvyListener listener;
+ private Filter filter;
public FilteredIvyListener(IvyListener listener, Filter filter) {
- _listener = listener;
- _filter = filter;
+ this.listener = listener;
+ this.filter = filter;
}
public IvyListener getIvyListener() {
- return _listener;
+ return listener;
}
public Filter getFilter() {
- return _filter;
+ return filter;
}
public void progress(IvyEvent event) {
- if (_filter.accept(event)) {
- _listener.progress(event);
+ if (filter.accept(event)) {
+ listener.progress(event);
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEvent.java Tue Jun 5 04:12:14 2007
@@ -50,13 +50,13 @@
*
*/
public class IvyEvent {
- private EventManager _source;
- private String _name;
- private Map _attributes = new HashMap();
+ private EventManager source;
+ private String name;
+ private Map attributes = new HashMap();
protected IvyEvent(String name) {
- _source = IvyContext.getContext().getEventManager();
- _name = name;
+ this.source = IvyContext.getContext().getEventManager();
+ this.name = name;
}
/**
@@ -65,7 +65,7 @@
* @param value
*/
protected void addAttribute(String key, String value) {
- _attributes.put(key, value);
+ attributes.put(key, value);
}
protected void addMDAttributes(ModuleDescriptor md) {
addMridAttributes(md.getResolvedModuleRevisionId());
@@ -87,16 +87,16 @@
}
protected void addAttributes(Map attributes) {
- _attributes.putAll(attributes);
+ this.attributes.putAll(attributes);
}
public EventManager getSource() {
- return _source;
+ return source;
}
public String getName() {
- return _name;
+ return name;
}
/**
@@ -104,7 +104,7 @@
* @return the attributes of this event, as a Map(String->String)
*/
public Map getAttributes() {
- return new HashMap(_attributes);
+ return new HashMap(attributes);
}
public String toString() {
@@ -119,14 +119,14 @@
return getSource().equals(e.getSource())
&& getName().equals(e.getName())
- && _attributes.equals(e._attributes);
+ && attributes.equals(e.attributes);
}
public int hashCode() {
int hash = 37;
hash = 13 * hash + getSource().hashCode();
hash = 13 * hash + getName().hashCode();
- hash = 13 * hash + _attributes.hashCode();
+ hash = 13 * hash + attributes.hashCode();
return hash;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/IvyEventFilter.java Tue Jun 5 04:12:14 2007
@@ -60,24 +60,24 @@
private static final String NOT = "NOT ";
private static final String OR = " OR ";
private static final String AND = " AND ";
- private PatternMatcher _matcher;
- private Filter _nameFilter;
- private Filter _attFilter;
+ private PatternMatcher matcher;
+ private Filter nameFilter;
+ private Filter attFilter;
public IvyEventFilter(String event, String filterExpression, PatternMatcher matcher) {
- _matcher = matcher == null ? ExactPatternMatcher.INSTANCE : matcher;
+ this.matcher = matcher == null ? ExactPatternMatcher.INSTANCE : matcher;
if (event == null) {
- _nameFilter = NoFilter.INSTANCE;
+ nameFilter = NoFilter.INSTANCE;
} else {
- final Matcher eventNameMatcher = _matcher.getMatcher(event);
- _nameFilter = new Filter() {
+ final Matcher eventNameMatcher = this.matcher.getMatcher(event);
+ nameFilter = new Filter() {
public boolean accept(Object o) {
IvyEvent e = (IvyEvent) o;
return eventNameMatcher.matches(e.getName());
}
};
}
- _attFilter = filterExpression == null || filterExpression.trim().length() == 0 ?
+ attFilter = filterExpression == null || filterExpression.trim().length() == 0 ?
NoFilter.INSTANCE
: parseExpression(filterExpression);
}
@@ -106,7 +106,7 @@
String[] values = filterExpression.substring(index+1).trim().split(",");
final Matcher[] matchers = new Matcher[values.length];
for (int i = 0; i < values.length; i++) {
- matchers[i] = _matcher.getMatcher(values[i].trim());
+ matchers[i] = matcher.getMatcher(values[i].trim());
}
return new Filter() {
public boolean accept(Object o) {
@@ -136,7 +136,7 @@
if (! (o instanceof IvyEvent)) {
return false;
}
- return _nameFilter.accept(o) && _attFilter.accept(o);
+ return nameFilter.accept(o) && attFilter.accept(o);
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/DownloadEvent.java Tue Jun 5 04:12:14 2007
@@ -21,12 +21,12 @@
import org.apache.ivy.core.module.descriptor.Artifact;
public abstract class DownloadEvent extends IvyEvent {
- private Artifact _artifact;
+ private Artifact artifact;
public DownloadEvent(String name, Artifact artifact) {
super(name);
- _artifact = artifact;
- addArtifactAttributes(_artifact);
+ this.artifact = artifact;
+ addArtifactAttributes(this.artifact);
}
protected void addArtifactAttributes(Artifact artifact) {
@@ -35,7 +35,7 @@
}
public Artifact getArtifact() {
- return _artifact;
+ return artifact;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/EndArtifactDownloadEvent.java Tue Jun 5 04:12:14 2007
@@ -28,21 +28,21 @@
public class EndArtifactDownloadEvent extends DownloadEvent {
public static final String NAME = "post-download-artifact";
- private DependencyResolver _resolver;
- private ArtifactDownloadReport _report;
+ private DependencyResolver resolver;
+ private ArtifactDownloadReport report;
public EndArtifactDownloadEvent(DependencyResolver resolver, Artifact artifact, ArtifactDownloadReport report, File dest) {
super(NAME, artifact);
- _resolver = resolver;
- _report = report;
- addAttribute("resolver", _resolver.getName());
- addAttribute("status", _report.getDownloadStatus().toString());
- addAttribute("size", String.valueOf(_report.getSize()));
+ this.resolver = resolver;
+ this.report = report;
+ addAttribute("resolver", this.resolver.getName());
+ addAttribute("status", this.report.getDownloadStatus().toString());
+ addAttribute("size", String.valueOf(this.report.getSize()));
addAttribute("file", dest.getAbsolutePath());
ArtifactOrigin origin = report.getArtifactOrigin();
if (origin != null) {
- addAttribute("origin", _report.getArtifactOrigin().getLocation());
- addAttribute("local", String.valueOf(_report.getArtifactOrigin().isLocal()));
+ addAttribute("origin", this.report.getArtifactOrigin().getLocation());
+ addAttribute("local", String.valueOf(this.report.getArtifactOrigin().isLocal()));
} else {
addAttribute("origin", "");
addAttribute("local", "");
@@ -50,11 +50,11 @@
}
public ArtifactDownloadReport getReport() {
- return _report;
+ return report;
}
public DependencyResolver getResolver() {
- return _resolver;
+ return resolver;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/NeedArtifactEvent.java Tue Jun 5 04:12:14 2007
@@ -23,16 +23,16 @@
public class NeedArtifactEvent extends DownloadEvent {
public static final String NAME = "need-artifact";
- private DependencyResolver _resolver;
+ private DependencyResolver resolver;
public NeedArtifactEvent(DependencyResolver resolver, Artifact artifact) {
super(NAME, artifact);
- _resolver = resolver;
- addAttribute("resolver", _resolver.getName());
+ this.resolver = resolver;
+ addAttribute("resolver", this.resolver.getName());
}
public DependencyResolver getResolver() {
- return _resolver;
+ return resolver;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/PrepareDownloadEvent.java Tue Jun 5 04:12:14 2007
@@ -22,14 +22,14 @@
public class PrepareDownloadEvent extends IvyEvent {
public static final String NAME = "prepare-download";
- private Artifact[] _artifacts;
+ private Artifact[] artifacts;
public PrepareDownloadEvent(Artifact[] artifacts) {
super(NAME);
- _artifacts = artifacts;
+ this.artifacts = artifacts;
}
public Artifact[] getArtifacts() {
- return _artifacts;
+ return artifacts;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/download/StartArtifactDownloadEvent.java Tue Jun 5 04:12:14 2007
@@ -24,24 +24,24 @@
public class StartArtifactDownloadEvent extends DownloadEvent {
public static final String NAME = "pre-download-artifact";
- private DependencyResolver _resolver;
- private ArtifactOrigin _origin;
+ private DependencyResolver resolver;
+ private ArtifactOrigin origin;
public StartArtifactDownloadEvent(DependencyResolver resolver, Artifact artifact, ArtifactOrigin origin) {
super(NAME, artifact);
- _resolver = resolver;
- _origin = origin;
- addAttribute("resolver", _resolver.getName());
+ this.resolver = resolver;
+ this.origin = origin;
+ addAttribute("resolver", this.resolver.getName());
addAttribute("origin", origin.getLocation());
addAttribute("local", String.valueOf(origin.isLocal()));
}
public DependencyResolver getResolver() {
- return _resolver;
+ return resolver;
}
public ArtifactOrigin getOrigin() {
- return _origin;
+ return origin;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveDependencyEvent.java Tue Jun 5 04:12:14 2007
@@ -23,14 +23,14 @@
public class EndResolveDependencyEvent extends ResolveDependencyEvent {
public static final String NAME = "post-resolve-dependency";
- private ResolvedModuleRevision _module;
+ private ResolvedModuleRevision module;
public EndResolveDependencyEvent(DependencyResolver resolver, DependencyDescriptor dd, ResolvedModuleRevision module) {
super(NAME, resolver, dd);
- _module = module;
- if (_module != null) {
+ this.module = module;
+ if (this.module != null) {
// override revision from the dependency descriptor
- addAttribute("revision", _module.getDescriptor().getResolvedModuleRevisionId().getRevision());
+ addAttribute("revision", this.module.getDescriptor().getResolvedModuleRevisionId().getRevision());
addAttribute("resolved", "true");
} else {
addAttribute("resolved", "false");
@@ -38,7 +38,7 @@
}
public ResolvedModuleRevision getModule() {
- return _module;
+ return module;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/EndResolveEvent.java Tue Jun 5 04:12:14 2007
@@ -23,15 +23,15 @@
public class EndResolveEvent extends ResolveEvent {
public static final String NAME = "post-resolve";
- private ResolveReport _report;
+ private ResolveReport report;
public EndResolveEvent(ModuleDescriptor md, String[] confs, ResolveReport report) {
super(NAME, md, confs);
- _report = report;
+ this.report = report;
}
public ResolveReport getReport() {
- return _report;
+ return report;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveDependencyEvent.java Tue Jun 5 04:12:14 2007
@@ -22,24 +22,24 @@
import org.apache.ivy.plugins.resolver.DependencyResolver;
public class ResolveDependencyEvent extends IvyEvent {
- private DependencyResolver _resolver;
- private DependencyDescriptor _dd;
+ private DependencyResolver resolver;
+ private DependencyDescriptor dd;
protected ResolveDependencyEvent(String name, DependencyResolver resolver, DependencyDescriptor dd) {
super(name);
- _resolver = resolver;
- _dd = dd;
- addAttribute("resolver", _resolver.getName());
- addMridAttributes(_dd.getDependencyRevisionId());
- addAttributes(_dd.getExtraAttributes());
+ this.resolver = resolver;
+ this.dd = dd;
+ addAttribute("resolver", this.resolver.getName());
+ addMridAttributes(this.dd.getDependencyRevisionId());
+ addAttributes(this.dd.getExtraAttributes());
}
public DependencyDescriptor getDependencyDescriptor() {
- return _dd;
+ return dd;
}
public DependencyResolver getResolver() {
- return _resolver;
+ return resolver;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/event/resolve/ResolveEvent.java Tue Jun 5 04:12:14 2007
@@ -21,18 +21,18 @@
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
public class ResolveEvent extends IvyEvent {
- private ModuleDescriptor _md;
- private String[] _confs;
+ private ModuleDescriptor md;
+ private String[] confs;
protected ResolveEvent(String name, ModuleDescriptor md, String[] confs) {
super(name);
- _md = md;
- _confs = confs;
+ this.md = md;
+ this.confs = confs;
addMDAttributes(md);
addConfsAttribute(confs);
}
public ModuleDescriptor getModuleDescriptor() {
- return _md;
+ return md;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/install/InstallEngine.java Tue Jun 5 04:12:14 2007
@@ -50,47 +50,47 @@
import org.apache.ivy.util.filter.FilterHelper;
public class InstallEngine {
- private IvySettings _settings;
- private ResolveEngine _resolveEngine;
- private PublishEngine _publishEngine;
- private SearchEngine _searchEngine;
+ private IvySettings settings;
+ private ResolveEngine resolveEngine;
+ private PublishEngine publishEngine;
+ private SearchEngine searchEngine;
public InstallEngine(IvySettings settings, SearchEngine searchEngine, ResolveEngine resolveEngine, PublishEngine publishEngine) {
- _settings = settings;
- _searchEngine = searchEngine;
- _resolveEngine = resolveEngine;
- _publishEngine = publishEngine;
+ this.settings = settings;
+ this.searchEngine = searchEngine;
+ this.resolveEngine = resolveEngine;
+ this.publishEngine = publishEngine;
}
public ResolveReport install(ModuleRevisionId mrid, String from, String to, boolean transitive, boolean validate, boolean overwrite, Filter artifactFilter, File cache, String matcherName) throws IOException {
if (cache == null) {
- cache = _settings.getDefaultCache();
+ cache = settings.getDefaultCache();
}
if (artifactFilter == null) {
artifactFilter = FilterHelper.NO_FILTER;
}
- DependencyResolver fromResolver = _settings.getResolver(from);
- DependencyResolver toResolver = _settings.getResolver(to);
+ DependencyResolver fromResolver = settings.getResolver(from);
+ DependencyResolver toResolver = settings.getResolver(to);
if (fromResolver == null) {
- throw new IllegalArgumentException("unknown resolver "+from+". Available resolvers are: "+_settings.getResolverNames());
+ throw new IllegalArgumentException("unknown resolver "+from+". Available resolvers are: "+ settings.getResolverNames());
}
if (toResolver == null) {
- throw new IllegalArgumentException("unknown resolver "+to+". Available resolvers are: "+_settings.getResolverNames());
+ throw new IllegalArgumentException("unknown resolver "+to+". Available resolvers are: "+ settings.getResolverNames());
}
- PatternMatcher matcher = _settings.getMatcher(matcherName);
+ PatternMatcher matcher = settings.getMatcher(matcherName);
if (matcher == null) {
- throw new IllegalArgumentException("unknown matcher "+matcherName+". Available matchers are: "+_settings.getMatcherNames());
+ throw new IllegalArgumentException("unknown matcher "+matcherName+". Available matchers are: "+ settings.getMatcherNames());
}
// build module file declaring the dependency
Message.info(":: installing "+mrid+" ::");
- DependencyResolver oldDicator = _resolveEngine.getDictatorResolver();
- boolean log = _settings.logNotConvertedExclusionRule();
+ DependencyResolver oldDicator = resolveEngine.getDictatorResolver();
+ boolean log = settings.logNotConvertedExclusionRule();
try {
- _settings.setLogNotConvertedExclusionRule(true);
- _resolveEngine.setDictatorResolver(fromResolver);
+ settings.setLogNotConvertedExclusionRule(true);
+ resolveEngine.setDictatorResolver(fromResolver);
- DefaultModuleDescriptor md = new DefaultModuleDescriptor(ModuleRevisionId.newInstance("apache", "ivy-install", "1.0"), _settings.getStatusManager().getDefaultStatus(), new Date());
+ DefaultModuleDescriptor md = new DefaultModuleDescriptor(ModuleRevisionId.newInstance("apache", "ivy-install", "1.0"), settings.getStatusManager().getDefaultStatus(), new Date());
String resolveId = ResolveOptions.getDefaultResolveId(md);
md.addConfiguration(new Configuration("default"));
md.addConflictManager(new ModuleId(ExactPatternMatcher.ANY_EXPRESSION, ExactPatternMatcher.ANY_EXPRESSION), ExactPatternMatcher.INSTANCE, new NoConflictManager());
@@ -100,7 +100,7 @@
dd.addDependencyConfiguration("default", "*");
md.addDependency(dd);
} else {
- Collection mrids = _searchEngine.findModuleRevisionIds(fromResolver, mrid, matcher);
+ Collection mrids = searchEngine.findModuleRevisionIds(fromResolver, mrid, matcher);
for (Iterator iter = mrids.iterator(); iter.hasNext();) {
ModuleRevisionId foundMrid = (ModuleRevisionId)iter.next();
@@ -115,17 +115,17 @@
ResolveReport report = new ResolveReport(md, resolveId);
Message.info(":: resolving dependencies ::");
- IvyNode[] dependencies = _resolveEngine.getDependencies(
+ IvyNode[] dependencies = resolveEngine.getDependencies(
md,
new ResolveOptions()
.setResolveId(resolveId)
.setConfs(new String[] {"default"})
- .setCache(CacheManager.getInstance(_settings, cache)),
+ .setCache(CacheManager.getInstance(settings, cache)),
report);
report.setDependencies(Arrays.asList(dependencies), artifactFilter);
Message.info(":: downloading artifacts to cache ::");
- _resolveEngine.downloadArtifacts(report, getCacheManager(cache), false, artifactFilter);
+ resolveEngine.downloadArtifacts(report, getCacheManager(cache), false, artifactFilter);
// now that everything is in cache, we can publish all these modules
Message.info(":: installing in "+to+" ::");
@@ -133,12 +133,12 @@
ModuleDescriptor depmd = dependencies[i].getDescriptor();
if (depmd != null) {
Message.verbose("installing "+depmd.getModuleRevisionId());
- _publishEngine.publish(
+ publishEngine.publish(
depmd,
- Collections.singleton(cache.getAbsolutePath()+"/"+_settings.getCacheArtifactPattern()),
+ Collections.singleton(cache.getAbsolutePath()+"/"+ settings.getCacheArtifactPattern()),
toResolver,
new PublishOptions()
- .setSrcIvyPattern(cache.getAbsolutePath()+"/"+_settings.getCacheIvyPattern())
+ .setSrcIvyPattern(cache.getAbsolutePath()+"/"+ settings.getCacheIvyPattern())
.setOverwrite(overwrite));
}
}
@@ -146,18 +146,18 @@
Message.info(":: install resolution report ::");
// output report
- report.output(_settings.getReportOutputters(), cache);
+ report.output(settings.getReportOutputters(), cache);
return report;
} finally {
- _resolveEngine.setDictatorResolver(oldDicator);
- _settings.setLogNotConvertedExclusionRule(log);
+ resolveEngine.setDictatorResolver(oldDicator);
+ settings.setLogNotConvertedExclusionRule(log);
}
}
private CacheManager getCacheManager(File cache) {
//TODO : reuse instance
- CacheManager cacheManager = new CacheManager(_settings, cache);
+ CacheManager cacheManager = new CacheManager(settings, cache);
return cacheManager;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/AbstractIncludeExcludeRule.java Tue Jun 5 04:12:14 2007
@@ -35,24 +35,24 @@
public abstract class AbstractIncludeExcludeRule extends UnmodifiableExtendableItem
implements ConfigurationAware {
- private ArtifactId _id;
- private Collection _confs = new ArrayList();
- private PatternMatcher _patternMatcher;
+ private ArtifactId id;
+ private Collection confs = new ArrayList();
+ private PatternMatcher patternMatcher;
public AbstractIncludeExcludeRule(ArtifactId aid, PatternMatcher matcher, Map extraAttributes) {
super(null, extraAttributes);
- _id = aid;
- _patternMatcher = matcher;
+ id = aid;
+ patternMatcher = matcher;
initStandardAttributes();
}
private void initStandardAttributes() {
- setStandardAttribute(IvyPatternHelper.ORGANISATION_KEY, _id.getModuleId().getOrganisation());
- setStandardAttribute(IvyPatternHelper.MODULE_KEY, _id.getModuleId().getName());
- setStandardAttribute(IvyPatternHelper.ARTIFACT_KEY, _id.getName());
- setStandardAttribute(IvyPatternHelper.TYPE_KEY, _id.getType());
- setStandardAttribute(IvyPatternHelper.EXT_KEY, _id.getExt());
- setStandardAttribute("matcher", _patternMatcher.getName());
+ setStandardAttribute(IvyPatternHelper.ORGANISATION_KEY, id.getModuleId().getOrganisation());
+ setStandardAttribute(IvyPatternHelper.MODULE_KEY, id.getModuleId().getName());
+ setStandardAttribute(IvyPatternHelper.ARTIFACT_KEY, id.getName());
+ setStandardAttribute(IvyPatternHelper.TYPE_KEY, id.getType());
+ setStandardAttribute(IvyPatternHelper.EXT_KEY, id.getExt());
+ setStandardAttribute("matcher", patternMatcher.getName());
}
public boolean equals(Object obj) {
@@ -72,22 +72,22 @@
* @param conf
*/
public void addConfiguration(String conf) {
- _confs.add(conf);
+ confs.add(conf);
}
public ArtifactId getId() {
- return _id;
+ return id;
}
public String[] getConfigurations() {
- return (String[])_confs.toArray(new String[_confs.size()]);
+ return (String[]) confs.toArray(new String[confs.size()]);
}
public PatternMatcher getMatcher() {
- return _patternMatcher;
+ return patternMatcher;
}
public String toString() {
- return _id+"("+_confs+")";
+ return id +"("+ confs +")";
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java Tue Jun 5 04:12:14 2007
@@ -40,20 +40,20 @@
throw new IllegalArgumentException("unknwon visibility "+name);
}
}
- private String _name;
+ private String name;
private Visibility(String name) {
- _name = name;
+ this.name = name;
}
public String toString() {
- return _name;
+ return name;
}
}
- private String _name;
- private String _description;
+ private String name;
+ private String description;
private String[] _extends;
- private Visibility _visibility;
- private boolean _transitive = true;
+ private Visibility visibility;
+ private boolean transitive = true;
/**
* @param name
@@ -81,9 +81,9 @@
if (visibility == null) {
throw new NullPointerException("null visibility not allowed");
}
- _name = name;
- _visibility = visibility;
- _description = description;
+ this.name = name;
+ this.visibility = visibility;
+ this.description = description;
if (ext == null) {
_extends = new String[0];
} else {
@@ -92,7 +92,7 @@
_extends[i] = ext[i].trim();
}
}
- _transitive=transitive;
+ this.transitive =transitive;
}
/**
@@ -106,7 +106,7 @@
* @return Returns the description. It may be null.
*/
public String getDescription() {
- return _description;
+ return description;
}
/**
* @return Returns the extends. May be empty, but never null.
@@ -118,24 +118,24 @@
* @return Returns the name. Never null;
*/
public String getName() {
- return _name;
+ return name;
}
/**
* @return Returns the visibility. Never null.
*/
public Visibility getVisibility() {
- return _visibility;
+ return visibility;
}
/**
* @return Returns the transitive.
*/
public final boolean isTransitive() {
- return _transitive;
+ return transitive;
}
public String toString() {
- return _name;
+ return name;
}
public boolean equals(Object obj) {
@@ -150,7 +150,7 @@
}
public void replaceWildcards(ModuleDescriptor md) {
- if (this != md.getConfiguration(_name)) {
+ if (this != md.getConfiguration(name)) {
throw new IllegalArgumentException(
"The given ModuleDescriptor doesn't own this configuration!");
}
@@ -176,7 +176,7 @@
private void addOther(Configuration[] allConfigs, Visibility visibility, Set configs) {
for (int i = 0; i < allConfigs.length; i++) {
String currentName = allConfigs[i].getName();
- if (!_name.equals(currentName)
+ if (!name.equals(currentName)
&& ((visibility == null) || visibility.equals(allConfigs[i].getVisibility()))) {
configs.add(currentName);
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultArtifact.java Tue Jun 5 04:12:14 2007
@@ -49,9 +49,9 @@
return new DefaultArtifact(mrid, artifact.getPublicationDate(), artifact.getName(), artifact.getType(), artifact.getExt(), artifact.getUrl(), artifact.getExtraAttributes());
}
- Date _publicationDate;
- ArtifactRevisionId _arid;
- URL _url;
+ Date publicationDate;
+ ArtifactRevisionId arid;
+ URL url;
public DefaultArtifact(ModuleRevisionId mrid, Date publicationDate, String name, String type, String ext) {
this(mrid, publicationDate, name, type, ext, null, null);
@@ -76,29 +76,29 @@
if (ext == null) {
throw new NullPointerException("null ext not allowed");
}
- _publicationDate = publicationDate;
- _arid = ArtifactRevisionId.newInstance(mrid, name, type, ext, extraAttributes);
- _url = url;
+ this.publicationDate = publicationDate;
+ this.arid = ArtifactRevisionId.newInstance(mrid, name, type, ext, extraAttributes);
+ this.url = url;
}
public ModuleRevisionId getModuleRevisionId() {
- return _arid.getModuleRevisionId();
+ return arid.getModuleRevisionId();
}
public String getName() {
- return _arid.getName();
+ return arid.getName();
}
public Date getPublicationDate() {
- return _publicationDate;
+ return publicationDate;
}
public String getType() {
- return _arid.getType();
+ return arid.getType();
}
public String getExt() {
- return _arid.getExt();
+ return arid.getExt();
}
public ArtifactRevisionId getId() {
- return _arid;
+ return arid;
}
public String[] getConfigurations() {
@@ -106,7 +106,7 @@
}
public URL getUrl() {
- return _url;
+ return url;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyArtifactDescriptor.java Tue Jun 5 04:12:14 2007
@@ -29,11 +29,11 @@
public class DefaultDependencyArtifactDescriptor extends UnmodifiableExtendableItem
implements DependencyArtifactDescriptor, ConfigurationAware {
- private Collection _confs = new ArrayList();
- private URL _url;
- private String _name;
- private String _type;
- private String _ext;
+ private Collection confs = new ArrayList();
+ private URL url;
+ private String name;
+ private String type;
+ private String ext;
/**
* @param dd
@@ -53,10 +53,10 @@
if (ext == null) {
throw new NullPointerException("ext must not be null");
}
- _name = name;
- _type = type;
- _ext = ext;
- _url = url;
+ this.name = name;
+ this.type = type;
+ this.ext = ext;
+ this.url = url;
initStandardAttributes();
}
@@ -64,7 +64,7 @@
setStandardAttribute(IvyPatternHelper.ARTIFACT_KEY, getName());
setStandardAttribute(IvyPatternHelper.TYPE_KEY, getType());
setStandardAttribute(IvyPatternHelper.EXT_KEY, getExt());
- setStandardAttribute("url", _url != null ? String.valueOf(_url) : "");
+ setStandardAttribute("url", url != null ? String.valueOf(url) : "");
}
public boolean equals(Object obj) {
@@ -84,30 +84,30 @@
* @param conf
*/
public void addConfiguration(String conf) {
- _confs.add(conf);
+ confs.add(conf);
}
public String getName() {
- return _name;
+ return name;
}
public String getType() {
- return _type;
+ return type;
}
public String getExt() {
- return _ext;
+ return ext;
}
public String[] getConfigurations() {
- return (String[])_confs.toArray(new String[_confs.size()]);
+ return (String[]) confs.toArray(new String[confs.size()]);
}
public URL getUrl() {
- return _url;
+ return url;
}
public String toString() {
- return "DA:"+_name+"."+_ext+"("+_type+") "+"("+_confs+")"+(_url==null?"":_url.toString());
+ return "DA:"+ name +"."+ ext +"("+ type +") "+"("+ confs +")"+(url ==null?"": url.toString());
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/License.java Tue Jun 5 04:12:14 2007
@@ -18,19 +18,19 @@
package org.apache.ivy.core.module.descriptor;
public class License {
- private String _name;
- private String _url;
+ private String name;
+ private String url;
public License(String name, String url) {
- _name = name;
- _url = url;
+ this.name = name;
+ this.url = url;
}
public String getName() {
- return _name;
+ return name;
}
public String getUrl() {
- return _url;
+ return url;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java Tue Jun 5 04:12:14 2007
@@ -35,14 +35,14 @@
return new MDArtifact(md, "ivy", "ivy", "xml");
}
- private ModuleDescriptor _md;
- private String _name;
- private String _type;
- private String _ext;
- private List _confs = new ArrayList();
- private ArtifactRevisionId _arid;
- private Map _extraAttributes = null;
- private URL _url;
+ private ModuleDescriptor md;
+ private String name;
+ private String type;
+ private String ext;
+ private List confs = new ArrayList();
+ private ArtifactRevisionId arid;
+ private Map extraAttributes = null;
+ private URL url;
public MDArtifact(ModuleDescriptor md, String name, String type, String ext) {
this(md, name, type, ext, null, null);
@@ -60,50 +60,50 @@
if (ext == null) {
throw new NullPointerException("null ext not allowed");
}
- _md = md;
- _name = name;
- _type = type;
- _ext = ext;
- _url = url;
- _extraAttributes = extraAttributes;
+ this.md = md;
+ this.name = name;
+ this.type = type;
+ this.ext = ext;
+ this.url = url;
+ this.extraAttributes = extraAttributes;
}
public ModuleRevisionId getModuleRevisionId() {
- return _md.getResolvedModuleRevisionId();
+ return md.getResolvedModuleRevisionId();
}
public Date getPublicationDate() {
- return _md.getResolvedPublicationDate();
+ return md.getResolvedPublicationDate();
}
public ArtifactRevisionId getId() {
- if (_arid == null) {
- _arid = ArtifactRevisionId.newInstance(_md.getResolvedModuleRevisionId(), _name, _type, _ext, _extraAttributes);
+ if (arid == null) {
+ arid = ArtifactRevisionId.newInstance(md.getResolvedModuleRevisionId(), name, type, ext, extraAttributes);
}
- return _arid;
+ return arid;
}
public String getName() {
- return _name;
+ return name;
}
public String getType() {
- return _type;
+ return type;
}
public String getExt() {
- return _ext;
+ return ext;
}
public String[] getConfigurations() {
- return (String[])_confs.toArray(new String[_confs.size()]);
+ return (String[]) confs.toArray(new String[confs.size()]);
}
public void addConfiguration(String conf) {
- _confs.add(conf);
+ confs.add(conf);
}
public URL getUrl() {
- return _url;
+ return url;
}
}
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=544446&r1=544445&r2=544446
==============================================================================
--- 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 Tue Jun 5 04:12:14 2007
@@ -21,10 +21,10 @@
* Identifies an artifact in a module, without revision information
*/
public class ArtifactId {
- private ModuleId _mid;
- private String _name;
- private String _type;
- private String _ext;
+ private ModuleId mid;
+ private String name;
+ private String type;
+ private String ext;
/**
@@ -33,10 +33,10 @@
* @param type
*/
public ArtifactId(ModuleId mid, String name, String type, String ext) {
- _mid = mid;
- _name = name;
- _type = type;
- _ext = ext;
+ this.mid = mid;
+ this.name = name;
+ this.type = type;
+ this.ext = ext;
}
public boolean equals(Object obj) {
@@ -66,24 +66,24 @@
* @return Returns the module id.
*/
public ModuleId getModuleId() {
- return _mid;
+ return mid;
}
/**
* @return Returns the name.
*/
public String getName() {
- return _name;
+ return name;
}
/**
* @return Returns the type.
*/
public String getType() {
- return _type;
+ return type;
}
/**
* @return Returns the ext.
*/
public String getExt() {
- return _ext;
+ return ext;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleId.java Tue Jun 5 04:12:14 2007
@@ -23,24 +23,24 @@
*/
public class ModuleId implements Comparable {
static final String ENCODE_SEPARATOR = ":#@#:";
- private String _organisation;
- private String _name;
- private int _hash;
+ private String organisation;
+ private String name;
+ private int hash;
public ModuleId(String organisation, String name) {
if (name == null) {
throw new IllegalArgumentException("null name not allowed");
}
- _organisation = organisation;
- _name = name;
- _hash = _hashCode(); //stored for performance reasons, hashCode is very used in many maps
+ this.organisation = organisation;
+ this.name = name;
+ hash = _hashCode(); //stored for performance reasons, hashCode is very used in many maps
}
public String getName() {
- return _name;
+ return name;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public boolean equals(Object obj) {
@@ -48,30 +48,30 @@
return false;
}
ModuleId other = (ModuleId)obj;
- if (other._organisation == null) {
- return _organisation == null && other._name.equals(_name);
+ if (other.organisation == null) {
+ return organisation == null && other.name.equals(name);
} else {
- return other._organisation.equals(_organisation) && other._name.equals(_name);
+ return other.organisation.equals(organisation) && other.name.equals(name);
}
}
public int hashCode() {
- return _hash;
+ return hash;
}
public int _hashCode() {
int hash = 31;
- hash = hash * 13 + (_organisation == null ? 0 : _organisation.hashCode());
- hash = hash * 13 + _name.hashCode();
+ hash = hash * 13 + (organisation == null ? 0 : organisation.hashCode());
+ hash = hash * 13 + name.hashCode();
return hash;
}
public String toString() {
- return "[ "+_organisation+" | "+_name+" ]";
+ return "[ "+ organisation +" | "+ name +" ]";
}
public int compareTo(Object obj) {
ModuleId that = (ModuleId)obj;
- int result = _organisation.compareTo(that._organisation);
+ int result = organisation.compareTo(that.organisation);
if (result == 0) {
- result = _name.compareTo(that._name);
+ result = name.compareTo(that.name);
}
return result;
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java?view=diff&rev=544446&r1=544445&r2=544446
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java Tue Jun 5 04:12:14 2007
@@ -52,10 +52,10 @@
return new ModuleRevisionId(mrid.getModuleId(), mrid.getBranch(), rev, mrid.getExtraAttributes());
}
- private ModuleId _moduleId;
- private String _branch;
- private String _revision;
- private int _hash;
+ private ModuleId moduleId;
+ private String branch;
+ private String revision;
+ private int hash;
public ModuleRevisionId(ModuleId moduleId, String revision) {
this(moduleId, null, revision, null);
@@ -68,18 +68,18 @@
}
public ModuleRevisionId(ModuleId moduleId, String branch, String revision, Map extraAttributes) {
super(null, extraAttributes);
- _moduleId = moduleId;
- _branch = branch == null ? IvyContext.getContext().getSettings().getDefaultBranch(moduleId) : branch;
- _revision = revision == null ? Ivy.getWorkingRevision() : revision;
- _hash = _hashCode(); //stored for performance reasons, hashCode is very used in many maps
- setStandardAttribute(IvyPatternHelper.ORGANISATION_KEY, _moduleId.getOrganisation());
- setStandardAttribute(IvyPatternHelper.MODULE_KEY, _moduleId.getName());
- setStandardAttribute(IvyPatternHelper.BRANCH_KEY, _branch);
- setStandardAttribute(IvyPatternHelper.REVISION_KEY, _revision);
+ this.moduleId = moduleId;
+ this.branch = branch == null ? IvyContext.getContext().getSettings().getDefaultBranch(moduleId) : branch;
+ this.revision = revision == null ? Ivy.getWorkingRevision() : revision;
+ hash = _hashCode(); //stored for performance reasons, hashCode is very used in many maps
+ setStandardAttribute(IvyPatternHelper.ORGANISATION_KEY, this.moduleId.getOrganisation());
+ setStandardAttribute(IvyPatternHelper.MODULE_KEY, this.moduleId.getName());
+ setStandardAttribute(IvyPatternHelper.BRANCH_KEY, this.branch);
+ setStandardAttribute(IvyPatternHelper.REVISION_KEY, this.revision);
}
public ModuleId getModuleId() {
- return _moduleId;
+ return moduleId;
}
public String getName() {
return getModuleId().getName();
@@ -88,7 +88,7 @@
return getModuleId().getOrganisation();
}
public String getRevision() {
- return _revision;
+ return revision;
}
public boolean equals(Object obj) {
@@ -102,7 +102,7 @@
&& other.getExtraAttributes().equals(getExtraAttributes());
}
public int hashCode() {
- return _hash;
+ return hash;
}
public int _hashCode() {
int hash = 31;
@@ -114,7 +114,7 @@
}
public String toString() {
- return "[ "+_moduleId.getOrganisation()+" | "+_moduleId.getName()+(_branch == null || _branch.length() == 0 ?"":" | "+_branch)+" | "+(_revision == null?"NONE":_revision)+" ]";
+ return "[ "+ moduleId.getOrganisation()+" | "+ moduleId.getName()+(branch == null || branch.length() == 0 ?"":" | "+ branch)+" | "+(revision == null?"NONE": revision)+" ]";
}
public String encodeToString() {
@@ -169,6 +169,6 @@
return newInstance(org, mod, branch, rev, attributes);
}
public String getBranch() {
- return _branch;
+ return branch;
}
}