bodewig 2004/11/26 04:33:31
Modified: src/java/org/apache/tools/ant/gui/acs
ACSDtdDefinedElement.java ACSFactory.java
ACSIntrospectedElement.java
src/java/org/apache/tools/ant/gui/core ProjectManager.java
Log:
Make it compile on JDK 1.5
Revision Changes Path
1.6 +8 -8
ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSDtdDefinedElement.java
Index: ACSDtdDefinedElement.java
===================================================================
RCS file:
/home/cvs/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSDtdDefinedElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ACSDtdDefinedElement.java 28 Sep 2003 13:02:59 -0000 1.5
+++ ACSDtdDefinedElement.java 26 Nov 2004 12:33:31 -0000 1.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999, 2000, 2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -184,15 +184,15 @@
DOMAttributes old = (DOMAttributes) getNamedValues();
- Enumeration enum = old.propertyNames();
- while(enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ Enumeration en = old.propertyNames();
+ while(en.hasMoreElements()) {
+ String name = (String) en.nextElement();
removeAttribute(name);
}
- enum = attributes.propertyNames();
- while(enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ en = attributes.propertyNames();
+ while(en.hasMoreElements()) {
+ String key = (String) en.nextElement();
setAttribute(key, attributes.getProperty(key));
}
1.7 +8 -8
ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSFactory.java
Index: ACSFactory.java
===================================================================
RCS file:
/home/cvs/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ACSFactory.java 10 Feb 2003 14:34:56 -0000 1.6
+++ ACSFactory.java 26 Nov 2004 12:33:31 -0000 1.7
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 - 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000 - 2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -114,9 +114,9 @@
_taskClassMap.load(org.apache.tools.ant.taskdefs.Ant.class.
getResourceAsStream("defaults.properties"));
_taskClassMap.setProperty("property", antPropertyName);
- Enumeration enum = _taskClassMap.propertyNames();
- while(enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ Enumeration en = _taskClassMap.propertyNames();
+ while(en.hasMoreElements()) {
+ String name = (String) en.nextElement();
// Directly collect Introspection Info for nown types
analyzeClass(_taskClassMap.getProperty(name));
@@ -134,9 +134,9 @@
((ClassInfo)_classInfoMap.get(antProjectName))._subelements.putAll(tempElementClassMap);
((ClassInfo)_classInfoMap.get(antTargetName))._subelements.put("property",antPropertyName);
((ClassInfo)_classInfoMap.get(antProjectName))._subelements.put("property",antPropertyName);
- enum = _elementClassMap.propertyNames();
- while(enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ en = _elementClassMap.propertyNames();
+ while(en.hasMoreElements()) {
+ String name = (String) en.nextElement();
// Directly collect Introspection Info for nown types
analyzeClass(_elementClassMap.getProperty(name));
1.4 +8 -8
ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSIntrospectedElement.java
Index: ACSIntrospectedElement.java
===================================================================
RCS file:
/home/cvs/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSIntrospectedElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ACSIntrospectedElement.java 28 Sep 2003 13:02:59 -0000 1.3
+++ ACSIntrospectedElement.java 26 Nov 2004 12:33:31 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2003-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -170,15 +170,15 @@
DOMAttributes old = (DOMAttributes) getNamedValues();
- Enumeration enum = old.propertyNames();
- while(enum.hasMoreElements()) {
- String name = (String) enum.nextElement();
+ Enumeration en = old.propertyNames();
+ while(en.hasMoreElements()) {
+ String name = (String) en.nextElement();
removeAttribute(name);
}
- enum = attributes.propertyNames();
- while(enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ en = attributes.propertyNames();
+ while(en.hasMoreElements()) {
+ String key = (String) en.nextElement();
setAttribute(key, attributes.getProperty(key));
}
1.8 +5 -5
ant-antidote/src/java/org/apache/tools/ant/gui/core/ProjectManager.java
Index: ProjectManager.java
===================================================================
RCS file:
/home/cvs/ant-antidote/src/java/org/apache/tools/ant/gui/core/ProjectManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProjectManager.java 5 Oct 2003 19:43:49 -0000 1.7
+++ ProjectManager.java 26 Nov 2004 12:33:31 -0000 1.8
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 - 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 - 2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -396,9 +396,9 @@
* @param event Event to fire.
*/
private void fireBuildEvent(BuildEvent event, BuildEventType type) {
- Enumeration enum = _antProject.getBuildListeners().elements();
- while(enum.hasMoreElements()) {
- BuildListener l = (BuildListener) enum.nextElement();
+ Enumeration en = _antProject.getBuildListeners().elements();
+ while(en.hasMoreElements()) {
+ BuildListener l = (BuildListener) en.nextElement();
type.fireEvent(event, l);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
