donaldp 01/12/22 04:54:31
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/types
CommandlineJava.java
Log:
Rename Environment to EnvironmentData to avoid name conflicts with other
classes named Environment
Revision Changes Path
1.4 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommandlineJava.java 2001/12/21 14:21:23 1.3
+++ CommandlineJava.java 2001/12/22 12:54:31 1.4
@@ -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 @@
return vmVersion;
}
- public void addSysproperty( Environment.Variable sysp )
+ public void addSysproperty( EnvironmentData.Variable sysp )
{
sysProperties.addVariable( sysp );
}
@@ -323,11 +323,11 @@
}
/**
- * 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 @@
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 );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
