2003-09-22 Michael Koch <konqueror@gmx.de>

	* java/net/JarURLConnection.java
	(JarURLConnection): Modifed code to match classpath more, fixed comment.
	(getCertificates): Made it more error prone.
	(getMainAttributes): Likewise.
	(getAttributes): Implemented.
	(getManifest): Reformatted code.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 62aa03d..da74f18 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-22  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/JarURLConnection.java
+       (JarURLConnection): Modifed code to match classpath more, fixed comment.
+       (getCertificates): Made it more error prone.
+       (getMainAttributes): Likewise.
+       (getAttributes): Implemented.
+       (getManifest): Reformatted code.
+
 2003-09-20  Tom Tromey  <tromey@redhat.com>
 
        * java/awt/Component.java: Indentation cleanup from Classpath.

diff --git a/libjava/java/net/JarURLConnection.java b/libjava/java/net/JarURLConnection.java
index b8e9de0..d90ea0c 100644 (file)
--- a/libjava/java/net/JarURLConnection.java
+++ b/libjava/java/net/JarURLConnection.java
@@ -103,21 +103,21 @@ public abstract class JarURLConnection extends URLConnection
    *
    * @specnote This constructor is protected since JDK 1.4
    */
-  protected JarURLConnection(URL url)
+  protected JarURLConnection (URL url)
     throws MalformedURLException
   {
-    super(url);
+    super (url);
 
     String spec = url.getFile();
-    int bang = spec.indexOf ("!/", 0);
+    int bang = spec.indexOf ("!/");
     if (bang == -1)
       throw new MalformedURLException (url + ": No `!/' in spec.");
 
-    // Extact the url for the jar itself.
-    jarFileURL = new URL(spec.substring (0, bang));
+    // Extract the url for the jar itself.
+    jarFileURL = new URL (spec.substring (0, bang));
 
     // Get the name of the element, if any.
-    element = (bang+2==spec.length() ? null : spec.substring (bang+2));
+    element = (spec.length() == (bang + 2) ? null : spec.substring (bang + 2));
   }
 
   /**
@@ -428,7 +428,9 @@ public abstract class JarURLConnection extends URLConnection
    */
   public Certificate[] getCertificates () throws IOException
   {
-    return getJarEntry ().getCertificates ();
+    JarEntry entry = getJarEntry();
+    
+    return entry != null ? entry.getCertificates() : null;
   }
 
   /**
@@ -441,7 +443,9 @@ public abstract class JarURLConnection extends URLConnection
    */
   public Attributes getMainAttributes () throws IOException
   {
-    return getManifest ().getMainAttributes ();
+    Manifest manifest = getManifest();
+    
+    return manifest != null ? manifest.getMainAttributes() : null;
   }
 
   /**
@@ -455,8 +459,9 @@ public abstract class JarURLConnection extends URLConnection
    */
   public Attributes getAttributes () throws IOException
   {
-    // FIXME: implement this
-    return null;
+    JarEntry entry = getJarEntry();
+
+    return entry != null ? entry.getAttributes() : null;
   }
 
   /**
@@ -469,8 +474,8 @@ public abstract class JarURLConnection extends URLConnection
    */
   public Manifest getManifest () throws IOException
   {
-    JarFile file = getJarFile ();
+    JarFile file = getJarFile();
 
-    return (file != null) ? file.getManifest() : null;
+    return file != null ? file.getManifest() : null;
   }
 }