svn commit: r547032 - in /incubator/ivy/core/trunk/src/java/org/apache/ivy/ant: IvyTask.java PackageMapping.java

[ma...@apache.org]

Author: maartenc
Date: Wed Jun 13 14:08:14 2007
New Revision: 547032

URL: http://svn.apache.org/viewvc?view=rev&rev=547032
Log:
renamed fields with '_' prefix

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
    incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java?view=diff&rev=547032&r1=547031&r2=547032
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java Wed Jun 13 14:08:14 2007
@@ -38,31 +38,31 @@
 public abstract class IvyTask extends Task {
     public static final String ANT_PROJECT_CONTEXT_KEY = "ant-project";
 
-    private Boolean _validate = null;
+    private Boolean validate = null;
 
-    private Reference _antIvyEngineRef = null;
+    private Reference antIvyEngineRef = null;
 
     protected boolean doValidate(IvySettings ivy) {
-        if (_validate != null) {
-            return _validate.booleanValue();
+        if (validate != null) {
+            return validate.booleanValue();
         }
         return ivy.doValidate();
     }
 
     public boolean isValidate() {
-        return _validate == null ? true : _validate.booleanValue();
+        return validate == null ? true : validate.booleanValue();
     }
 
     public void setValidate(boolean validate) {
-        _validate = Boolean.valueOf(validate);
+        this.validate = Boolean.valueOf(validate);
     }
 
     public void setSettingsRef(Reference ref) {
-        _antIvyEngineRef = ref;
+        antIvyEngineRef = ref;
     }
 
     public Reference getSettingsRef() {
-        return _antIvyEngineRef;
+        return antIvyEngineRef;
     }
 
     protected IvySettings getSettings() {
@@ -72,15 +72,15 @@
     protected Ivy getIvyInstance() {
         ensureMessageInitialised();
         Object antIvyEngine;
-        if (_antIvyEngineRef != null) {
-            antIvyEngine = _antIvyEngineRef.getReferencedObject();
+        if (antIvyEngineRef != null) {
+            antIvyEngine = antIvyEngineRef.getReferencedObject();
             if (!antIvyEngine.getClass().getName().equals(IvyAntSettings.class.getName())) {
-                throw new BuildException(_antIvyEngineRef.getRefId()
+                throw new BuildException(antIvyEngineRef.getRefId()
                         + " doesn't reference an ivy:settings", getLocation());
             }
             if (!(antIvyEngine instanceof IvyAntSettings)) {
                 throw new BuildException(
-                        _antIvyEngineRef.getRefId()
+                        antIvyEngineRef.getRefId()
                                 + " has been defined in a different classloader.  Please use the same loader when defining your task, or redeclare your ivy:settings in this classloader",
                         getLocation());
             }

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java?view=diff&rev=547032&r1=547031&r2=547032
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/PackageMapping.java Wed Jun 13 14:08:14 2007
@@ -23,47 +23,47 @@
  * Describes a mapping between a package name and an org name revision uple
  */
 public class PackageMapping {
-    private String _package;
+    private String pkg;
 
-    private String _organisation;
+    private String organisation;
 
-    private String _module;
+    private String module;
 
-    private String _revision;
+    private String revision;
 
     public String getModule() {
-        return _module;
+        return module;
     }
 
     public void setModule(String module) {
-        _module = module;
+        this.module = module;
     }
 
     public String getOrganisation() {
-        return _organisation;
+        return organisation;
     }
 
     public void setOrganisation(String organisation) {
-        _organisation = organisation;
+        this.organisation = organisation;
     }
 
     public String getRevision() {
-        return _revision;
+        return revision;
     }
 
     public void setRevision(String revision) {
-        _revision = revision;
+        this.revision = revision;
     }
 
     public String getPackage() {
-        return _package;
+        return pkg;
     }
 
     public void setPackage(String package1) {
-        _package = package1;
+        pkg = package1;
     }
 
     public ModuleRevisionId getModuleRevisionId() {
-        return ModuleRevisionId.newInstance(_organisation, _module, _revision);
+        return ModuleRevisionId.newInstance(organisation, module, revision);
     }
 }