aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <mkoch@gcc.gnu.org>2004-01-27 18:55:11 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-01-27 18:55:11 +0000
commit80d4281fc5c07c3b183d87f3e7da94b12f747caf (patch)
tree98f919308d8b6da3ab6d369f6d09323487ebc438
parentd6c7ebd5430e279f4510cd4258ba3fd0aea9a480 (diff)
downloadgcc-80d4281fc5c07c3b183d87f3e7da94b12f747caf.zip
gcc-80d4281fc5c07c3b183d87f3e7da94b12f747caf.tar.gz
gcc-80d4281fc5c07c3b183d87f3e7da94b12f747caf.tar.bz2
AbstractCellEditor.java: Reformated.
2004-01-27 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractCellEditor.java: Reformated. * javax/swing/DefaultListSelectionModel.java (listenerList): Made protected. (addListSelectionListener): Javadoc added. (removeListSelectionListener): Likewise. (getListeners): Likewise. (getListSelectionListeners): Likewise. * javax/swing/JComboBox.java: Merged copyright year. * javax/swing/plaf/basic/BasicGraphicsUtils.java: Merged empty line. From-SVN: r76737
-rw-r--r--libjava/ChangeLog1
-rw-r--r--libjava/javax/swing/AbstractCellEditor.java22
-rw-r--r--libjava/javax/swing/DefaultListSelectionModel.java53
-rw-r--r--libjava/javax/swing/JComboBox.java2
-rw-r--r--libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java1
5 files changed, 56 insertions, 23 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d9869d0..f0ce898 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -9,6 +9,7 @@
(getListSelectionListeners): Likewise.
* javax/swing/JComboBox.java: Merged copyright year.
* javax/swing/plaf/basic/BasicGraphicsUtils.java: Merged empty line.
+
2004-01-26 Andrew Haley <aph@redhat.com>
* javax/swing/table/JTableHeader.java: Extend JComponent
diff --git a/libjava/javax/swing/AbstractCellEditor.java b/libjava/javax/swing/AbstractCellEditor.java
index b2a4f4c..bc46523 100644
--- a/libjava/javax/swing/AbstractCellEditor.java
+++ b/libjava/javax/swing/AbstractCellEditor.java
@@ -1,5 +1,5 @@
/* AbstractCellEditor.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -54,15 +54,15 @@ public abstract class AbstractCellEditor
{
static final long serialVersionUID = -1048006551406220959L;
- /**
- * listenerList
- */
- protected EventListenerList listenerList;
+ /**
+ * listenerList
+ */
+ protected EventListenerList listenerList;
- /**
- * changeEvent
- */
- protected transient ChangeEvent changeEvent;
+ /**
+ * changeEvent
+ */
+ protected transient ChangeEvent changeEvent;
/**
* Constructor AbstractCellEditor
@@ -165,6 +165,4 @@ public abstract class AbstractCellEditor
listeners [index].editingCanceled (changeEvent);
}
}
-
-
-} // AbstractCellEditor
+}
diff --git a/libjava/javax/swing/DefaultListSelectionModel.java b/libjava/javax/swing/DefaultListSelectionModel.java
index 7ad66b0..093e3e6 100644
--- a/libjava/javax/swing/DefaultListSelectionModel.java
+++ b/libjava/javax/swing/DefaultListSelectionModel.java
@@ -1,5 +1,5 @@
/* DefaultListSelectionModel.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -47,15 +47,12 @@ import javax.swing.event.ListSelectionListener;
public class DefaultListSelectionModel implements Cloneable, ListSelectionModel, Serializable
{
- private EventListenerList listenerList = new EventListenerList();
+ protected EventListenerList listenerList = new EventListenerList();
int mode = SINGLE_SELECTION;
Vector sel = new Vector();
- {
- }
-
class Range
{
int i0, i1;
@@ -169,23 +166,59 @@ public class DefaultListSelectionModel implements Cloneable, ListSelectionModel,
sel.addElement(new Range(index0, index1));
}
+ /**
+ * Adds a listener.
+ *
+ * @param listener the listener to add
+ *
+ * @see removeListSelectionListener
+ * @see getListSelectionListeners
+ */
public void addListSelectionListener(ListSelectionListener listener)
{
listenerList.add (ListSelectionListener.class, listener);
}
+ /**
+ * Removes a registered listener.
+ *
+ * @param listener the listener to remove
+ *
+ * @see addListSelectionListener
+ * @see getListSelectionListeners
+ */
public void removeListSelectionListener(ListSelectionListener listener)
{
listenerList.remove (ListSelectionListener.class, listener);
}
-
- public ListSelectionListener[] getListSelectionListeners()
- {
- return (ListSelectionListener[]) getListeners (ListSelectionListener.class);
- }
+ /**
+ * Returns an array of all registerers listeners.
+ *
+ * @return the array
+ *
+ * @since 1.3
+ *
+ * @see getListSelectionListener
+ */
public EventListener[] getListeners (Class listenerType)
{
return listenerList.getListeners (listenerType);
}
+
+ /**
+ * Returns an array of all registerd list selection listeners.
+ *
+ * @return the array
+ *
+ * @since 1.4
+ *
+ * @see addListSelectionListener
+ * @see removeListSelectionListener
+ * @see getListeners
+ */
+ public ListSelectionListener[] getListSelectionListeners()
+ {
+ return (ListSelectionListener[]) getListeners (ListSelectionListener.class);
+ }
}
diff --git a/libjava/javax/swing/JComboBox.java b/libjava/javax/swing/JComboBox.java
index b019293..b3c5ccf 100644
--- a/libjava/javax/swing/JComboBox.java
+++ b/libjava/javax/swing/JComboBox.java
@@ -1,5 +1,5 @@
/* JComboBox.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
index f88bf92..2071373 100644
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -621,6 +621,7 @@ public class BasicGraphicsUtils
viewRect, iconRect, textRect,
textIconGap);
+
/* +------------------------+ +------------------------+
* | | | |
* | ICON | | CONTENTCONTENTCONTENT |