[gui][patch]: Partial implementation of JToolBar

[Kim Ho <kho at redhat dot com>]

Hi,

I'm committing this partial implementation on behalf of Andrew Overholt.

Cheers,

Kim

2004-04-16  Andrew Overholt  <overholt@redhat.com>

	* Makefile.am: Add new file.
	* Makefile.in: Re-generate.	
	* javax/swing/JToolBar.java
	Partially implemented.
	* javax/swing/plaf/basic/BasicToolBarUI.java
	New file. Partially implemented.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.361.2.15
diff -u -r1.361.2.15 Makefile.am
--- Makefile.am	16 Jun 2004 08:20:08 -0000	1.361.2.15
+++ Makefile.am	16 Jun 2004 18:37:35 -0000
@@ -1275,6 +1275,7 @@
 javax/swing/plaf/basic/BasicTabbedPaneUI.java \
 javax/swing/plaf/basic/BasicTextUI.java \
 javax/swing/plaf/basic/BasicToggleButtonUI.java \
+javax/swing/plaf/basic/BasicToolBarUI.java \
 javax/swing/plaf/basic/BasicTreeUI.java \
 javax/swing/plaf/basic/BasicViewportUI.java \
 javax/swing/plaf/basic/BasicLookAndFeel.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.385.2.15
diff -u -r1.385.2.15 Makefile.in
--- Makefile.in	16 Jun 2004 08:20:08 -0000	1.385.2.15
+++ Makefile.in	16 Jun 2004 18:37:36 -0000
@@ -980,6 +980,7 @@
 javax/swing/plaf/basic/BasicTabbedPaneUI.java \
 javax/swing/plaf/basic/BasicTextUI.java \
 javax/swing/plaf/basic/BasicToggleButtonUI.java \
+javax/swing/plaf/basic/BasicToolBarUI.java \
 javax/swing/plaf/basic/BasicTreeUI.java \
 javax/swing/plaf/basic/BasicViewportUI.java \
 javax/swing/plaf/basic/BasicLookAndFeel.java \
@@ -3033,6 +3034,7 @@
 javax/swing/plaf/basic/BasicTabbedPaneUI.lo \
 javax/swing/plaf/basic/BasicTextUI.lo \
 javax/swing/plaf/basic/BasicToggleButtonUI.lo \
+javax/swing/plaf/basic/BasicToolBarUI.lo \
 javax/swing/plaf/basic/BasicTreeUI.lo \
 javax/swing/plaf/basic/BasicViewportUI.lo \
 javax/swing/plaf/basic/BasicLookAndFeel.lo \
@@ -5132,6 +5134,7 @@
 .deps/javax/swing/plaf/basic/BasicTabbedPaneUI.P \
 .deps/javax/swing/plaf/basic/BasicTextUI.P \
 .deps/javax/swing/plaf/basic/BasicToggleButtonUI.P \
+.deps/javax/swing/plaf/basic/BasicToolBarUI.P \
 .deps/javax/swing/plaf/basic/BasicTreeUI.P \
 .deps/javax/swing/plaf/basic/BasicViewportUI.P \
 .deps/javax/swing/plaf/metal/MetalLookAndFeel.P \
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.3.8.2
diff -u -r1.3.8.2 JToolBar.java
--- javax/swing/JToolBar.java	8 Jun 2004 09:28:42 -0000	1.3.8.2
+++ javax/swing/JToolBar.java	16 Jun 2004 18:37:41 -0000
@@ -40,7 +40,9 @@
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.GridLayout;
 import java.awt.Insets;
+import java.awt.LayoutManager;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -184,6 +186,24 @@
 
 	} // Separator
 
+//        /**
+//         * DefaultJToolBarLayout
+//         */
+//        private class DefaultJToolBarLayout {
+//
+//            private void DefaultJToolBarLayout() {
+//            }
+//
+//            private LayoutManager getLayout() {
+//                switch (JToolBar.this.getOrientation()) {
+//                    case HORIZONTAL: setLayout(new GridLayout(1, 0, 4, 4));
+//                                     break;
+//                    case VERTICAL: setLayout(new GridLayout(0, 1, 4, 4));
+//                                   break;
+//                }
+//            }
+//        } // DefaultJToolBarLayout
+
 
     private static final long serialVersionUID = -1269915519555129643L;
     
@@ -214,8 +234,16 @@
 	/**
 	 * orientation
 	 */
-	private int orientation;
+	private int orientation = HORIZONTAL;
+
+	/** Name that is assigned to the window of the undocked JToolBar */
+	private transient String name;
 
+//        protected transient DefaultJToolBarLayout toolbarLayout;
+
+	/** Fired in a PropertyChangeEvent when the "orientation" property changes.
+	*/
+	public static final String ORIENTATION_CHANGED_PROPERTY = "orientation";
 
 	//-------------------------------------------------------------
 	// Initialization ---------------------------------------------
