Rename Environment to EnvironmentData to avoid name conflicts with other classes named Environment

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270311 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java

@@ -7,9 +7,9 @@
  */
 package org.apache.tools.ant.types;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.Project;
@@ -188,7 +188,7 @@ public class CommandlineJava implements Cloneable
         return vmVersion;
     }
 
-    public void addSysproperty( Environment.Variable sysp )
+    public void addSysproperty( EnvironmentData.Variable sysp )
     {
         sysProperties.addVariable( sysp );
     }
@@ -323,11 +323,11 @@ public class CommandlineJava implements Cloneable
     }
 
     /**
-     * Specialized Environment class for System properties
+     * Specialized EnvironmentData class for System properties
      *
      * @author RT
      */
-    public static class SysProperties extends Environment implements Cloneable
+    public static class SysProperties extends EnvironmentData implements Cloneable
     {
         Properties sys = null;
 
@@ -340,7 +340,7 @@ public class CommandlineJava implements Cloneable
 
                 for( Iterator e = variables.iterator(); e.hasNext(); )
                 {
-                    Environment.Variable v = (Environment.Variable)e.next();
+                    EnvironmentData.Variable v = (EnvironmentData.Variable)e.next();
                     p.put( v.getKey(), v.getValue() );
                 }
                 System.setProperties( p );

proposal/myrmidon/src/main/org/apache/tools/ant/types/Environment.java → proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentData.java

@@ -15,11 +15,11 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class Environment
+public class EnvironmentData
 {
     protected ArrayList variables;
 
-    public Environment()
+    public EnvironmentData()
     {
         variables = new ArrayList();
     }

proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java

@@ -7,9 +7,9 @@
  */
 package org.apache.tools.ant.types;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.Project;
@@ -188,7 +188,7 @@ public class CommandlineJava implements Cloneable
         return vmVersion;
     }
 
-    public void addSysproperty( Environment.Variable sysp )
+    public void addSysproperty( EnvironmentData.Variable sysp )
     {
         sysProperties.addVariable( sysp );
     }
@@ -323,11 +323,11 @@ public class CommandlineJava implements Cloneable
     }
 
     /**
-     * Specialized Environment class for System properties
+     * Specialized EnvironmentData class for System properties
      *
      * @author RT
      */
-    public static class SysProperties extends Environment implements Cloneable
+    public static class SysProperties extends EnvironmentData implements Cloneable
     {
         Properties sys = null;
 
@@ -340,7 +340,7 @@ public class CommandlineJava implements Cloneable
 
                 for( Iterator e = variables.iterator(); e.hasNext(); )
                 {
-                    Environment.Variable v = (Environment.Variable)e.next();
+                    EnvironmentData.Variable v = (EnvironmentData.Variable)e.next();
                     p.put( v.getKey(), v.getValue() );
                 }
                 System.setProperties( p );

proposal/myrmidon/src/todo/org/apache/tools/ant/types/Environment.java → proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentData.java

@@ -15,11 +15,11 @@ import org.apache.myrmidon.api.TaskException;
  *
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class Environment
+public class EnvironmentData
 {
     protected ArrayList variables;
 
-    public Environment()
+    public EnvironmentData()
     {
         variables = new ArrayList();
     }