You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/06/10 14:50:56 UTC
svn commit: r189950 -
/forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java
Author: rgardler
Date: Fri Jun 10 05:50:55 2005
New Revision: 189950
URL: http://svn.apache.org/viewcvs?rev=189950&view=rev
Log:
prevent a name clash when compiling under JDK 1.5
Modified:
forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java
Modified: forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java?rev=189950&r1=189949&r2=189950&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/AntProperties.java Fri Jun 10 05:50:55 2005
@@ -42,7 +42,7 @@
public AntProperties(Properties arg0) {
super(arg0);
- putAll(arg0);
+ putAllProperties(arg0);
}
public synchronized void load(InputStream arg0) throws IOException {
@@ -93,7 +93,7 @@
return null;
}
- public synchronized void putAll(Map arg0) {
+ public synchronized void putAllProperties(Map arg0) {
Iterator i = arg0.entrySet().iterator();
while (i.hasNext()) {
Map.Entry me = (Map.Entry)i.next();