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 javax.swing


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

Hi list,


I commited the attached patch to merge javax.swing with classpath 
again.


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

iD8DBQE/EXvCWSOgCCdjSDsRAgtJAJ9VOCgMUhtk6OI2YbJ3pmI8UDOwRACfUqzN
JAzbKks1Tu9aS6DYvS9O1eQ=
=jL51
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2028
diff -u -b -B -r1.2028 ChangeLog
--- ChangeLog	13 Jul 2003 15:09:19 -0000	1.2028
+++ ChangeLog	13 Jul 2003 15:28:00 -0000
@@ -1,5 +1,15 @@
 2003-07-13  Michael Koch  <konqueror@gmx.de>
 
+	* javax/swing/plaf/basic/BasicBorders.java,
+	javax/swing/plaf/basic/BasicLabelUI.java,
+	javax/swing/plaf/basic/BasicLookAndFeel.java,
+	javax/swing/plaf/basic/BasicTabbedPaneUI.java,
+	javax/swing/plaf/basic/BasicTextUI.java,
+	javax/swing/plaf/metal/MetalLookAndFeel.java:
+	New versions from classpath.
+
+2003-07-13  Michael Koch  <konqueror@gmx.de>
+
 	* gnu/java/awt/peer/gtk/GdkFontMetrics.java
 	* gnu/java/awt/peer/gtk/GdkGraphics.java
 	* gnu/java/awt/peer/gtk/GtkButtonPeer.java
Index: javax/swing/plaf/basic/BasicBorders.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicBorders.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicBorders.java
--- javax/swing/plaf/basic/BasicBorders.java	24 Jun 2003 09:48:42 -0000	1.5
+++ javax/swing/plaf/basic/BasicBorders.java	13 Jul 2003 15:28:01 -0000
@@ -1300,7 +1300,7 @@
    * painted if the orientation of the enclosed JSplitPane is
    * <code>JSplitPane.VERTICAL_SPLIT</code> (at least in versions
    * 1.3.1 and 1.4.1).  GNU Classpath does not replicate this bug. A
-   * report has been filed with Sun (review ID 188773).
+   * report has been filed with Sun (bug ID 4885629).
    *
    * <p>Note that the bottom left pixel of the border has a different
    * color depending on the orientation of the enclosed JSplitPane.
Index: javax/swing/plaf/basic/BasicLabelUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicLabelUI.java
--- javax/swing/plaf/basic/BasicLabelUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicLabelUI.java	13 Jul 2003 15:28:02 -0000
@@ -38,15 +38,25 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.LabelUI;
 
 public class BasicLabelUI extends LabelUI
+  implements PropertyChangeListener
 {
     int gap = 3;
-    
     Color foreground;
 
     
@@ -182,20 +192,11 @@
 
 	g.drawLine(0,0,100,100);
 	
-	BasicGraphicsUtils.drawString(g,
-				      text, 
-				      0,	
-				      0,//textRect.x, 
-				      0);//textRect.y);
+	BasicGraphicsUtils.drawString(g, text, 0, 0 /*textRect.x*/, 0 /*textRect.y*/);
     }
-}
-
-
-
-
-
-
-
-
-
 
+  public void propertyChange (PropertyChangeEvent event)
+  {
+    throw new Error ("Not implemented");
+  }
+}
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java	31 Mar 2003 12:19:21 -0000	1.2
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	13 Jul 2003 15:28:02 -0000
@@ -64,7 +64,7 @@
 public abstract class BasicLookAndFeel extends LookAndFeel
   implements Serializable
 {
-  static final long serialVersionUID = 5484702182266873258L;
+  static final long serialVersionUID = -6096995660290287879L;
 
   /**
    * Constructor BasicLookAndFeel
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	10 May 2003 08:14:36 -0000	1.2
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	13 Jul 2003 15:28:02 -0000
@@ -38,11 +38,18 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import java.awt.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import javax.swing.JComponent;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.TabbedPaneUI;
 
 public class BasicTabbedPaneUI  extends TabbedPaneUI 
+  implements SwingConstants
 {
     public static ComponentUI createUI(final JComponent c) 
     {
Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicTextUI.java
--- javax/swing/plaf/basic/BasicTextUI.java	27 Jun 2003 12:41:52 -0000	1.3
+++ javax/swing/plaf/basic/BasicTextUI.java	13 Jul 2003 15:28:02 -0000
@@ -38,12 +38,25 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.text.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.TextUI;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.EditorKit;
+import javax.swing.text.Element;
+import javax.swing.text.JTextComponent;
+import javax.swing.text.Position;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
 
 public class BasicTextUI extends TextUI
+  implements ViewFactory
 {
     int gap = 3;
     View view = null; // was: new RootView();
@@ -167,9 +180,10 @@
     {
 	return 0;
     } 
-}
-
-
-
-
 
+  public View create (Element elem)
+  {
+    // subclasses have to implement this to get this functionality
+    return null;
+  }
+}
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java	10 May 2003 08:14:36 -0000	1.2
+++ javax/swing/plaf/metal/MetalLookAndFeel.java	13 Jul 2003 15:28:02 -0000
@@ -36,14 +36,14 @@
 exception statement from your version. */
 
 
-package javax.swing.plaf.metal;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
+package javax.swing.plaf.metal;
 
+import javax.swing.UIDefaults;
+import javax.swing.plaf.basic.BasicDefaults;
+import javax.swing.plaf.basic.BasicLookAndFeel;
 
-public class MetalLookAndFeel extends LookAndFeel
+public class MetalLookAndFeel extends BasicLookAndFeel
  {	   
      public boolean isNativeLookAndFeel()        { return true; }
      public boolean isSupportedLookAndFeel()     { return true; }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]