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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 22 deletions

diff --git a/libjava/classpath/gnu/java/net/protocol/http/Headers.java b/libjava/classpath/gnu/java/net/protocol/http/Headers.java
index a793bbd9728..c8736bbac8f 100644
--- a/libjava/classpath/gnu/java/net/protocol/http/Headers.java
+++ b/libjava/classpath/gnu/java/net/protocol/http/Headers.java
@@ -42,6 +42,7 @@ import gnu.java.net.LineInputStream;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.Iterable;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -49,6 +50,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -60,12 +62,13 @@ import java.util.Map;
  * @author Chris Burdess (dog@gnu.org)
  * @author David Daney (ddaney@avtrex.com)
  */
-class Headers
+class Headers implements Iterable<Headers.HeaderElement>
 {
   /**
    * A list of HeaderElements
    */
-  private final ArrayList headers = new ArrayList();
+  private final ArrayList<HeaderElement> headers
+    = new ArrayList<HeaderElement>();
   
   /**
    * The HTTP dateformat used to parse date header fields.
@@ -102,7 +105,7 @@ class Headers
    *
    * @return the Iterator.
    */
-  Iterator iterator()
+  public Iterator<HeaderElement> iterator()
   {
     return headers.iterator();
   }
@@ -118,7 +121,7 @@ class Headers
   {
     for (int i = headers.size() - 1; i >= 0; i--)
       {
-        HeaderElement e = (HeaderElement)headers.get(i);
+        HeaderElement e = headers.get(i);
         if (e.name.equalsIgnoreCase(header))
           {
             return e.value;
@@ -219,7 +222,7 @@ class Headers
   {    
     for (int i = headers.size() - 1; i >= 0; i--)
       {
-        HeaderElement e = (HeaderElement)headers.get(i);
+        HeaderElement e = headers.get(i);
         if (e.name.equalsIgnoreCase(name))
           {
             e.value = value;
@@ -240,9 +243,9 @@ class Headers
    */
   public void putAll(Headers o)
   {
-    for (Iterator it = o.iterator(); it.hasNext(); )
+    for (Iterator<HeaderElement> it = o.iterator(); it.hasNext(); )
       {
-        HeaderElement e = (HeaderElement)it.next();
+        HeaderElement e = it.next();
         remove(e.name);
         addValue(e.name, e.value);
       }
@@ -256,9 +259,9 @@ class Headers
    */
   public void remove(String name)
   {
-    for (Iterator it = headers.iterator(); it.hasNext(); )
+    for (Iterator<HeaderElement> it = headers.iterator(); it.hasNext(); )
       {
-        HeaderElement e = (HeaderElement)it.next();
+        HeaderElement e = it.next();
         if (e.name.equalsIgnoreCase(name))
           it.remove();
       }
@@ -358,26 +361,26 @@ class Headers
    *
    * @return a Map containing all the headers.
    */
-  public Map getAsMap()
+  public Map<String,List<String>> getAsMap()
   {
-    LinkedHashMap m = new LinkedHashMap();
-    for (Iterator it = headers.iterator(); it.hasNext(); )
+    LinkedHashMap<String,List<String>> m = new LinkedHashMap<String,List<String>>();
+    for (Iterator<HeaderElement> it = headers.iterator(); it.hasNext(); )
       {
-        HeaderElement e = (HeaderElement)it.next();
-        ArrayList l = (ArrayList)m.get(e.name);
+        HeaderElement e = it.next();
+        ArrayList<String> l = (ArrayList<String>)m.get(e.name);
         if (l == null)
           {
-            l = new ArrayList(1);
+            l = new ArrayList<String>(1);
             l.add(e.value);
             m.put(e.name, l);
           }
         else
           l.add(0, e.value);
       }
-    for (Iterator it = m.entrySet().iterator(); it.hasNext(); )
+    for (Iterator<Map.Entry<String,List<String>>> it = m.entrySet().iterator(); it.hasNext(); )
       {
-        Map.Entry me = (Map.Entry)it.next();
-        ArrayList l = (ArrayList)me.getValue();
+        Map.Entry<String,List<String>> me = it.next();
+        List<String> l = me.getValue();
         me.setValue(Collections.unmodifiableList(l));
       }
     return m;
@@ -397,7 +400,7 @@ class Headers
     if (i >= headers.size() || i < 0)
       return null;
     
-    return ((HeaderElement)headers.get(i)).name;
+    return headers.get(i).name;
   }
 
   /**
@@ -414,8 +417,6 @@ class Headers
     if (i >= headers.size() || i < 0)
       return null;
     
-    return ((HeaderElement)headers.get(i)).value;
+    return headers.get(i).value;
   }
-  
 }
-