diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 943ac947c22..93fc7dc2fc4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2003-07-13 Michael Koch + + * 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 * 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 8b8a8513fc3..d59ab253322 100644 --- 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 * JSplitPane.VERTICAL_SPLIT (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). * *

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 0adad4dafa5..51c694a7331 100644 --- 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 c9e0c798e4e..ff73edbc871 100644 --- 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 a5c813d62f7..bbdcfb5500a 100644 --- 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.*; +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 +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 0930610a3a9..321889c5124 100644 --- 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 996fd4e4a3c..fccabd1d529 100644 --- 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.*; +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; }