I'm committing the attached patch to (hopefully) fix the current build problems with gcj -- this works with gcj 4.1.
Changelog:
2006-05-21 Andrew John Hughes <[EMAIL PROTECTED]>
* gnu/java/net/loader/JarURLLoader.java:
Use Map.Entry instead of LinkedHashMap.Entry
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
If you use Microsoft Office, support movement towards the end of vendor lock-in:
http://opendocumentfellowship.org/petition/
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: gnu/java/net/loader/JarURLLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/loader/JarURLLoader.java,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 JarURLLoader.java
--- gnu/java/net/loader/JarURLLoader.java 19 May 2006 20:58:59 -0000
1.3
+++ gnu/java/net/loader/JarURLLoader.java 21 May 2006 11:30:54 -0000
@@ -11,6 +11,7 @@ import java.net.URLStreamHandlerFactory;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.jar.Attributes;
@@ -100,7 +101,7 @@ public final class JarURLLoader extends
Iterator it = indexMap.entrySet().iterator();
while (it.hasNext())
{
- LinkedHashMap.Entry entry = (LinkedHashMap.Entry) it.next();
+ Map.Entry entry = (Map.Entry) it.next();
URL subURL = (URL) entry.getKey();
Set prefixes = (Set) entry.getValue();
if (subURL.equals(baseURL))
@@ -206,4 +207,4 @@ public final class JarURLLoader extends
{
return classPath;
}
-}
\ No newline at end of file
+}
signature.asc
Description: Digital signature
