PatchSet 6594
Date: 2005/05/30 01:27:44
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with gnu classpath: awt and swing fix
Members:
ChangeLog:1.4119->1.4120
libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.4->1.5
libraries/javalib/javax/swing/AbstractButton.java:1.14->1.15
libraries/javalib/javax/swing/ImageIcon.java:1.7->1.8
libraries/javalib/javax/swing/JFileChooser.java:1.5->1.6
libraries/javalib/javax/swing/JInternalFrame.java:1.9->1.10
libraries/javalib/javax/swing/JMenu.java:1.10->1.11
libraries/javalib/javax/swing/JRadioButton.java:1.5->1.6
libraries/javalib/javax/swing/JScrollPane.java:1.9->1.10
libraries/javalib/javax/swing/JSpinner.java:1.6->1.7
libraries/javalib/javax/swing/JTabbedPane.java:1.6->1.7
libraries/javalib/javax/swing/JToggleButton.java:1.7->1.8
libraries/javalib/javax/swing/JToolTip.java:1.3->1.4
libraries/javalib/javax/swing/JViewport.java:1.9->1.10
libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java:1.1->1.2
libraries/javalib/javax/swing/SpinnerDateModel.java:1.1->1.2
libraries/javalib/javax/swing/TransferHandler.java:1.7->1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4119 kaffe/ChangeLog:1.4120
--- kaffe/ChangeLog:1.4119 Mon May 30 01:15:40 2005
+++ kaffe/ChangeLog Mon May 30 01:27:44 2005
@@ -2,6 +2,35 @@
Resynced with GNU Classpath.
+ 2005-05-27 Roman Kennke <[EMAIL PROTECTED]>
+
+ * javax/swing/AbstractButton.java:
+ Bumped up serialVersionUID(s) to JDK1.4 compatibility.
+ * javax/swing/ImageIcon.java: Likewise.
+ * javax/swing/JFileChooser.java: Likewise.
+ * javax/swing/JInternalFrame.java: Likewise.
+ * javax/swing/JMenu.java: Likewise.
+ * javax/swing/JRadioButton.java: Likewise.
+ * javax/swing/JScrollPane.java: Likewise.
+ * javax/swing/JSpinner.java: Likewise.
+ * javax/swing/JTabbedPane.java: Likewise.
+ * javax/swing/ImageIcons.java: Likewise.
+ * javax/swing/JToggleButton.java: Likewise.
+ * javax/swing/JToolTip.java: Likewise.
+ * javax/swing/JViewPort.java: Likewise.
+ * javax/swing/LayoutFocusTraversalPolicy.java: Likewise.
+ * javax/swing/SpinnerDateModel.java: Likewise.
+ * javax/swing/TransferHandler.java: Likewise.
+
+2005-05-27 Thomas Fitzsimmons <[EMAIL PROTECTED]>
+
+ * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): Handle
+ lightweight peers specially.
+
+2005-05-30 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-05-26 Andrew John Hughes <[EMAIL PROTECTED]>
* java/net/URI.java:
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.4
kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.5
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java:1.4
Mon Feb 14 20:49:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkContainerPeer.java Mon May
30 01:27:47 2005
@@ -115,9 +115,14 @@
Component[] components = ((Container) awtComponent).getComponents();
for (int i = 0; i < components.length; i++)
{
- GtkComponentPeer peer = (GtkComponentPeer) components[i].getPeer();
- if (peer != null && ! peer.awtComponent.isFontSet())
- peer.setFont(f);
+ if (components[i].isLightweight ())
+ components[i].setFont (f);
+ else
+ {
+ GtkComponentPeer peer = (GtkComponentPeer) components[i].getPeer();
+ if (peer != null && ! peer.awtComponent.isFontSet())
+ peer.setFont(f);
+ }
}
}
Index: kaffe/libraries/javalib/javax/swing/AbstractButton.java
diff -u kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.14
kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.15
--- kaffe/libraries/javalib/javax/swing/AbstractButton.java:1.14 Thu May
26 11:10:40 2005
+++ kaffe/libraries/javalib/javax/swing/AbstractButton.java Mon May 30
01:27:47 2005
@@ -160,6 +160,8 @@
protected class ButtonChangeListener
implements ChangeListener, Serializable
{
+ private static final long serialVersionUID = 1471056094226600578L;
+
/**
* Notified when the target of the listener changes its state.
*
Index: kaffe/libraries/javalib/javax/swing/ImageIcon.java
diff -u kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.7
kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.8
--- kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.7 Thu May 19
00:31:21 2005
+++ kaffe/libraries/javalib/javax/swing/ImageIcon.java Mon May 30 01:27:47 2005
@@ -63,6 +63,8 @@
extends AccessibleContext
implements AccessibleIcon, Serializable
{
+ private static final long serialVersionUID = 2113430526551336564L;
+
/**
* Creates a new instance of AccessibleImageIcon.
*/
Index: kaffe/libraries/javalib/javax/swing/JFileChooser.java
diff -u kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.5
kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.6
--- kaffe/libraries/javalib/javax/swing/JFileChooser.java:1.5 Thu May 26
11:10:40 2005
+++ kaffe/libraries/javalib/javax/swing/JFileChooser.java Mon May 30
01:27:47 2005
@@ -58,6 +58,8 @@
*/
public class JFileChooser extends JComponent implements Accessible
{
+ private static final long serialVersionUID = 3162921138695327837L;
+
/** DOCUMENT ME! */
public static final int OPEN_DIALOG = 0;
Index: kaffe/libraries/javalib/javax/swing/JInternalFrame.java
diff -u kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.9
kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.10
--- kaffe/libraries/javalib/javax/swing/JInternalFrame.java:1.9 Thu May 26
11:10:40 2005
+++ kaffe/libraries/javalib/javax/swing/JInternalFrame.java Mon May 30
01:27:47 2005
@@ -76,6 +76,8 @@
protected class AccessibleJInternalFrame extends AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = 5931936924175476797L;
+
/**
* Creates a new AccessibleJInternalFrame object.
*/
@@ -168,6 +170,8 @@
protected class AccessibleJDesktopIcon extends AccessibleJComponent
implements AccessibleValue
{
+ private static final long serialVersionUID = 5035560458941637802L;
+
/**
* Creates a new AccessibleJDesktopIcon object.
*/
@@ -238,6 +242,8 @@
return false;
}
}
+
+ private static final long serialVersionUID = 4672973344731387687L;
/** The JInternalFrame this DesktopIcon represents. */
JInternalFrame frame;
Index: kaffe/libraries/javalib/javax/swing/JMenu.java
diff -u kaffe/libraries/javalib/javax/swing/JMenu.java:1.10
kaffe/libraries/javalib/javax/swing/JMenu.java:1.11
--- kaffe/libraries/javalib/javax/swing/JMenu.java:1.10 Sat Apr 23 12:02:52 2005
+++ kaffe/libraries/javalib/javax/swing/JMenu.java Mon May 30 01:27:47 2005
@@ -797,6 +797,8 @@
protected class AccessibleJMenu extends AccessibleJMenuItem
implements AccessibleSelection
{
+ private static final long serialVersionUID = -8131864021059524309L;
+
protected AccessibleJMenu()
{
}
Index: kaffe/libraries/javalib/javax/swing/JRadioButton.java
diff -u kaffe/libraries/javalib/javax/swing/JRadioButton.java:1.5
kaffe/libraries/javalib/javax/swing/JRadioButton.java:1.6
--- kaffe/libraries/javalib/javax/swing/JRadioButton.java:1.5 Sat Feb 19
15:14:18 2005
+++ kaffe/libraries/javalib/javax/swing/JRadioButton.java Mon May 30
01:27:47 2005
@@ -79,6 +79,7 @@
protected class AccessibleJRadioButton
extends AccessibleJToggleButton
{
+ private static final long serialVersionUID = 4850967637026120674L;
/**
* Constructor for the accessible toggle button.
Index: kaffe/libraries/javalib/javax/swing/JScrollPane.java
diff -u kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.9
kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.10
--- kaffe/libraries/javalib/javax/swing/JScrollPane.java:1.9 Thu Jan 27
14:07:11 2005
+++ kaffe/libraries/javalib/javax/swing/JScrollPane.java Mon May 30
01:27:47 2005
@@ -645,6 +645,8 @@
extends JScrollBar
implements UIResource
{
+ private static final long serialVersionUID = -42032395320987283L;
+
public ScrollBar(int orientation)
{
super(orientation);
Index: kaffe/libraries/javalib/javax/swing/JSpinner.java
diff -u kaffe/libraries/javalib/javax/swing/JSpinner.java:1.6
kaffe/libraries/javalib/javax/swing/JSpinner.java:1.7
--- kaffe/libraries/javalib/javax/swing/JSpinner.java:1.6 Mon Feb 14
20:49:40 2005
+++ kaffe/libraries/javalib/javax/swing/JSpinner.java Mon May 30 01:27:47 2005
@@ -279,6 +279,8 @@
}
}
+ private static final long serialVersionUID = 3412663575706551720L;
+
/** DOCUMENT ME! */
private SpinnerModel model;
Index: kaffe/libraries/javalib/javax/swing/JTabbedPane.java
diff -u kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.6
kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.7
--- kaffe/libraries/javalib/javax/swing/JTabbedPane.java:1.6 Sun Feb 13
22:33:37 2005
+++ kaffe/libraries/javalib/javax/swing/JTabbedPane.java Mon May 30
01:27:47 2005
@@ -530,6 +530,8 @@
}
}
+ private static final long serialVersionUID = 1614381073220130939L;
+
/** The changeEvent used to fire changes to listeners. */
protected ChangeEvent changeEvent;
Index: kaffe/libraries/javalib/javax/swing/JToggleButton.java
diff -u kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.7
kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.8
--- kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.7 Sun May 15
09:26:25 2005
+++ kaffe/libraries/javalib/javax/swing/JToggleButton.java Mon May 30
01:27:47 2005
@@ -69,6 +69,7 @@
extends AccessibleAbstractButton
implements ItemListener
{
+ private static final long serialVersionUID = -8652952712161229225L;
/**
* Constructor for the accessible toggle button.
Index: kaffe/libraries/javalib/javax/swing/JToolTip.java
diff -u kaffe/libraries/javalib/javax/swing/JToolTip.java:1.3
kaffe/libraries/javalib/javax/swing/JToolTip.java:1.4
--- kaffe/libraries/javalib/javax/swing/JToolTip.java:1.3 Sun Oct 24
13:39:12 2004
+++ kaffe/libraries/javalib/javax/swing/JToolTip.java Mon May 30 01:27:47 2005
@@ -60,6 +60,8 @@
*/
protected class AccessibleJToolTip extends AccessibleJComponent
{
+ private static final long serialVersionUID = -6222548177795408476L;
+
/**
* Creates a new AccessibleJToolTip object.
*/
Index: kaffe/libraries/javalib/javax/swing/JViewport.java
diff -u kaffe/libraries/javalib/javax/swing/JViewport.java:1.9
kaffe/libraries/javalib/javax/swing/JViewport.java:1.10
--- kaffe/libraries/javalib/javax/swing/JViewport.java:1.9 Thu May 26
11:10:44 2005
+++ kaffe/libraries/javalib/javax/swing/JViewport.java Mon May 30 01:27:47 2005
@@ -107,6 +107,8 @@
extends ComponentAdapter
implements Serializable
{
+ private static final long serialVersionUID = -2812489404285958070L;
+
/**
* Creates a new instance of ViewListener.
*/
Index: kaffe/libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java
diff -u kaffe/libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java:1.1
kaffe/libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java:1.2
--- kaffe/libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java:1.1
Wed Jan 26 13:20:23 2005
+++ kaffe/libraries/javalib/javax/swing/LayoutFocusTraversalPolicy.java Mon May
30 01:27:47 2005
@@ -79,6 +79,8 @@
return 1;
}
}
+
+ private static final long serialVersionUID = 4312146927238881442L;
public LayoutFocusTraversalPolicy()
{
Index: kaffe/libraries/javalib/javax/swing/SpinnerDateModel.java
diff -u kaffe/libraries/javalib/javax/swing/SpinnerDateModel.java:1.1
kaffe/libraries/javalib/javax/swing/SpinnerDateModel.java:1.2
--- kaffe/libraries/javalib/javax/swing/SpinnerDateModel.java:1.1 Mon Feb
14 22:52:33 2005
+++ kaffe/libraries/javalib/javax/swing/SpinnerDateModel.java Mon May 30
01:27:47 2005
@@ -61,9 +61,9 @@
/**
* For compatability with Sun's JDK
- * FIXME: what's the number? And which fields should be serialized?
+ * FIXME: Which fields should be serialized?
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -4802518107105940612L;
/**
* Constructs a SpinnerDateModel using the current date,
Index: kaffe/libraries/javalib/javax/swing/TransferHandler.java
diff -u kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.7
kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.8
--- kaffe/libraries/javalib/javax/swing/TransferHandler.java:1.7 Sun May
15 09:46:20 2005
+++ kaffe/libraries/javalib/javax/swing/TransferHandler.java Mon May 30
01:27:47 2005
@@ -102,7 +102,7 @@
}
}
- private static final long serialVersionUID = -7908749299918704233L;
+ private static final long serialVersionUID = -967749805571669910L;
private static final String COMMAND_COPY = "copy";
private static final String COMMAND_CUT = "cut";
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
