aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/awt/event
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/awt/event')
-rw-r--r--libjava/java/awt/event/ActionEvent.java25
-rw-r--r--libjava/java/awt/event/AdjustmentEvent.java45
-rw-r--r--libjava/java/awt/event/ComponentEvent.java21
-rw-r--r--libjava/java/awt/event/ContainerEvent.java26
-rw-r--r--libjava/java/awt/event/FocusEvent.java17
-rw-r--r--libjava/java/awt/event/HierarchyBoundsAdapter.java27
-rw-r--r--libjava/java/awt/event/HierarchyBoundsListener.java22
-rw-r--r--libjava/java/awt/event/HierarchyEvent.java96
-rw-r--r--libjava/java/awt/event/HierarchyListener.java21
-rw-r--r--libjava/java/awt/event/InputMethodEvent.java16
-rw-r--r--libjava/java/awt/event/InvocationEvent.java39
-rw-r--r--libjava/java/awt/event/ItemEvent.java28
-rw-r--r--libjava/java/awt/event/KeyEvent.java18
-rw-r--r--libjava/java/awt/event/MouseEvent.java35
-rw-r--r--libjava/java/awt/event/PaintEvent.java18
-rw-r--r--libjava/java/awt/event/TextEvent.java2
-rw-r--r--libjava/java/awt/event/WindowEvent.java27
17 files changed, 433 insertions, 50 deletions
diff --git a/libjava/java/awt/event/ActionEvent.java b/libjava/java/awt/event/ActionEvent.java
index de0d376..cd0761c 100644
--- a/libjava/java/awt/event/ActionEvent.java
+++ b/libjava/java/awt/event/ActionEvent.java
@@ -21,25 +21,25 @@ public class ActionEvent extends AWTEvent
public static final int META_MASK = 4;
public static final int SHIFT_MASK = 1;
- String actionCommand;
+ String cmd;
int modifiers;
public ActionEvent (Object source, int id, String command)
{
super(source, id);
- actionCommand = command;
+ cmd = command;
}
public ActionEvent (Object source, int id, String command, int modifiers)
{
super(source, id);
- actionCommand = command;
+ cmd = command;
this.modifiers = modifiers;
}
- public String getActionCommand ()
+ public String getcmd ()
{
- return actionCommand;
+ return cmd;
}
public int getModifiers ()
@@ -49,7 +49,18 @@ public class ActionEvent extends AWTEvent
public String paramString ()
{
- return ("ActionEvent[" + actionCommand + "," + modifiers
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case ACTION_PERFORMED:
+ r = "ACTION_PERFORMED";
+ break;
+ default:
+ r = "unknown type";
+ break;
+ }
+
+ r += ",cmd=" + cmd;
+ return r;
}
}
diff --git a/libjava/java/awt/event/AdjustmentEvent.java b/libjava/java/awt/event/AdjustmentEvent.java
index 84838b6..9da9993 100644
--- a/libjava/java/awt/event/AdjustmentEvent.java
+++ b/libjava/java/awt/event/AdjustmentEvent.java
@@ -30,7 +30,7 @@ public class AdjustmentEvent extends AWTEvent
public AdjustmentEvent (Adjustable source, int id, int type, int value)
{
super (source, id);
- this.type = type;
+ this.adjType = type;
this.value = value;
}
@@ -41,7 +41,7 @@ public class AdjustmentEvent extends AWTEvent
public int getAdjustmentType ()
{
- return type;
+ return adjType;
}
public int getValue ()
@@ -51,10 +51,45 @@ public class AdjustmentEvent extends AWTEvent
public String paramString ()
{
- return ("AdjustmentEvent[" + type + "," + value
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case ADJUSTMENT_VALUE_CHANGED:
+ r = "ADJUSTMENT_VALUE_CHANGED";
+ break;
+ default:
+ r = "unknown id";
+ break;
+ }
+
+ r += ",adjType=";
+
+ switch (adjType)
+ {
+ case BLOCK_DECREMENT:
+ r += "BLOCK_DECREMENT";
+ break;
+ case BLOCK_INCREMENT:
+ r += "BLOCK_INCREMENT";
+ break;
+ case TRACK:
+ r += "TRACK";
+ break;
+ case UNIT_DECREMENT:
+ r += "UNIT_DECREMENT";
+ break;
+ case UNIT_INCREMENT:
+ r += "UNIT_INCREMENT";
+ break;
+ default:
+ r += "unknown type";
+ break;
+ }
+
+ r += ",value=" + value;
+ return r;
}
- private int type;
+ private int adjType;
private int value;
}
diff --git a/libjava/java/awt/event/ComponentEvent.java b/libjava/java/awt/event/ComponentEvent.java
index bb34a6e..bdf80ce 100644
--- a/libjava/java/awt/event/ComponentEvent.java
+++ b/libjava/java/awt/event/ComponentEvent.java
@@ -37,6 +37,25 @@ public class ComponentEvent extends AWTEvent
public String paramString ()
{
- return super.paramString ();
+ String r;
+ switch (id)
+ {
+ case COMPONENT_HIDDEN:
+ r = "COMPONENT_HIDDEN";
+ break;
+ case COMPONENT_MOVED:
+ r = "COMPONENT_MOVED";
+ break;
+ case COMPONENT_RESIZED:
+ r = "COMPONENT_RESIZED";
+ break;
+ case COMPONENT_SHOWN:
+ r = "COMPONENT_SHOWN";
+ break;
+ default:
+ r = "unknown id";
+ break;
+ }
+ return r;
}
}
diff --git a/libjava/java/awt/event/ContainerEvent.java b/libjava/java/awt/event/ContainerEvent.java
index b662169..fc68d14 100644
--- a/libjava/java/awt/event/ContainerEvent.java
+++ b/libjava/java/awt/event/ContainerEvent.java
@@ -23,8 +23,8 @@ public class ContainerEvent extends ComponentEvent
public static final int CONTAINER_FIRST = 300;
public static final int CONTAINER_LAST = 301;
- // FIXME: jdk1.2 docs say source is a Component.
- public ContainerEvent (Container source, int id, Component child)
+ /** @specnote In JDK1.2 and 1.3, source is a Component. */
+ public ContainerEvent (Component source, int id, Component child)
{
super (source, id);
this.child = child;
@@ -35,15 +35,29 @@ public class ContainerEvent extends ComponentEvent
return child;
}
- public Component getContainer ()
+ public Component getComponent ()
{
- return (Container) source;
+ return (Component) source;
}
public String paramString ()
{
- return ("ContainerEvent[" + child
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case COMPONENT_ADDED:
+ r = "COMPONENT_ADDED";
+ break;
+ case COMPONENT_REMOVED:
+ r = "COMPONENT_REMOVED";
+ break;
+ default:
+ r = "unknown id";
+ break;
+
+ }
+ r += ",child=" + child;
+ return r;
}
private Component child;
diff --git a/libjava/java/awt/event/FocusEvent.java b/libjava/java/awt/event/FocusEvent.java
index 9b559ea..ab125f5 100644
--- a/libjava/java/awt/event/FocusEvent.java
+++ b/libjava/java/awt/event/FocusEvent.java
@@ -42,8 +42,21 @@ public class FocusEvent extends AWTEvent
public String paramString ()
{
- return ("FocusEvent[" + temporary
- + ";" + super.paramString () + "]");
+ String r = "";
+ switch (id)
+ {
+ case FOCUS_GAINED:
+ r += "FOCUS_GAINED";
+ break;
+ case FOCUS_LOST:
+ r += "FOCUS_LOST";
+ break;
+ default:
+ r += "unknown id";
+ break;
+ }
+ r += (temporary ? "temporary" : "permanent");
+ return r;
}
private boolean temporary;
diff --git a/libjava/java/awt/event/HierarchyBoundsAdapter.java b/libjava/java/awt/event/HierarchyBoundsAdapter.java
new file mode 100644
index 0000000..39ce1ab
--- /dev/null
+++ b/libjava/java/awt/event/HierarchyBoundsAdapter.java
@@ -0,0 +1,27 @@
+/* Copyright (C) 2000 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libjava License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package java.awt.event;
+
+/**
+ * @since 1.3
+ * @author Bryce McKinlay
+ */
+
+/* Status: Believed complete and correct. */
+
+public abstract class HierarchyBoundsAdapter implements HierarchyBoundsListener
+{
+ public void ancestorMoved(HierarchyEvent e)
+ {
+ }
+
+ public void ancestorResized(HierarchyEvent e)
+ {
+ }
+}
diff --git a/libjava/java/awt/event/HierarchyBoundsListener.java b/libjava/java/awt/event/HierarchyBoundsListener.java
new file mode 100644
index 0000000..aa853a0
--- /dev/null
+++ b/libjava/java/awt/event/HierarchyBoundsListener.java
@@ -0,0 +1,22 @@
+/* Copyright (C) 2000 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libjava License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package java.awt.event;
+
+/**
+ * @since 1.3
+ * @author Bryce McKinlay
+ */
+
+/* Status: Believed complete and correct. */
+
+public interface HierarchyBoundsListener extends java.util.EventListener
+{
+ public void ancestorMoved(HierarchyEvent e);
+ public void ancestorResized(HierarchyEvent e);
+}
diff --git a/libjava/java/awt/event/HierarchyEvent.java b/libjava/java/awt/event/HierarchyEvent.java
new file mode 100644
index 0000000..171d8b2
--- /dev/null
+++ b/libjava/java/awt/event/HierarchyEvent.java
@@ -0,0 +1,96 @@
+/* Copyright (C) 2000 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libjava License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package java.awt.event;
+import java.awt.*;
+
+/**
+ * @since 1.3
+ * @author Bryce McKinlay
+ */
+
+/* Status: thought to be complete and correct. */
+
+public class HierarchyEvent extends AWTEvent
+{
+ public static final int PARENT_CHANGED = 1 << 0,
+ DISPLAYABILITY_CHANGED = 1 << 1,
+ SHOWING_CHANGED = 1 << 2,
+ HIERARCHY_FIRST = 1400,
+ HIERARCHY_CHANGED = 1400,
+ ANCESTOR_MOVED = 1401,
+ ANCESTOR_RESIZED = 1402,
+ HIERARCHY_LAST = 1402;
+
+ /* Serialized fields from the serialization spec. */
+ Component changed;
+ Container changedParent;
+ long changeFlags = 0;
+
+ public HierarchyEvent(Component source, int id, Component changed,
+ Container changedParent)
+ {
+ super(source, id);
+ this.changed = changed;
+ this.changedParent = changedParent;
+ }
+
+ public HierarchyEvent(Component source, int id, Component changed,
+ Container changedParent, long changeFlags)
+ {
+ super(source,id);
+ this.changed = changed;
+ this.changedParent = changedParent;
+ this.changeFlags = changeFlags;
+ }
+
+ public Component getComponent()
+ {
+ return (Component) source;
+ }
+
+ public Component getChanged()
+ {
+ return changed;
+ }
+
+ public Container getChangedParent()
+ {
+ return changedParent;
+ }
+
+ public long getChangeFlags()
+ {
+ return changeFlags;
+ }
+
+ public String paramString()
+ {
+ String r;
+ switch (id)
+ {
+ case HIERARCHY_CHANGED:
+ r = "HIERARCHY_CHANGED";
+ break;
+
+ case ANCESTOR_MOVED:
+ r = "ANCESTOR_MOVED";
+ break;
+
+ case ANCESTOR_RESIZED:
+ r = "ANCESTOR_RESIZED";
+ break;
+
+ default:
+ return "unknown type";
+ }
+
+ r += "(" + changed + "," + changedParent + ")";
+ return r;
+ }
+}
diff --git a/libjava/java/awt/event/HierarchyListener.java b/libjava/java/awt/event/HierarchyListener.java
new file mode 100644
index 0000000..b78e857
--- /dev/null
+++ b/libjava/java/awt/event/HierarchyListener.java
@@ -0,0 +1,21 @@
+/* Copyright (C) 2000 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libjava License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+package java.awt.event;
+
+/**
+ * @since 1.3
+ * @author Bryce McKinlay
+ */
+
+/* Status: Believed complete and correct. */
+
+public interface HierarchyListener extends java.util.EventListener
+{
+ public void hierarchyChanged(HierarchyEvent e);
+}
diff --git a/libjava/java/awt/event/InputMethodEvent.java b/libjava/java/awt/event/InputMethodEvent.java
index d047a73..3cafd35 100644
--- a/libjava/java/awt/event/InputMethodEvent.java
+++ b/libjava/java/awt/event/InputMethodEvent.java
@@ -43,7 +43,21 @@ public class InputMethodEvent extends AWTEvent
public TextHitInfo getVisiblePosition ();
public boolean isConsumed ();
- public String paramString ();
+ public String paramString ()
+ {
+ String r;
+ switch (id)
+ {
+ case CARET_POSITION_CHANGED:
+ r = "CARET_POSITION_CHANGED";
+ break;
+ case INPUT_METHOD_TEXT_CHANGED:
+ r = "INPUT_METHOD_TEXT_CHANGED";
+ break;
+ }
+ r += ""; // FIXME
+ return r;
+ }
*/
// FIXME: this is just to let it compile.
diff --git a/libjava/java/awt/event/InvocationEvent.java b/libjava/java/awt/event/InvocationEvent.java
index 522447a..778eb18 100644
--- a/libjava/java/awt/event/InvocationEvent.java
+++ b/libjava/java/awt/event/InvocationEvent.java
@@ -14,7 +14,7 @@ import java.awt.*;
* @date April 8, 2000
*/
-/* Status: Still one bug. */
+/* Status: Believed to be complete and correct. */
public class InvocationEvent extends AWTEvent implements ActiveEvent
{
@@ -37,28 +37,29 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
this.runnable = runnable;
}
- public InvocationEvent (Object source, Runnable runnable, Object notifier)
+ public InvocationEvent(Object source, Runnable runnable, Object notifier,
+ boolean catchExceptions)
{
super (source, INVOCATION_DEFAULT);
this.runnable = runnable;
this.notifier = notifier;
+ this.catchExceptions = catchExceptions;
}
public void dispatch ()
{
Exception e = null;
- try
- {
- runnable.run ();
- }
- catch (Exception _)
- {
- e = _;
- }
-
- // FIXME: what to do if !catchExceptions?
if (catchExceptions)
- exception = e;
+ try
+ {
+ runnable.run ();
+ }
+ catch (Exception x)
+ {
+ exception = x;
+ }
+ else
+ runnable.run ();
if (notifier != null)
notifier.notifyAll ();
@@ -71,9 +72,15 @@ public class InvocationEvent extends AWTEvent implements ActiveEvent
public String paramString ()
{
- return ("InvocationEvent[" + notifier + "," + runnable
- + "," + catchExceptions
- + ";" + super.paramString () + "]");
+ String r;
+ if (id == INVOCATION_DEFAULT)
+ r = "INVOCATION_DEFAULT";
+ else
+ r = "unknown type";
+
+ r += ",runnable=" + runnable + ",notifier=" + notifier +
+ ",catchExceptions=" + catchExceptions;
+ return r;
}
protected boolean catchExceptions;
diff --git a/libjava/java/awt/event/ItemEvent.java b/libjava/java/awt/event/ItemEvent.java
index cb36fea..3d2e502 100644
--- a/libjava/java/awt/event/ItemEvent.java
+++ b/libjava/java/awt/event/ItemEvent.java
@@ -48,8 +48,32 @@ public class ItemEvent extends AWTEvent
public String paramString ()
{
- return ("ItemEvent[" + item + "," + stateChange
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case ITEM_STATE_CHANGED:
+ r = "ITEM_STATE_CHANGED";
+ break;
+ default:
+ r = "unknown id";
+ break;
+ }
+
+ r += ",item=" + item + ",stateChange=";
+ switch (stateChange)
+ {
+ case SELECTED:
+ r += "SELECTED";
+ break;
+ case DESELECTED:
+ r += "DESELECTED";
+ break;
+ default:
+ r += "unknown";
+ break;
+ }
+
+ return r;
}
private Object item;
diff --git a/libjava/java/awt/event/KeyEvent.java b/libjava/java/awt/event/KeyEvent.java
index 4aadea1..3f6a14c 100644
--- a/libjava/java/awt/event/KeyEvent.java
+++ b/libjava/java/awt/event/KeyEvent.java
@@ -251,8 +251,22 @@ public class KeyEvent extends InputEvent
public String paramString ()
{
- return ("KeyEvent[" + keyCode + "," + keyChar + "," + modifiers
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case KEY_PRESSED:
+ r = "KEY_PRESSED";
+ break;
+ case KEY_RELEASED:
+ r = "KEY_RELEASED";
+ break;
+ case KEY_TYPED:
+ r = "KEY_TYPED";
+ break;
+ }
+ r += ",keyCode=" + keyCode + "," + getKeyText(keyCode) + ",modifiers=" +
+ getKeyModifiersText(modifiers);
+ return r;
}
private int keyCode;
diff --git a/libjava/java/awt/event/MouseEvent.java b/libjava/java/awt/event/MouseEvent.java
index e3dff04..bb9602c 100644
--- a/libjava/java/awt/event/MouseEvent.java
+++ b/libjava/java/awt/event/MouseEvent.java
@@ -67,10 +67,37 @@ public class MouseEvent extends InputEvent
public String paramString ()
{
- return ("MouseEvent[" + when + "," + modifiers
- + ",(" + x + "," + y + "),"
- + clickCount + "," + popupTrigger
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case MOUSE_CLICKED:
+ r = "MOUSE_CLICKED";
+ break;
+ case MOUSE_DRAGGED:
+ r = "MOUSE_DRAGGED";
+ break;
+ case MOUSE_ENTERED:
+ r = "MOUSE_ENTERED";
+ break;
+ case MOUSE_EXITED:
+ r = "MOUSE_EXITED";
+ break;
+ case MOUSE_MOVED:
+ r = "MOUSE_MOVED";
+ break;
+ case MOUSE_PRESSED:
+ r = "MOUSE_PRESSED";
+ break;
+ case MOUSE_RELEASED:
+ r = "MOUSE_RELEASED";
+ break;
+ default:
+ r = "unknown id";
+ break;
+ }
+ r += ",(" + x + "," + y + "),modifiers=" + modifiers + ",clickCount=" +
+ clickCount;
+ return r;
}
public void translatePoint (int x, int y)
diff --git a/libjava/java/awt/event/PaintEvent.java b/libjava/java/awt/event/PaintEvent.java
index 7784c58..21c42e4 100644
--- a/libjava/java/awt/event/PaintEvent.java
+++ b/libjava/java/awt/event/PaintEvent.java
@@ -36,8 +36,22 @@ public class PaintEvent extends ComponentEvent
public String paramString ()
{
- return ("PaintEvent[" + updateRect
- + ";" + super.paramString () + "]");
+ String r;
+ switch (id)
+ {
+ case UPDATE:
+ r = "UPDATE";
+ break;
+ case PAINT:
+ r = "PAINT";
+ break;
+ default:
+ r = "unknown id";
+ break;
+ }
+
+ r += ",updateRect=" + updateRect;
+ return r;
}
public void setUpdateRect (Rectangle updateRect)
diff --git a/libjava/java/awt/event/TextEvent.java b/libjava/java/awt/event/TextEvent.java
index 2d3d26a..85c5d85 100644
--- a/libjava/java/awt/event/TextEvent.java
+++ b/libjava/java/awt/event/TextEvent.java
@@ -24,6 +24,6 @@ public class TextEvent extends AWTEvent
public String paramString ()
{
- return super.paramString ();
+ return "TEXT_VALUE_CHANGED";
}
}
diff --git a/libjava/java/awt/event/WindowEvent.java b/libjava/java/awt/event/WindowEvent.java
index 7e00f0e..675adec 100644
--- a/libjava/java/awt/event/WindowEvent.java
+++ b/libjava/java/awt/event/WindowEvent.java
@@ -35,6 +35,31 @@ public class WindowEvent extends ComponentEvent
public String paramString ()
{
- return super.paramString ();
+ String r;
+ switch (id)
+ {
+ case WINDOW_ACTIVATED:
+ r = "WINDOW_ACTIVATED";
+ break;
+ case WINDOW_CLOSED:
+ r = "WINDOW_CLOSED";
+ break;
+ case WINDOW_CLOSING:
+ r = "WINDOW_CLOSING";
+ break;
+ case WINDOW_DEACTIVATED:
+ r = "WINDOW_DEACTIVATED";
+ break;
+ case WINDOW_DEICONIFIED:
+ r = "WINDOW_DEICONIFIED";
+ break;
+ case WINDOW_ICONIFIED:
+ r = "WINDOW_ICONIFIED";
+ break;
+ case WINDOW_OPENED:
+ r = "WINDOW_OPENED";
+ break;
+ }
+ return r;
}
}
generated by cgit v1.1 at 2025-03-22 14:18:05 +0000