* java/awt/Container.java (remove(int)): Wrote.
(remove(Component)): Wrote.
(add(Component)): Wrote.
(add(Component,int)): Wrote.
(removeAll): Wrote.
(addNotify): Set our own peer.
* java/awt/Scrollbar.java (listeners): Changed type.
(Scrollbar): Don't initialize listeners.
(addNotify): Wrote.
(setValue): Call setValues.
(setMinimum): Likewise.
(setMaxPriority): Likewise.
(setVisibleAmount): Likewise.
(setValues): Wrote.
(setUnitIncrement): Forward to peer.
(setLineIncrement): Call setUnitIncrement.
(setPageIncrement): Call setBlockIncrement.
(setBlockIncrement): Forward to peer.
(addAdjustmentListener): Rewrote.
(removeAdjustmentListener): Rewrote.
(processAdjustmentEvent): Rewrote.
(paramString): Wrote.
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Added Button.java.
* java/awt/Button.java: New file.
* java/awt/Toolkit.java (createLabel): Declare.
(createButton): Likewise.
(createScrollbar): Likewise.
(createContainer): Likewise.
* java/awt/Label.java (addNotify): Wrote.
(setAlignment): Call setAlignment in the peer.
(setText): Call setText in the peer.
From-SVN: r35354
+2000-07-30 Tom Tromey <tromey@cygnus.com>
+
+ * java/awt/Container.java (remove(int)): Wrote.
+ (remove(Component)): Wrote.
+ (add(Component)): Wrote.
+ (add(Component,int)): Wrote.
+ (removeAll): Wrote.
+ (addNotify): Set our own peer.
+ * java/awt/Scrollbar.java (listeners): Changed type.
+ (Scrollbar): Don't initialize listeners.
+ (addNotify): Wrote.
+ (setValue): Call setValues.
+ (setMinimum): Likewise.
+ (setMaxPriority): Likewise.
+ (setVisibleAmount): Likewise.
+ (setValues): Wrote.
+ (setUnitIncrement): Forward to peer.
+ (setLineIncrement): Call setUnitIncrement.
+ (setPageIncrement): Call setBlockIncrement.
+ (setBlockIncrement): Forward to peer.
+ (addAdjustmentListener): Rewrote.
+ (removeAdjustmentListener): Rewrote.
+ (processAdjustmentEvent): Rewrote.
+ (paramString): Wrote.
+ * Makefile.in: Rebuilt.
+ * Makefile.am (awt_java_source_files): Added Button.java.
+ * java/awt/Button.java: New file.
+ * java/awt/Toolkit.java (createLabel): Declare.
+ (createButton): Likewise.
+ (createScrollbar): Likewise.
+ (createContainer): Likewise.
+ * java/awt/Label.java (addNotify): Wrote.
+ (setAlignment): Call setAlignment in the peer.
+ (setText): Call setText in the peer.
+
2000-07-28 Warren Levy <warrenl@cygnus.com>
* java/io/ObjectOutputStream.java (writeObject): Per spec, call
--- /dev/null
+/* Copyright (C) 2000 Free Software Foundation
+
+ This file is part of libjava.
+
+This software is copyrighted work licensed under the terms of the
+Libjava License. Please consult the file "LIBJAVA_LICENSE" for
+details. */
+
+package java.awt;
+import java.awt.peer.ButtonPeer;
+import java.awt.peer.ComponentPeer;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date July 30, 2000
+ */
+
+public class Button extends Component
+{
+ public Button ()
+ {
+ this (null);
+ }
+
+ public Button (String label)
+ {
+ this.label = label;
+ }
+
+ public void addActionListener (ActionListener l)
+ {
+ listeners = AWTEventMulticaster.add (listeners, l);
+ }
+
+ public void addNotify ()
+ {
+ peer = (ComponentPeer) getToolkit ().createButton (this);
+ }
+
+ public String getActionCommand ()
+ {
+ return command;
+ }
+
+ public String getLabel ()
+ {
+ return label;
+ }
+
+ protected String paramString ()
+ {
+ return "Button[" + label + "]";
+ }
+
+ protected void processActionEvent (ActionEvent e)
+ {
+ if (listeners != null)
+ listeners.actionPerformed (e);
+ }
+
+ protected void processEvent (AWTEvent e)
+ {
+ if (e instanceof ActionEvent)
+ processActionEvent ((ActionEvent) e);
+ else
+ super.processEvent (e);
+ }
+
+ public void removeActionListener (ActionListener l)
+ {
+ listeners = AWTEventMulticaster.remove (listeners, l);
+ }
+
+ public void setActionCommand (String command)
+ {
+ this.command = (command == null) ? label : command;
+ }
+
+ public void setLabel (String label)
+ {
+ this.label = label;
+ if (peer != null)
+ {
+ ButtonPeer bp = (ButtonPeer) peer;
+ bp.setLabel (label);
+ }
+ }
+
+ private String label;
+ private String command;
+ private ActionListener listeners;
+}
}
/** @deprecated */
+ // However, Classpath's Gtk peers rely on it.
public java.awt.peer.ComponentPeer getPeer()
{
return peer;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.EventListener;
+import java.awt.peer.ComponentPeer;
+import java.awt.peer.ContainerPeer;
/* A very incomplete placeholder. */
return getInsets();
}
- public Component add(Component comp)
+ public Component add (Component comp)
{
- // FIXME
- return null;
+ return add (comp, -1);
}
public Component add(String name, Component comp)
public Component add(Component comp, int index)
{
- // FIXME
- return null;
+ // This isn't the most efficient implementation. We could do less
+ // copying when growing the array. It probably doesn't matter.
+ if (ncomponents >= component.length)
+ {
+ int nl = component.length * 2;
+ Component[] c = new Component[nl];
+ System.arraycopy (component, 0, c, 0, ncomponents);
+ component = c;
+ }
+
+ if (index == -1)
+ component[ncomponents++] = comp;
+ else
+ {
+ System.arraycopy (component, index, component, index + 1,
+ ncomponents - index);
+ component[index] = comp;
+ ++ncomponents;
+ }
+
+ return comp;
}
public void add(Component comp, Object constraints)
// FIXME
}
- public void remove(int index)
+ public void remove (int index)
{
- // FIXME
+ System.arraycopy (component, index + 1, component, index,
+ ncomponents - index - 1);
+ component[--ncomponents] = null;
}
- public void remove(Component comp)
+ public void remove (Component comp)
{
- // FIXME
+ for (int i = 0; i < ncomponents; ++i)
+ if (component[i] == comp)
+ {
+ remove (i);
+ break;
+ }
}
public void removeAll()
{
- // FIXME
+ while (ncomponents >= 0)
+ component[--ncomponents] = null;
}
public LayoutManager getLayout()
{
for (int i = ncomponents; --i >= 0; )
component[i].addNotify();
- }
+ peer = (ComponentPeer) getToolkit ().createContainer (this);
+ }
public void removeNotify()
{
details. */
package java.awt;
+import java.awt.peer.ComponentPeer;
+import java.awt.peer.LabelPeer;
/**
* @author Tom Tromey <tromey@cygnus.com>
* @date April 12, 2000
*/
-/* Status: addNotify() not written. */
-
public class Label extends Component
{
public static final int CENTER = 1;
public void addNotify ()
{
- // FIXME
+ peer = (ComponentPeer) getToolkit ().createLabel (this);
}
public int getAlignment ()
if (alignment != CENTER && alignment != LEFT && alignment != RIGHT)
throw new IllegalArgumentException ();
this.alignment = alignment;
+ if (peer != null)
+ {
+ LabelPeer lp = (LabelPeer) peer;
+ lp.setAlignment (alignment);
+ }
}
public void setText (String text)
{
this.text = text;
+ if (peer != null)
+ {
+ LabelPeer lp = (LabelPeer) peer;
+ lp.setText (text);
+ }
}
private String text;
package java.awt;
import java.awt.event.*;
-import java.util.Vector;
-import java.util.Enumeration;
+import java.awt.peer.ScrollbarPeer;
+import java.awt.peer.ComponentPeer;
/**
* @author Tom Tromey <tromey@cygnus.com>
this.minimum = minimum;
this.maximum = maximum;
this.unit = 1;
- this.listeners = new Vector ();
this.block = 0; // FIXME
}
public void addNotify ()
{
- // FIXME
+ peer = (ComponentPeer) getToolkit ().createScrollbar (this);
}
public int getOrientation ()
public void setValue (int value)
{
- if (value < minimum)
- value = minimum;
- else if (value > maximum)
- value = maximum;
- this.value = value;
+ setValues (value, visible, minimum, maximum);
}
public int getMinimum ()
public void setMinimum (int minimum)
{
- // FIXME: what if it is > max?
- this.minimum = minimum;
+ setValues (value, visible, minimum, maximum);
}
public int getMaximum ()
public void setMaximum (int maximum)
{
- // FIXME: what if it is < min?
- this.maximum = maximum;
+ setValues (value, visible, minimum, maximum);
}
public int getVisibleAmount ()
public void setVisibleAmount (int visible)
{
- this.visible = visible;
+ setValues (value, visible, minimum, maximum);
}
public void setUnitIncrement (int v)
{
unit = v;
+ if (peer != null)
+ {
+ ScrollbarPeer sp = (ScrollbarPeer) peer;
+ sp.setLineIncrement (v);
+ }
}
+ /** @deprecated */
public void setLineIncrement (int v)
{
- unit = v;
+ setUnitIncrement (v);
}
public int getUnitIncrement ()
public void setBlockIncrement (int v)
{
block = v;
+ if (peer != null)
+ {
+ ScrollbarPeer sp = (ScrollbarPeer) peer;
+ sp.setPageIncrement (v);
+ }
}
public void setPageIncrement (int v)
{
- block = v;
+ setBlockIncrement (v);
}
public int getBlockIncrement ()
public synchronized void setValues (int value, int visible,
int minimum, int maximum)
{
- // fixme;
+ if (maximum < minimum)
+ maximum = minimum;
+ if (value < minimum)
+ value = minimum;
+ if (value > maximum)
+ value = maximum;
+
+ this.value = value;
+ this.visible = visible;
+ this.minimum = minimum;
+ this.maximum = maximum;
+
+ if (peer != null)
+ {
+ ScrollbarPeer sp = (ScrollbarPeer) peer;
+ sp.setValues (value, visible, minimum, maximum);
+ }
}
public void addAdjustmentListener (AdjustmentListener l)
{
- if (l != null)
- {
- listeners.addElement (l);
- enableEvents (0); // FIXME
- }
+ listeners = AWTEventMulticaster.add (listeners, l);
}
public void removeAdjustmentListener (AdjustmentListener l)
{
- if (l != null)
- listeners.remove (l);
+ listeners = AWTEventMulticaster.add (listeners, l);
}
protected void processEvent (AWTEvent e)
protected void processAdjustmentEvent (AdjustmentEvent e)
{
- Enumeration en = listeners.elements ();
- while (en.hasMoreElements ())
- {
- AdjustmentListener l = (AdjustmentListener) en.nextElement ();
- l.adjustmentValueChanged (e);
- }
+ if (listeners != null)
+ listeners.adjustmentValueChanged (e);
}
protected String paramString ()
{
- return null; // FIXME
+ return ("Scrollbar["
+ + ((orientation == VERTICAL) ? "VERTICAL" : "HORIZONTAL") + ","
+ + value + ","
+ + visible + ","
+ + minimum + ","
+ + maximum + ","
+ + unit + ","
+ + block + "]");
}
- private Vector listeners;
+ private AdjustmentListener listeners;
private int orientation;
private int value;
private int visible;
protected abstract FramePeer createFrame(Frame target);
public abstract Image getImage(URL url);
+ protected abstract ButtonPeer createButton (Button target);
+ protected abstract ContainerPeer createContainer (Container target);
+ protected abstract LabelPeer createLabel (Label target);
+ protected abstract ScrollbarPeer createScrollbar (Scrollbar target);
+
public final EventQueue getSystemEventQueue()
{
return systemEventQueue;
projects / gcc.git / commitdiff