BasicBorders.java, [...]: New versions from classpath.

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.

From-SVN: r69292

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 943ac947c224a46a0a674c36c9155e85ffefcb29..93fc7dc2fc4b97887c49d0c1b4b115132b042ff6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/libjava/javax/swing/plaf/basic/BasicBorders.java b/libjava/javax/swing/plaf/basic/BasicBorders.java
index 8b8a8513fc3f09c5c36d556d727019657f4fba1a..d59ab253322b4fc83feea7d1d53cec7415be6560 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicBorders.java
+++ b/libjava/javax/swing/plaf/basic/BasicBorders.java
@@ -1300,7 +1300,7 @@ public class BasicBorders
    * 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.

diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/javax/swing/plaf/basic/BasicLabelUI.java
index 0adad4dafa56cc98e36c80e4a2c95f86204d89c6..51c694a7331ed615caf9504d4131e3d5db5add1e 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.java
@@ -38,22 +38,32 @@ exception statement from your version. */
 
 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;
 
     
     public static ComponentUI createUI(final JComponent c)  {
        return new BasicLabelUI();
     }
-
+    
     
     public void installUI(final JComponent c)  {
        super.installUI(c);
@@ -182,20 +192,11 @@ public class BasicLabelUI extends LabelUI
 
        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");
+  }
+}

diff --git a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java
index c9e0c798e4e8f610c0900eb0e585e2f9b227c584..ff73edbc871e8a24bf2d94d53650a0264e02a123 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/libjava/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -64,7 +64,7 @@ import javax.swing.text.JTextComponent;
 public abstract class BasicLookAndFeel extends LookAndFeel
   implements Serializable
 {
-  static final long serialVersionUID = 5484702182266873258L;
+  static final long serialVersionUID = -6096995660290287879L;
 
   /**
    * Constructor BasicLookAndFeel

diff --git a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index a5c813d62f76d7e319e732abcc7f240ed82f0b25..bbdcfb5500ac1decce8279409d2fb024e76d9cd3 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -38,11 +38,18 @@ exception statement from your version. */
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import java.awt.*;
-import javax.swing.plaf.*;
-
-public class BasicTabbedPaneUI  extends TabbedPaneUI 
+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) 
     {

diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI.java b/libjava/javax/swing/plaf/basic/BasicTextUI.java
index 0930610a3a9b78e25a13d74465c4be73ff0e9731..321889c5124c4392a3aaa47508c51b4cf449b78c 100644 (file)
--- a/libjava/javax/swing/plaf/basic/BasicTextUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicTextUI.java
@@ -38,12 +38,25 @@ exception statement from your version. */
 
 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 @@ public class BasicTextUI extends TextUI
     {
        return 0;
     } 
-}
-
-
-
-
 
+  public View create (Element elem)
+  {
+    // subclasses have to implement this to get this functionality
+    return null;
+  }
+}

diff --git a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java
index 996fd4e4a3c005c433e1df7c36effe30d9848b77..fccabd1d529b3bd0e70fd8c9b104a7b2f241ee41 100644 (file)
--- a/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/libjava/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -36,14 +36,14 @@ obligated to do so.  If you do not wish to do so, delete this
 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; }