libjava/classpath/ChangeLog.gcj:

2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
2007-06-03 23:18:43 +00:00 · 2007-06-03 23:18:43 +00:00 · e1bea0c068
commit e1bea0c068
parent af333b9a7f
2951 changed files with 80982 additions and 68583 deletions
--- a/libjava/classpath/gnu/java/net/loader/JarURLLoader.java
+++ b/libjava/classpath/gnu/java/net/loader/JarURLLoader.java
@ -32,7 +32,7 @@ public final class JarURLLoader extends URLLoader
  // Base jar: url for all resources loaded from jar.
  final URL baseJarURL;
  // The "Class-Path" attribute of this Jar's manifest.
-  ArrayList classPath;
+  ArrayList<URLLoader> classPath;
  // If not null, a mapping from INDEX.LIST for this jar only.
  // This is a set of all prefixes and top-level files that
  // ought to be available in this jar.
@ -90,20 +90,20 @@ public final class JarURLLoader extends URLLoader

        IndexListParser parser = new IndexListParser(jarfile, baseJarURL,
                                                     baseURL);
-        LinkedHashMap indexMap = parser.getHeaders();
+        LinkedHashMap<URL, Set<String>> indexMap = parser.getHeaders();
        if (indexMap != null)
          {
            // Note that the index also computes
            // the resulting Class-Path -- there are jars out there
            // where the index lists some required jars which do
            // not appear in the Class-Path attribute in the manifest.
-            this.classPath = new ArrayList();
-            Iterator it = indexMap.entrySet().iterator();
+            this.classPath = new ArrayList<URLLoader>();
+            Iterator<Map.Entry<URL, Set<String>>> it = indexMap.entrySet().iterator();
            while (it.hasNext())
              {
-                Map.Entry entry = (Map.Entry) it.next();
-                URL subURL = (URL) entry.getKey();
-                Set prefixes = (Set) entry.getValue();
+                Map.Entry<URL, Set<String>> entry = it.next();
+                URL subURL = entry.getKey();
+                Set<String> prefixes = entry.getValue();
                if (subURL.equals(baseURL))
                  this.indexSet = prefixes;
                else
@ -127,7 +127,7 @@ public final class JarURLLoader extends URLLoader
                      = attributes.getValue(Attributes.Name.CLASS_PATH)) 
                     != null))
          {
-            this.classPath = new ArrayList();
+            this.classPath = new ArrayList<URLLoader>();
            StringTokenizer st = new StringTokenizer(classPathString, " ");
            while (st.hasMoreElements ()) 
              {
@ -144,7 +144,7 @@ public final class JarURLLoader extends URLLoader
                                                              cache, factory,
                                                              subURL, subURL);
                    this.classPath.add(subLoader);
-                    ArrayList extra = subLoader.getClassPath();
+                    ArrayList<URLLoader> extra = subLoader.getClassPath();
                    if (extra != null)
                      this.classPath.addAll(extra);
                  }
@ -208,7 +208,7 @@ public final class JarURLLoader extends URLLoader
      }
  }

-  public ArrayList getClassPath()
+  public ArrayList<URLLoader> getClassPath()
  {
    return classPath;
  }
--- a/libjava/classpath/gnu/java/net/loader/URLLoader.java
+++ b/libjava/classpath/gnu/java/net/loader/URLLoader.java
@ -140,7 +140,7 @@ public abstract class URLLoader
   * Return a list of new URLLoader objects representing any
   * class path entries added by this container.
   */
-  public ArrayList getClassPath()
+  public ArrayList<URLLoader> getClassPath()
  {
    return null;
  }
--- a/libjava/classpath/gnu/java/net/loader/URLStreamHandlerCache.java
+++ b/libjava/classpath/gnu/java/net/loader/URLStreamHandlerCache.java
@ -51,7 +51,8 @@ public class URLStreamHandlerCache
   * private protocol handler cache (also a HashMap), so we can avoid
   * creating handlers each time the same protocol comes.
   */
-  private HashMap factoryCache = new HashMap(5);
+  private HashMap<URLStreamHandlerFactory, HashMap<String, URLStreamHandler>> factoryCache
+    = new HashMap<URLStreamHandlerFactory, HashMap<String, URLStreamHandler>>(5);

  public URLStreamHandlerCache()
  {
@ -62,7 +63,7 @@ public class URLStreamHandlerCache
    // Since we only support three protocols so far, 5 is enough
    // for cache initial size.
    if (factory != null && factoryCache.get(factory) == null)
-      factoryCache.put(factory, new HashMap(5));
+      factoryCache.put(factory, new HashMap<String, URLStreamHandler>(5));
  }

  public synchronized URLStreamHandler get(URLStreamHandlerFactory factory,
@ -71,8 +72,8 @@ public class URLStreamHandlerCache
    if (factory == null)
      return null;
    // Check if there're handler for the same protocol in cache.
-    HashMap cache = (HashMap) factoryCache.get(factory);
-    URLStreamHandler handler = (URLStreamHandler) cache.get(protocol);
+    HashMap<String, URLStreamHandler> cache = factoryCache.get(factory);
+    URLStreamHandler handler = cache.get(protocol);
    if (handler == null)
      {
        // Add it to cache.