@@ -225,32 +253,38 @@
 	 * Constructor JToolBar
 	 */
 	public JToolBar() {
-		// TODO
+          this(null);
 	} // JToolBar()
 
 	/**
 	 * Constructor JToolBar
-	 * @param orientation TODO
+	 * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
 	 */
 	public JToolBar(int orientation) {
-		// TODO
+          this(null, orientation);
 	} // JToolBar()
 
 	/**
 	 * Constructor JToolBar
-	 * @param name TODO
+	 * @param name Name assigned to undocked tool bar.
 	 */
 	public JToolBar(String name) {
-		// TODO
+          this(name, HORIZONTAL);
 	} // JToolBar()
 
 	/**
 	 * Constructor JToolBar
-	 * @param name TODO
-	 * @param orientation TODO
+	 * @param name Name assigned to undocked tool bar.
+	 * @param orientation JToolBar orientation (HORIZONTAL or VERTICAL)
 	 */
 	public JToolBar(String name, int orientation) {
-		// TODO
+		nameExplicitlySet = (name != null);
+		this.name = name;
+		if (orientation != HORIZONTAL && orientation != VERTICAL)
+			throw new IllegalArgumentException(orientation + " is not a legal orientation");
+		this.orientation = orientation;
+//                toolbarLayout = new DefaultJToolBarLayout();
+                updateUI();	
 	} // JToolBar()
 
 
@@ -289,6 +323,7 @@
 	 * @returns ToolBarUI
 	 */
 	public ToolBarUI getUI() {
+	    System.out.println("ui = " + ui);
 		return (ToolBarUI) ui;
 	} // getUI()
 
@@ -304,8 +339,7 @@
 	 * updateUI
 	 */
 	public void updateUI() {
-		setUI((ToolBarUI) UIManager.get(this));
-		invalidate();
+          setUI((ToolBarUI)UIManager.getUI(this));
 	} // updateUI()
 
 	/**
@@ -387,15 +421,31 @@
 	 * @returns int
 	 */
 	public int getOrientation() {
-		return 0; // TODO
+		return this.orientation;
 	} // getOrientation()
 
 	/**
+	 * setLayout
+	 * @param mgr
+	 */
+	public void setLayout(LayoutManager mgr) {
+	    super.setLayout(mgr);
+	} // setLayout()
+
+	/**
 	 * setOrientation
-	 * @param orientation TODO
+	 * @param orientation
 	 */
 	public void setOrientation(int orientation) {
-		// TODO
+		if (orientation != HORIZONTAL && orientation != VERTICAL)
+			throw new IllegalArgumentException(orientation + " is not a legal orientation");
+	    if (orientation != this.orientation)
+	    {
+		int oldOrientation = this.orientation;
+		this.orientation = orientation;
+		firePropertyChange(ORIENTATION_CHANGED_PROPERTY, oldOrientation,
+			this.orientation);
+	    }
 	} // setOrientation()
 
 	/**
@@ -437,10 +487,11 @@
 	 * @param constraints TODO
 	 * @param index TODO
 	 */
