This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: javax.swing
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 19 Jun 2003 18:33:29 +0200
- Subject: FYI: Patch: javax.swing
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached patch to merge javax.swing with classpath
again.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+8eXaWSOgCCdjSDsRApu6AJ9Jr80KyoLDd8HRtTKG+uS+vyYY0ACgn/uL
spFbMTFR5ikq2pvMQXYCS68=
=h0j+
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1968
diff -u -b -B -r1.1968 ChangeLog
--- ChangeLog 19 Jun 2003 15:13:29 -0000 1.1968
+++ ChangeLog 19 Jun 2003 16:28:48 -0000
@@ -1,5 +1,14 @@
2003-06-19 Michael Koch <konqueror@gmx.de>
+ * javax/swing/JComponent.java,
+ javax/swing/JInternalFrame.java,
+ javax/swing/MenuSelectionManager.java,
+ javax/swing/SwingUtilities.java,
+ javax/swing/ToggleButtonModel.java:
+ New versions from classpath.
+
+2003-06-19 Michael Koch <konqueror@gmx.de>
+
* java/text/CollationElementIterator.java
(NULLORDER): Initialize with -1 as JDK documentation says.
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JComponent.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JComponent.java
--- javax/swing/JComponent.java 11 Jun 2003 13:20:39 -0000 1.3
+++ javax/swing/JComponent.java 19 Jun 2003 16:28:48 -0000
@@ -66,7 +66,6 @@
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleExtendedComponent;
-import javax.accessibility.AccessibleKeyBinding;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleStateSet;
import javax.swing.event.AncestorListener;
@@ -116,16 +115,6 @@
* AccessibleFocusHandler
*/
protected class AccessibleFocusHandler implements FocusListener {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor AccessibleFocusHandler
* @param component TODO
@@ -134,11 +123,6 @@
// TODO
} // AccessibleFocusHandler()
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* focusGained
* @param event TODO
@@ -162,16 +144,6 @@
* AccessibleContainerHandler
*/
protected class AccessibleContainerHandler implements ContainerListener {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor AccessibleContainerHandler
* @param component TODO
@@ -180,11 +152,6 @@
// TODO
} // AccessibleContainerHandler()
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* componentAdded
* @param event TODO
@@ -200,15 +167,8 @@
public void componentRemoved(ContainerEvent valevent) {
// TODO
} // componentRemoved()
-
-
} // AccessibleContainerHandler
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
/**
* accessibleContainerHandler
*/
@@ -219,11 +179,6 @@
*/
protected FocusListener accessibleFocusHandler;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor AccessibleJComponent
* @param component TODO
@@ -233,11 +188,6 @@
// TODO
} // AccessibleJComponent()
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
-
/**
* addPropertyChangeListener
* @param listener TODO
@@ -658,16 +602,6 @@
}
}
-
-
- /*********************************************************************
- *
- *
- * tooltips:
- *
- *
- **************************************/
-
public JToolTip createToolTip()
{
if (tooltip == null)
@@ -687,15 +621,6 @@
public String getToolTipText(MouseEvent event)
{ return tool_tip_text; }
- /*********************************************************************
- *
- *
- * things to do with visibility:
- *
- *
- **************************************/
-
-
public Container getTopLevelAncestor()
{
// Returns the top-level ancestor of this component (either the containing Window or Applet), or null if this component has not been added to any container.
@@ -1042,16 +967,6 @@
{
paint(g);
}
-
-
-
- /******************************************
- *
- *
- * UI management
- *
- *
- *********/
public String getUIClassID()
{
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JInternalFrame.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JInternalFrame.java
--- javax/swing/JInternalFrame.java 9 Aug 2002 04:26:10 -0000 1.1
+++ javax/swing/JInternalFrame.java 19 Jun 2003 16:28:48 -0000
@@ -35,11 +35,27 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
-/**
- * STUBBED
- */
+
+import java.awt.Component;
+import java.awt.Container;
+import javax.accessibility.Accessible;
+
public class JInternalFrame extends JComponent
/*implements Accessible, WindowConstants, RootPaneContainer*/
{
+ private static final long serialVersionUID = -5425177187760785402L;
+
+ public static final String CONTENT_PANE_PROPERTY = "contentPane";
+ public static final String MENU_BAR_PROPERTY = "JMenuBar";
+ public static final String TITLE_PROPERTY = "title";
+ public static final String LAYERED_PANE_PROPERTY = "layeredPane";
+ public static final String ROOT_PANE_PROPERTY = "rootPane";
+ public static final String GLASS_PANE_PROPERTY = "glassPane";
+ public static final String FRAME_ICON_PROPERTY = "frameIcon";
+ public static final String IS_SELECTED_PROPERTY = "selected";
+ public static final String IS_CLOSED_PROPERTY = "closed";
+ public static final String IS_MAXIMUM_PROPERTY = "maximum";
+ public static final String IS_ICON_PROPERTY = "icon";
} // class JInternalFrame
Index: javax/swing/MenuSelectionManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/MenuSelectionManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 MenuSelectionManager.java
--- javax/swing/MenuSelectionManager.java 9 Aug 2002 04:26:10 -0000 1.1
+++ javax/swing/MenuSelectionManager.java 19 Jun 2003 16:28:48 -0000
@@ -35,10 +35,42 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package javax.swing;
-/**
- * STUBBED
- */
+
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+
public class MenuSelectionManager
{
+ protected ChangeEvent changeEvent;
+
+ protected EventListenerList listenerList = new EventListenerList ();
+
+ protected void fireStateChanged ()
+ {
+ ChangeListener[] listeners = getChangeListeners ();
+
+ for (int i = 0; i < listeners.length; i++)
+ {
+ listeners [i].stateChanged (new ChangeEvent (this));
+ }
+ }
+
+ public void addChangeListener (ChangeListener listener)
+ {
+ listenerList.add (ChangeListener.class, listener);
+ }
+
+ public void removeChangeListener (ChangeListener listener)
+ {
+ listenerList.remove (ChangeListener.class, listener);
+ }
+
+ /** @since 1.4 */
+ public ChangeListener[] getChangeListeners ()
+ {
+ return (ChangeListener[]) listenerList.getListeners (ChangeListener.class);
+ }
} // class MenuSelectionManager
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SwingUtilities.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 SwingUtilities.java
--- javax/swing/SwingUtilities.java 9 Aug 2002 04:26:10 -0000 1.1
+++ javax/swing/SwingUtilities.java 19 Jun 2003 16:28:48 -0000
@@ -35,20 +35,34 @@
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.*;
+package javax.swing;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.EventQueue;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.lang.reflect.InvocationTargetException;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleStateSet;
-public class SwingUtilities
+public class SwingUtilities implements SwingConstants
+{
+ public static FontMetrics getFontMetrics (Font font)
{
-
- public static FontMetrics getFontMetrics ( Font font ) {
return Toolkit.getDefaultToolkit().getFontMetrics(font);
}
-
- static JRootPane getRootPane(Component a)
+ public static JRootPane getRootPane (Component a)
{
if (a instanceof JRootPane)
return (JRootPane) a;
@@ -63,11 +77,11 @@
return null;
}
- static void updateComponentTreeUI(JFrame comp)
+ public static void updateComponentTreeUI(JFrame comp)
{
}
- static public String layoutCompoundLabel(JComponent c,
+ public static String layoutCompoundLabel(JComponent c,
FontMetrics fm,
String text,
Icon i,
Index: javax/swing/ToggleButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ToggleButtonModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ToggleButtonModel.java
--- javax/swing/ToggleButtonModel.java 9 Aug 2002 04:26:10 -0000 1.1
+++ javax/swing/ToggleButtonModel.java 19 Jun 2003 16:28:48 -0000
@@ -35,14 +35,10 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-package javax.swing;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.event.*;
+package javax.swing;
-public
-class ToggleButtonModel extends DefaultButtonModel
+public class ToggleButtonModel extends DefaultButtonModel
{
ToggleButtonModel(JComponent c)
{