[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: various swing fixes
Kaffe CVS
cvs-commits at kaffe.org
Wed Jan 26 05:45:00 PST 2005
PatchSet 5918
Date: 2005/01/26 13:40:01
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: various swing fixes
Members:
ChangeLog:1.3457->1.3458
libraries/javalib/javax/swing/AbstractButton.java:1.8->1.9
libraries/javalib/javax/swing/DefaultButtonModel.java:1.5->1.6
libraries/javalib/javax/swing/JApplet.java:1.5->1.6
libraries/javalib/javax/swing/JComponent.java:1.10->1.11
libraries/javalib/javax/swing/JEditorPane.java:1.5->1.6
libraries/javalib/javax/swing/JFrame.java:1.5->1.6
libraries/javalib/javax/swing/JInternalFrame.java:1.7->1.8
libraries/javalib/javax/swing/JScrollBar.java:1.2->1.3
libraries/javalib/javax/swing/JScrollPane.java:1.7->1.8
libraries/javalib/javax/swing/JViewport.java:1.6->1.7
libraries/javalib/javax/swing/JWindow.java:1.7->1.8
libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.5->1.6
libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java:1.2->1.3
libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.6->1.7
libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java:1.4->1.5
libraries/javalib/javax/swing/table/JTableHeader.java:1.7->1.8
libraries/javalib/javax/swing/text/PlainDocument.java:1.6->1.7
libraries/javalib/javax/swing/text/PlainView.java:1.4->1.5
libraries/javalib/javax/swing/text/View.java:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3457 kaffe/ChangeLog:1.3458
--- kaffe/ChangeLog:1.3457 Wed Jan 26 13:29:45 2005
+++ kaffe/ChangeLog Wed Jan 26 13:40:01 2005
@@ -2,6 +2,78 @@
Resynced with GNU Classpath.
+ 2005-01-25 Michael Koch <konqueror at gmx.de>
+
+ * javax/swing/AbstractButton.java
+ (fireItemStateChanged): Made protected.
+ (fireActionPerformed): Likewise.
+ (fireStateChanged): Likewise.
+ * javax/swing/DefaultButtonModel.java
+ (fireItemStateChanged): Likewise.
+ (fireActionPerformed): Likewise.
+ (fireStateChanged): Likewise.
+ * javax/swing/JApplet.java
+ (JApplet): Removed.
+ (frameInit): Likewise.
+ (setRootPane): Made protected.
+ (createRootPane): Likewise.
+ * javax/swing/JComponent.java
+ (getClientProperty): Likewise.
+ (putClientProperty): Likewise.
+ * javax/swing/JEditorPane.java
+ (getContentType): Likewise.
+ (setContentType): Likewise.
+ * javax/swing/JFrame.java
+ (setRootPane): Likewise.
+ (createRootPane): Likewise.
+ * javax/swing/JInternalFrame.java
+ (getFocusCycleRootAncestor): Made final. Added @since tag.
+ (isFocusCycleRoot): Likewise.
+ (getWarningString): Made final.
+ * javax/swing/JScrollBar.java
+ (changeListener): Removed.
+ (changeEvent): Likewise.
+ (createChangeListener): Likewise.
+ (fireStateChanged): Likewise.
+ (addChangeListener): Likewise.
+ (removeChangeListener): Likewise.
+ (getChangeListeners): Likewise.
+ * javax/swing/JScrollPane.java
+ (createViewport): Made protected.
+ * javax/swing/JViewport.java
+ (addImpl): Likewise.
+ (setBorder): New method.
+ * javax/swing/JWindow.java
+ (setRootPane): Made protected.
+ (createRootPane): Likewise.
+ * javax/swing/plaf/basic/BasicButtonUI.java
+ (installListeners): Likewise.
+ (uninstallListeners): Likewise.
+ * javax/swing/plaf/basic/BasicProgressBarUI.java
+ (incrementAnimationIndex): Likewise.
+ * javax/swing/plaf/basic/BasicTabbedPaneUI.java
+ (createLayoutManager): Likewise.
+ * javax/swing/table/DefaultTableCellRenderer.java
+ (firePropertyChange): Likewise.
+ * javax/swing/table/JTableHeader.java
+ (AccessibleJTableHeaderEntry.AccessibleJTableHeaderEntry):
+ New constructor.
+ * javax/swing/text/PlainDocument.java
+ (reindex): Made private.
+ * javax/swing/text/PlainView.java
+ (drawLine): Made protected.
+ (getTabSize): Likewise.
+ * javax/swing/text/View.java
+ (setSize): Removed.
+ (preferenceChanged): New method.
+ (getBreakWeight): Likewise.
+ (breakView): Likewise.
+ (getViewIndex): Likewise.
+
+2005-01-26 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
2005-01-24 Michael Koch <konqueror at gmx.de>
* javax/swing/JScrollPane.java
Index: kaffe/libraries/javalib/javax/swing/AbstractButton.java
diff -u kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.8 kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.9
--- kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.8 Sun Oct 24 10:44:36 2004
+++ kaffe/libraries/javalib/javax/swing/AbstractButton.java Wed Jan 26 13:40:05 2005
@@ -661,7 +661,7 @@
*
* @param e The event signifying that the button's model changed state
*/
- public void fireItemStateChanged(ItemEvent e)
+ protected void fireItemStateChanged(ItemEvent e)
{
e.setSource(this);
ItemListener[] listeners = getItemListeners();
@@ -676,7 +676,7 @@
*
* @param e The event signifying that the button's model was clicked
*/
- public void fireActionPerformed(ActionEvent e)
+ protected void fireActionPerformed(ActionEvent e)
{
e.setSource(this);
ActionListener[] listeners = getActionListeners();
@@ -689,7 +689,7 @@
* Calls {@link ChangeEvent.stateChanged} on each {@link ChangeListener}
* in the button's listener list.
*/
- public void fireStateChanged()
+ protected void fireStateChanged()
{
ChangeListener[] listeners = getChangeListeners();
@@ -806,7 +806,7 @@
public void setRolloverEnabled(boolean r)
{
if (rollOverEnabled != r)
- {
+ {
rollOverEnabled = r;
firePropertyChange(ROLLOVER_ENABLED_CHANGED_PROPERTY, !r, r);
revalidate();
Index: kaffe/libraries/javalib/javax/swing/DefaultButtonModel.java
diff -u kaffe/libraries/javalib/javax/swing/DefaultButtonModel.java:1.5 kaffe/libraries/javalib/javax/swing/DefaultButtonModel.java:1.6
--- kaffe/libraries/javalib/javax/swing/DefaultButtonModel.java:1.5 Wed Jan 5 19:37:12 2005
+++ kaffe/libraries/javalib/javax/swing/DefaultButtonModel.java Wed Jan 26 13:40:05 2005
@@ -272,7 +272,7 @@
*
* @param e The ItemEvent to fire
*/
- public void fireItemStateChanged(ItemEvent e)
+ protected void fireItemStateChanged(ItemEvent e)
{
ItemListener[] ll = getItemListeners();
@@ -288,7 +288,7 @@
*
* @param e The ActionEvent to fire
*/
- public void fireActionPerformed(ActionEvent e)
+ protected void fireActionPerformed(ActionEvent e)
{
ActionListener[] ll = getActionListeners();
@@ -301,7 +301,7 @@
* has occurred. This happens in response to the any change to a property
* of the model.
*/
- public void fireStateChanged()
+ protected void fireStateChanged()
{
ChangeListener[] ll = getChangeListeners();
Index: kaffe/libraries/javalib/javax/swing/JApplet.java
diff -u kaffe/libraries/javalib/javax/swing/JApplet.java:1.5 kaffe/libraries/javalib/javax/swing/JApplet.java:1.6
--- kaffe/libraries/javalib/javax/swing/JApplet.java:1.5 Wed Jan 5 20:06:46 2005
+++ kaffe/libraries/javalib/javax/swing/JApplet.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* JApplet.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -59,16 +59,6 @@
public JApplet()
{
- frameInit();
- }
-
- public JApplet(String title)
- {
- frameInit();
- }
-
- protected void frameInit()
- {
super.setLayout(new BorderLayout(1, 1));
getRootPane(); // will do set/create
}
@@ -100,7 +90,7 @@
return rootPane;
}
- public void setRootPane(JRootPane root)
+ protected void setRootPane(JRootPane root)
{
if (rootPane != null)
remove(rootPane);
@@ -109,7 +99,7 @@
add(rootPane, BorderLayout.CENTER);
}
- public JRootPane createRootPane()
+ protected JRootPane createRootPane()
{
return new JRootPane();
}
Index: kaffe/libraries/javalib/javax/swing/JComponent.java
diff -u kaffe/libraries/javalib/javax/swing/JComponent.java:1.10 kaffe/libraries/javalib/javax/swing/JComponent.java:1.11
--- kaffe/libraries/javalib/javax/swing/JComponent.java:1.10 Thu Jan 6 18:58:13 2005
+++ kaffe/libraries/javalib/javax/swing/JComponent.java Wed Jan 26 13:40:05 2005
@@ -427,7 +427,7 @@
* @see #getClientProperties
* @see #putClientProperty
*/
- public Object getClientProperty(Object key)
+ public final Object getClientProperty(Object key)
{
return getClientProperties().get(key);
}
@@ -444,7 +444,7 @@
* @see #getClientProperties
* @see #getClientProperty
*/
- public void putClientProperty(Object key, Object value)
+ public final void putClientProperty(Object key, Object value)
{
getClientProperties().put(key, value);
}
Index: kaffe/libraries/javalib/javax/swing/JEditorPane.java
diff -u kaffe/libraries/javalib/javax/swing/JEditorPane.java:1.5 kaffe/libraries/javalib/javax/swing/JEditorPane.java:1.6
--- kaffe/libraries/javalib/javax/swing/JEditorPane.java:1.5 Thu Jan 13 05:18:27 2005
+++ kaffe/libraries/javalib/javax/swing/JEditorPane.java Wed Jan 26 13:40:05 2005
@@ -113,7 +113,7 @@
return null;
}
- public String getContentType()
+ public final String getContentType()
{
return getEditorKit().getContentType();
}
@@ -243,7 +243,7 @@
{
}
- public void setContentType(String type)
+ public final void setContentType(String type)
{
if (editorKit != null
&& editorKit.getContentType().equals(type))
Index: kaffe/libraries/javalib/javax/swing/JFrame.java
diff -u kaffe/libraries/javalib/javax/swing/JFrame.java:1.5 kaffe/libraries/javalib/javax/swing/JFrame.java:1.6
--- kaffe/libraries/javalib/javax/swing/JFrame.java:1.5 Sun Oct 24 13:39:11 2004
+++ kaffe/libraries/javalib/javax/swing/JFrame.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* JFrame.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -123,7 +123,7 @@
return rootPane;
}
- public void setRootPane(JRootPane root)
+ protected void setRootPane(JRootPane root)
{
if (rootPane != null)
remove(rootPane);
@@ -132,7 +132,7 @@
add(rootPane, BorderLayout.CENTER);
}
- public JRootPane createRootPane()
+ protected JRootPane createRootPane()
{
return new JRootPane();
}
Index: kaffe/libraries/javalib/javax/swing/JInternalFrame.java
diff -u kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.7 kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.8
--- kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.7 Thu Dec 23 00:40:21 2004
+++ kaffe/libraries/javalib/javax/swing/JInternalFrame.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* JInternalFrame.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -780,9 +780,11 @@
* This method returns null because this must always be the root of a focus
* traversal.
*
- * @return null.
+ * @return always null
+ *
+ * @since 1.4
*/
- public Container getFocusCycleRootAncestor()
+ public final Container getFocusCycleRootAncestor()
{
// as defined.
return null;
@@ -968,7 +970,7 @@
*
* @return null.
*/
- public String getWarningString()
+ public final String getWarningString()
{
// as defined.
return null;
@@ -1019,9 +1021,11 @@
/**
* This must always return true.
*
- * @return True
+ * @return always true
+ *
+ * @since 1.4
*/
- public boolean isFocusCycleRoot()
+ public final boolean isFocusCycleRoot()
{
return true;
}
Index: kaffe/libraries/javalib/javax/swing/JScrollBar.java
diff -u kaffe/libraries/javalib/javax/swing/JScrollBar.java:1.2 kaffe/libraries/javalib/javax/swing/JScrollBar.java:1.3
--- kaffe/libraries/javalib/javax/swing/JScrollBar.java:1.2 Sat Oct 9 11:40:41 2004
+++ kaffe/libraries/javalib/javax/swing/JScrollBar.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* JScrollBar.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
import java.awt.Adjustable;
@@ -47,11 +48,8 @@
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleStateSet;
import javax.accessibility.AccessibleValue;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.plaf.ScrollBarUI;
-
/**
* The JScrollBar. Two buttons control how the values that the
* scroll bar can take. You can also drag the thumb or click the track
@@ -178,12 +176,6 @@
/** How much the thumb moves when moving in a unit. */
protected int unitIncrement = 1;
- /** The ChangeListener that listens to the model. */
- private transient ChangeListener changeListener;
-
- /** The ChangeEvent that's fired. */
- private transient ChangeEvent changeEvent;
-
/**
* Creates a new horizontal JScrollBar object with a minimum
* of 0, a maxmium of 100, a value of 0 and an extent of 10.
@@ -223,8 +215,6 @@
throw new IllegalArgumentException(orientation
+ " is not a legal orientation");
this.orientation = orientation;
- changeListener = createChangeListener();
- model.addChangeListener(changeListener);
updateUI();
}
@@ -325,8 +315,6 @@
{
BoundedRangeModel oldModel = model;
model = newModel;
- oldModel.removeChangeListener(changeListener);
- model.addChangeListener(changeListener);
firePropertyChange(MODEL_CHANGED_PROPERTY, oldModel, model);
}
}
@@ -555,70 +543,6 @@
fireAdjustmentValueChanged(AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED,
AdjustmentEvent.TRACK, newValue);
}
- }
-
- /**
- * This method creates a new ChangeListener.
- *
- * @return A new ChangeListener.
- */
- private ChangeListener createChangeListener()
- {
- return new ChangeListener()
- {
- public void stateChanged(ChangeEvent e)
- {
- fireStateChanged();
- }
- };
- }
-
- /**
- * This method is called whenever the model fires a ChangeEvent. It should
- * propagate the ChangeEvent to its listeners with a new ChangeEvent that
- * identifies the scroll bar as the source.
- */
- private void fireStateChanged()
- {
- Object[] changeListeners = listenerList.getListenerList();
- if (changeEvent == null)
- changeEvent = new ChangeEvent(this);
- for (int i = changeListeners.length - 2; i >= 0; i -= 2)
- {
- if (changeListeners[i] == ChangeListener.class)
- ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
- }
- }
-
- /**
- * This method adds a ChangeListener to the scroll bar.
- *
- * @param listener The listener to add.
- */
- public void addChangeListener(ChangeListener listener)
- {
- listenerList.add(ChangeListener.class, listener);
- }
-
- /**
- * This method removes a ChangeListener from the scroll bar.
- *
- * @param listener The listener to remove.
- */
- public void removeChangeListener(ChangeListener listener)
- {
- listenerList.remove(ChangeListener.class, listener);
- }
-
- /**
- * This method returns an array of all ChangeListeners listening to this
- * scroll bar.
- *
- * @return An array of ChangeListeners listening to this scroll bar.
- */
- public ChangeListener[] getChangeListeners()
- {
- return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
}
/**
Index: kaffe/libraries/javalib/javax/swing/JScrollPane.java
diff -u kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.7 kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.8
--- kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.7 Wed Jan 26 13:29:53 2005
+++ kaffe/libraries/javalib/javax/swing/JScrollPane.java Wed Jan 26 13:40:05 2005
@@ -588,7 +588,7 @@
return new ScrollBar(SwingConstants.VERTICAL);
}
- public JViewport createViewport()
+ protected JViewport createViewport()
{
return new JViewport();
}
Index: kaffe/libraries/javalib/javax/swing/JViewport.java
diff -u kaffe/libraries/javalib/javax/swing/JViewport.java:1.6 kaffe/libraries/javalib/javax/swing/JViewport.java:1.7
--- kaffe/libraries/javalib/javax/swing/JViewport.java:1.6 Sat Nov 13 02:17:45 2004
+++ kaffe/libraries/javalib/javax/swing/JViewport.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* JViewport.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,6 +45,7 @@
import java.awt.Point;
import java.awt.Rectangle;
+import javax.swing.border.Border;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ViewportUI;
@@ -281,7 +282,7 @@
fireStateChanged();
}
- public void addImpl(Component comp, Object constraints, int index)
+ protected void addImpl(Component comp, Object constraints, int index)
{
if (getComponentCount() > 0)
remove(getComponents()[0]);
@@ -373,5 +374,11 @@
public void setUI(ViewportUI ui)
{
super.setUI(ui);
+ }
+
+ public final void setBorder(Border border)
+ {
+ if (border != null)
+ throw new IllegalArgumentException();
}
}
Index: kaffe/libraries/javalib/javax/swing/JWindow.java
diff -u kaffe/libraries/javalib/javax/swing/JWindow.java:1.7 kaffe/libraries/javalib/javax/swing/JWindow.java:1.8
--- kaffe/libraries/javalib/javax/swing/JWindow.java:1.7 Wed Jan 26 13:29:53 2005
+++ kaffe/libraries/javalib/javax/swing/JWindow.java Wed Jan 26 13:40:05 2005
@@ -129,7 +129,7 @@
return rootPane;
}
- public void setRootPane(JRootPane root)
+ protected void setRootPane(JRootPane root)
{
if (rootPane != null)
remove(rootPane);
@@ -138,7 +138,7 @@
add(rootPane, BorderLayout.CENTER);
}
- public JRootPane createRootPane()
+ protected JRootPane createRootPane()
{
return new JRootPane();
}
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.5 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.6
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.5 Thu Dec 23 21:58:12 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
-/* BasicButtonUI.java
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* BasicButtonUI.java --
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.plaf.basic;
import java.awt.Color;
@@ -136,7 +137,7 @@
return new BasicButtonListener(b);
}
- public void installListeners(AbstractButton b)
+ protected void installListeners(AbstractButton b)
{
listener = createButtonListener(b);
b.addChangeListener(listener);
@@ -146,7 +147,7 @@
b.addMouseMotionListener(listener);
}
- public void uninstallListeners(AbstractButton b)
+ protected void uninstallListeners(AbstractButton b)
{
b.removeChangeListener(listener);
b.removePropertyChangeListener(listener);
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java:1.2 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java:1.3
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java:1.2 Sun Oct 24 13:39:20 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicProgressBarUI.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
/* BasicProgressBarUI.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -467,7 +467,7 @@
/**
* This method increments the animation index.
*/
- public void incrementAnimationIndex()
+ protected void incrementAnimationIndex()
{
animationIndex++;
//numFrames is like string length, it should be named numFrames or something
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.6 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.7
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.6 Wed Jan 5 17:27:38 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java Wed Jan 26 13:40:05 2005
@@ -1,5 +1,5 @@
-/* BasicTabbedPaneUI.java
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+/* BasicTabbedPaneUI.java --
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing.plaf.basic;
import java.awt.Color;
@@ -75,7 +76,6 @@
import javax.swing.plaf.UIResource;
import javax.swing.text.View;
-
/**
* This is the Basic Look and Feel's UI delegate for JTabbedPane.
*/
@@ -1458,7 +1458,7 @@
*
* @return A layout manager given the tab layout policy.
*/
- public LayoutManager createLayoutManager()
+ protected LayoutManager createLayoutManager()
{
if (tabPane.getTabLayoutPolicy() == JTabbedPane.WRAP_TAB_LAYOUT)
return new TabbedPaneLayout();
Index: kaffe/libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java
diff -u kaffe/libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java:1.4 kaffe/libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java:1.5
--- kaffe/libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java:1.4 Sun Oct 24 13:39:21 2004
+++ kaffe/libraries/javalib/javax/swing/table/DefaultTableCellRenderer.java Wed Jan 26 13:40:06 2005
@@ -1,5 +1,5 @@
/* DefaultTableCellRenderer.java --
- Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -199,8 +199,8 @@
* <p>This method needs to be overridden in a subclass to actually
* do something.</p>
*/
- public void firePropertyChange(String propertyName, Object oldValue,
- Object newValue)
+ protected void firePropertyChange(String propertyName, Object oldValue,
+ Object newValue)
{
// Does nothing.
}
Index: kaffe/libraries/javalib/javax/swing/table/JTableHeader.java
diff -u kaffe/libraries/javalib/javax/swing/table/JTableHeader.java:1.7 kaffe/libraries/javalib/javax/swing/table/JTableHeader.java:1.8
--- kaffe/libraries/javalib/javax/swing/table/JTableHeader.java:1.7 Sat Jan 22 18:54:12 2005
+++ kaffe/libraries/javalib/javax/swing/table/JTableHeader.java Wed Jan 26 13:40:06 2005
@@ -70,6 +70,11 @@
protected class AccessibleJTableHeaderEntry extends AccessibleContext
implements Accessible, AccessibleComponent
{
+ public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t)
+ {
+ throw new Error("not implemented");
+ }
+
public void addFocusListener(FocusListener l)
{
throw new Error("not implemented");
Index: kaffe/libraries/javalib/javax/swing/text/PlainDocument.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.6 kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.7
--- kaffe/libraries/javalib/javax/swing/text/PlainDocument.java:1.6 Thu Jan 6 22:25:27 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainDocument.java Wed Jan 26 13:40:06 2005
@@ -62,7 +62,7 @@
rootElement = createDefaultRoot();
}
- protected void reindex()
+ private void reindex()
{
Element[] lines;
try
Index: kaffe/libraries/javalib/javax/swing/text/PlainView.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.4 kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.5
--- kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.4 Sat Jan 22 19:10:56 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainView.java Wed Jan 26 13:40:06 2005
@@ -117,7 +117,7 @@
return rect;
}
- public void drawLine(int lineIndex, Graphics g, int x, int y)
+ protected void drawLine(int lineIndex, Graphics g, int x, int y)
{
try
{
@@ -176,7 +176,7 @@
}
}
- public int getTabSize()
+ protected int getTabSize()
{
return 8;
}
Index: kaffe/libraries/javalib/javax/swing/text/View.java
diff -u kaffe/libraries/javalib/javax/swing/text/View.java:1.6 kaffe/libraries/javalib/javax/swing/text/View.java:1.7
--- kaffe/libraries/javalib/javax/swing/text/View.java:1.6 Wed Jan 26 13:24:58 2005
+++ kaffe/libraries/javalib/javax/swing/text/View.java Wed Jan 26 13:40:06 2005
@@ -80,12 +80,6 @@
return parent;
}
- public void setSize(int w, int h)
- {
- width = w;
- height = h;
- }
-
public Container getContainer()
{
View parent = getParent();
@@ -241,6 +235,30 @@
public Graphics getGraphics()
{
return getContainer().getGraphics();
+ }
+
+ public void preferenceChanged(View child, boolean width, boolean height)
+ {
+ if (parent != null)
+ parent.preferenceChanged(this, width, height);
+ }
+
+ public int getBreakWeight(int axis, float pos, float len)
+ {
+ return BadBreakWeight;
+ }
+
+ public View breakView(int axis, int offset, float pos, float len)
+ {
+ return this;
+ }
+
+ /**
+ * @since 1.3
+ */
+ public int getViewIndex(int pos, Position.Bias b)
+ {
+ return -1;
}
}
More information about the kaffe
mailing list