FYI: java.util.GregorianCalendar and java.net.URLStreamHandler

[Guilhem Lavaux]

Hi,

Here are two small fixes: one from Ito about DAY_OF_WEEK_IN_MONTH and 
another to fix relative path which should be transformed into absolute 
in URLs.

Guilhem.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1735
diff -u -r1.1735 ChangeLog
--- ChangeLog   29 Dec 2003 11:41:55 -0000      1.1735
+++ ChangeLog   29 Dec 2003 12:01:56 -0000
@@ -1,5 +1,15 @@
 2003-12-29 Guilhem Lavaux <address@hidden>
 
+       * java/net/URLStreamHandler.java
+       (parseURL): Change a relative path into an
+       absolute if the original URL does not have any path.
+
+       * java/util/GregorianCalendar.java
+       (computeFields): Reported by Ito Kazumitsu <address@hidden>.
+       Fixed the computation of DAY_OF_WEEK_IN_MONTH.
+
+2003-12-29 Guilhem Lavaux <address@hidden>
+
        * java/io/ObjectStreamClass.java: Reindented.
 
 2003-12-29 Guilhem Lavaux <address@hidden>
Index: java/util/GregorianCalendar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/GregorianCalendar.java,v
retrieving revision 1.22
diff -u -r1.22 GregorianCalendar.java
--- java/util/GregorianCalendar.java    26 Dec 2003 15:23:34 -0000      1.22
+++ java/util/GregorianCalendar.java    29 Dec 2003 12:01:57 -0000
@@ -610,7 +610,7 @@
        calculateDay(++day, gregorian);
       }
 
-    fields[DAY_OF_WEEK_IN_MONTH] = (fields[DAY_OF_MONTH] + 12) / 7;
+    fields[DAY_OF_WEEK_IN_MONTH] = (fields[DAY_OF_MONTH] + 6) / 7;
 
     // which day of the week are we (0..6), relative to getFirstDayOfWeek
     int relativeWeekday = (7 + fields[DAY_OF_WEEK] - getFirstDayOfWeek()) % 7;
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.22
diff -u -r1.22 URLStreamHandler.java
--- java/net/URLStreamHandler.java      27 Nov 2003 09:52:56 -0000      1.22
+++ java/net/URLStreamHandler.java      29 Dec 2003 12:01:58 -0000
@@ -186,6 +186,8 @@
        // No file context available; just spec for file.
        // Or this is an absolute path name; ignore any file context.
        file = spec.substring(start, end);
+       if (start < end && spec.charAt(start) != '/')
+         file = "/" + file;
        ref = null;
       } 
     else if (start < end)