This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI: Patch: classpath merge

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch to trunk to merge libgcj more with 
classpath.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQE/cv6RWSOgCCdjSDsRAtnMAJ9ih9DVbTQkNCoERaBC3VtXXawVpwCglcty
w/0OOprxBZoNzK7naakq5Jg=
=n7D0
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2180
diff -u -b -B -r1.2180 ChangeLog
--- ChangeLog	25 Sep 2003 13:21:27 -0000	1.2180
+++ ChangeLog	25 Sep 2003 14:37:34 -0000
@@ -1,3 +1,16 @@
+2003-09-25  Sascha Brawer  <brawer@dandelis.ch>
+
+	* java/awt/font/FontRenderContext.java (getTransform): Return
+	copy of internal transform object. Add Javadoc.
+	* java/awt/geom/Rectangle2D.java (getPathIterator): Use the same
+	winding rule as Sun J2SE.
+	* javax/swing/border/MatteBorder.java (MatteBorder(Icon)): Docfix.
+
+2003-09-25  Ingo Proetel  <proetel@aicas.com>
+
+	* java/rmi/Naming.java:
+	Added comments, now accepts pseudo protocol "rmi".
+
 2003-09-25  Guilhem Lavaux  <guilhem@kaffe.org>
 
 	* java/text/DecimalFormat.java (format): Don't immediatly round
Index: java/awt/font/FontRenderContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/font/FontRenderContext.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FontRenderContext.java
--- java/awt/font/FontRenderContext.java	17 Feb 2003 15:26:30 -0000	1.1
+++ java/awt/font/FontRenderContext.java	25 Sep 2003 14:37:34 -0000
@@ -1,5 +1,5 @@
 /* FontRenderContext.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -88,10 +88,21 @@
             && usesFractionalMetrics == rhs.usesFractionalMetrics ());
   }
 
+
+  /**
+   * Retrieves the affine transform for scaling typographical points
+   * to raster pixels.
+   *
+   * @return a clone of the transform object.
+   */
   public AffineTransform getTransform ()
   {
-    return affineTransform;
+    if (affineTransform == null)
+      return new AffineTransform ();
+    else
+      return new AffineTransform (affineTransform);
   }
+
 
   /**
    * Returns the hash code of the font render context.
Index: java/awt/geom/Rectangle2D.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/Rectangle2D.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 Rectangle2D.java
--- java/awt/geom/Rectangle2D.java	18 Jul 2003 19:20:33 -0000	1.7
+++ java/awt/geom/Rectangle2D.java	25 Sep 2003 14:37:34 -0000
@@ -399,7 +399,13 @@
 
       public int getWindingRule()
       {
-        return WIND_EVEN_ODD;
+        // A test program showed that Sun J2SE 1.3.1 and 1.4.1_01
+        // return WIND_NON_ZERO paths.  While this does not really
+        // make any difference for rectangles (because they are not
+        // self-intersecting), it seems appropriate to behave
+        // identically.
+
+        return WIND_NON_ZERO;
       }
 
       public boolean isDone()
Index: javax/swing/border/MatteBorder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/border/MatteBorder.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 MatteBorder.java
--- javax/swing/border/MatteBorder.java	1 Aug 2003 20:10:21 -0000	1.5
+++ javax/swing/border/MatteBorder.java	25 Sep 2003 14:37:34 -0000
@@ -183,7 +183,7 @@
    * at the left and right edge, the icon height for the top and
    * bottom edge.
    *
-   * <p><img src="doc-files/MatteBorder-6.png" width="500" height="150"
+   * <p><img src="doc-files/MatteBorder-6.png" width="379" height="150"
    * alt="[A picture of a MatteBorder made by this constructor]" />
    *
    * @param tileIcon an icon for tiling the border area.
Index: java/rmi/Naming.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/rmi/Naming.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Naming.java
--- java/rmi/Naming.java	22 Jan 2002 22:40:24 -0000	1.2
+++ java/rmi/Naming.java	25 Sep 2003 14:37:34 -0000
@@ -44,26 +44,72 @@
 
 public final class Naming {
 
+/** <pre>
+ * Looks for the remote object that is associated with the named service.
+ * Name and location is given in form of a URL without a scheme:
+ * 
+ *   //host:port/service-name
+ *  
+ * The port is optional.
+ * </pre>
+ * @param name the service name and location
+ * @return Remote-object that implements the named service
+ * @throws NotBoundException if no object implements the service
+ * @throws MalformedURLException 
+ * @throws RemoteException
+ */
 public static Remote lookup(String name) throws NotBoundException, MalformedURLException, RemoteException {
+	// hack to accept "rmi://host:port/service" strings
+	if(name.startsWith("rmi:")){ name = name.substring(4); }
 	URL u = new URL("http:" + name);
 	return (getRegistry(u).lookup(u.getFile().substring(1)));
 }
 
+/**
+ * Try to bind the given object to the given service name. 
+ * @param name
+ * @param obj
+ * @throws AlreadyBoundException
+ * @throws MalformedURLException
+ * @throws RemoteException
+ */
 public static void bind(String name, Remote obj) throws AlreadyBoundException, MalformedURLException, RemoteException {
 	URL u = new URL("http:" + name);
 	getRegistry(u).bind(u.getFile().substring(1), obj);
 }
 
+/**
+ * Remove a binding for a given service name.
+ * @param name
+ * @throws RemoteException
+ * @throws NotBoundException
+ * @throws MalformedURLException
+ */
 public static void unbind(String name) throws RemoteException, NotBoundException, MalformedURLException {
 	URL u = new URL("http:" + name);
 	getRegistry(u).unbind(u.getFile().substring(1));
 }
 
+/**
+ * Forces the binding between the given Remote-object and the given service name, even 
+ * if there was already an object bound to this name. 
+ * @param name
+ * @param obj
+ * @throws RemoteException
+ * @throws MalformedURLException
+ */
 public static void rebind(String name, Remote obj) throws RemoteException, MalformedURLException {
 	URL u = new URL("http:" + name);
 	getRegistry(u).rebind(u.getFile().substring(1), obj);
 }
 
+/**
+ * Lists all services at the named registry.
+ * @param name url that specifies the registry
+ * @return list of services at the name registry
+ * @throws RemoteException
+ * @throws MalformedURLException
+ */
 public static String[] list(String name) throws RemoteException, MalformedURLException {
 	return (getRegistry(new URL("http:" + name)).list());
 }
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]