OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Koch 2003-07-13 15:29:11 +00:00 committed by Michael Koch
parent 2b907f5c45
commit 65278df216
7 changed files with 73 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libjava/ChangeLog
View File

@ -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

2
libjava/javax/swing/plaf/basic/BasicBorders.java
View File

@ -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.

43
libjava/javax/swing/plaf/basic/BasicLabelUI.java
View File

@ -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");
}
}

2
libjava/javax/swing/plaf/basic/BasicLookAndFeel.java
View File

@ -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

15
libjava/javax/swing/plaf/basic/BasicTabbedPaneUI.java
View File

@ -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)
{

32
libjava/javax/swing/plaf/basic/BasicTextUI.java
View File

@ -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;
}
}

10
libjava/javax/swing/plaf/metal/MetalLookAndFeel.java
View File

@ -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; }