+  /*
 	protected void addImpl(Component component, Object constraints, int index) {
 		// TODO
 	} // addImpl()
-
+  */
 	/**
 	 * paramString
 	 * @returns String
Index: javax/swing/plaf/basic/BasicToolBarUI.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicToolBarUI.java
diff -N javax/swing/plaf/basic/BasicToolBarUI.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/basic/BasicToolBarUI.java	16 Jun 2004 18:37:42 -0000
@@ -0,0 +1,340 @@
+/* BasicToolBarUI.java
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+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.Component;
+import java.awt.ComponentOrientation;
+import java.awt.Container;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.Point;
+import java.util.Enumeration;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JToolBar;
+import javax.swing.RootPaneContainer;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.event.MouseInputListener;
+
+import java.beans.PropertyChangeListener;
+import java.awt.event.ContainerListener;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowListener;
+
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ToolBarUI;
+
+public class BasicToolBarUI extends ToolBarUI
+{
+
+  public class DragWindow
+  {}
+
+    protected String constraintBeforeFloating;
+    protected Color dockingBorderColor;
+    protected Color dockingColor;
+    protected MouseInputListener dockingListener;
+    //protected KeyStroke downKey
+    //          Deprecated. As of Java 2 platform v1.3.
+    protected BasicToolBarUI.DragWindow dragWindow;
+    protected Color floatingBorderColor;
+    protected Color floatingColor;
+    protected int focusedCompIndex;
+    //protected KeyStroke leftKey;
+    //          Deprecated. As of Java 2 platform v1.3.
+    protected PropertyChangeListener propertyListener;
+    //protected KeyStroke rightKey;
+    //          Deprecated. As of Java 2 platform v1.3.
+    protected JToolBar toolBar;
+    protected ContainerListener toolBarContListener;
+    protected FocusListener toolBarFocusListener;
+    //        protected KeyStroke upKey;
+    //        Deprecated. As of Java 2 platform v1.3.
+
+    private Dimension maximumSize;
+    private Dimension minimumSize;
+    private Dimension preferredSize;
+    private boolean floating;
+    private boolean rolloverBorders;
+
+    BasicToolBarUI(JToolBar b)
+    {
+	super();
+    }
+
+    /* Can Component c dock at Point p? */
+    boolean canDock(Component c, Point p)
+    {
+	return false;
+    }
+
+    protected MouseInputListener createDockingListener()
+    {
+      return null;
+    }
+
+    protected BasicToolBarUI.DragWindow createDragWindow(JToolBar toolbar)
+    {
+      return null;
+    }
+
+    protected JFrame createFloatingFrame(JToolBar toolbar)
+    {
+      return null;
+    }
+
+    protected RootPaneContainer createFloatingWindow(JToolBar toolbar)
+    {
+      return null;
+    }
+
+    protected WindowListener createFrameListener()
+    {
+      return null;
+    }
+
+    protected Border createNonRolloverBorder()
+    {
+      return null;
+    }
+
+    protected PropertyChangeListener createPropertyListener()
+    {
+      return null;
+    }
+
+    protected Border createRolloverBorder()
+    {
+      return null;
+    }
+
+    protected ContainerListener createToolBarContListener()
+    {
+      return null;
+    }
+
+    protected FocusListener createToolBarFocusListener()
+    {
+      return null;
+    }
+
+    public static ComponentUI createUI(JComponent c)
+    {
+	return new BasicToolBarUI((JToolBar) c);
+    }
+
+    protected void dragTo(Point position, Point origin)
+    {
+    }
+
+    protected void floatAt(Point position, Point origin)
+    {
+    }
+
+    /* Return the Color which is displayed when over a docking area */
+    Color getDockingColor()
+    {
+	return dockingColor;
+    }
+
+    /* Return the Color which is displayed when over a floating area */
+    Color getFloatingColor()
+    {
+	return floatingColor;
+    }
+
+    /* See ComponentUI */
+  public Dimension getMaximumSize(JComponent c)
+    {
+      return null;
+    }
+
+    /* See ComponentUI */
+  public Dimension getMinimumSize(JComponent c)
+    {
+      return null;
+    }
+
+    /* See ComponentUI */
+  public Dimension getPreferredSize(JComponent c)
+    {
+      return null;
+    }
+
+    protected void installComponents()
+    {
+    }
+
+    protected void installDefaults()
+    {
+    }
+
+    protected void installKeyboardActions()
+    {
+    }
+
+    protected void installListeners(JToolBar toolbar)
+    {
+    	toolbar.addMouseListener(new MouseAdapter() {
+		public void mouseClicked(MouseEvent event) {
+			System.err.println("toolbar clicked");
+		}
+	} );
+    }
+
+    /* Call setBorderToNonRollover for each child component of c */
+    protected void installNonRolloverBorders(JComponent c)
+    {
+    }
+
+    /* Call setBorderToNormal for each child component of c */
+    protected void installNormalBorders(JComponent c)
+    {
+    }
+
+    /* Call setBorderToRollover for each child component of c */
+    protected void installRolloverBorders(JComponent c)
+    {
+    }
+
+    public void installUI(JComponent c)
+    {
+	super.installUI(c);
+	if (c instanceof JToolBar)
+	{
+	    toolBar = (JToolBar) c;
+	    toolBar.setOpaque(true);
+	    switch (toolBar.getOrientation()) {
+		case 0: toolBar.setLayout(new GridLayout(1, 0, 4, 4));
+				 break;
+		case 1: toolBar.setLayout(new GridLayout(0, 1, 4, 4));
+			       break;
+	    }
+	    installListeners(toolBar);
+	}
+    }
+
+    boolean isFloating()
+    {
+	return false;
+    }
+
+    boolean isRolloverBorders()
+    {
+	return false;
+    }
+
+    protected void navigateFocusedComp(int direction)
+    {
+    }
+
+    /* Make Component c have a non-rollover border (created by
+       createNonRolloverBorder). */
+    protected void setBorderToNonRollover(Component c)
+    {
+    }
+
+    /* Make Component c have the border that it originally had before being
+       added to the toolbar. */
+    protected void setBorderToNormal(Component c)
+    {
+    }
+
+    /* Make Component c have a rollover border (created by
+       createRolloverBorder). */
+    protected void setBorderToRollover(Component c)
+    {
+    }
+
+    /* Display in Color c when over a docking area */
+    void setDockingColor(Color c)
+    {
+	dockingColor = c;
+    }
+
+    void setFloating(boolean b, Point p)
+    {
+    }
+
+    /* Display in Color c when over a floating area */
+    void setFloatingColor(Color c)
+    {
+	floatingColor = c;
+    }
+
+    void setFloatingLocation(int x, int y)
+    {
+    }
+
+    void setOrientation(int orientation)
+    {
+    }
+
+    /* Set flag to enable rollover borders for the toolbar */
+    void setRolloverBorders(boolean rollover)
+    {
+	rolloverBorders = rollover;
+    }
+
+    protected void uninstallComponents()
+    {
+    }
+
+    protected void uninstallDefaults()
+    {
+    }
+
+    protected void uninstallKeyboardActions()
+    {
+    }
+
+    protected void uninstallListeners()
+    {
+    }
+
+  public void uninstallUI(JComponent c)
+    {
+    }
+
+}