This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui] Patch: javax.swing - reformatted
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Sat, 10 Jul 2004 11:47:56 +0200
- Subject: [gui] Patch: javax.swing - reformatted
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I just commited the attached patch to reformat some classes in Swing
to our current coding style. This will make it easier to analyze
future patches.
Michael
2004-07-10 Michael Koch <konqueror@gmx.de>
* javax/swing/ActionMap.java,
javax/swing/ComponentInputMap.java,
javax/swing/InputMap.java,
javax/swing/table/DefaultTableColumnModel.java,
javax/swing/table/TableColumn.java,
javax/swing/table/TableColumnModel.java,
javax/swing/table/TableModel.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/TextAction.java:
Reformated.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFA77tNWSOgCCdjSDsRAr9KAKCTz3JOYpzNpL2yBv6I9gQdihbSvACfc+dw
GjKXkoj3v9cLgFgTVuoCcS0=
=6iXV
-----END PGP SIGNATURE-----
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ActionMap.java,v
retrieving revision 1.3.8.1
diff -u -b -B -r1.3.8.1 ActionMap.java
--- javax/swing/ActionMap.java 7 Jun 2004 14:00:31 -0000 1.3.8.1
+++ javax/swing/ActionMap.java 10 Jul 2004 09:43:45 -0000
@@ -48,19 +48,16 @@
import java.util.Map;
import java.util.Set;
+
/**
- * ActionMap
* @author Andrew Selkirk
- * @version 1.0
+ * @author Michael Koch
*/
-public class ActionMap implements Serializable
+public class ActionMap
+ implements Serializable
{
static final long serialVersionUID = -6277518704513986346L;
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
/**
* actionMap
*/
@@ -71,29 +68,20 @@
*/
private ActionMap parent = null;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor ActionMap
*/
- public ActionMap() {
- } // ActionMap()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ public ActionMap()
+ {
+ }
/**
* get
* @param key TODO
* @returns Action
*/
- public Action get(Object key) {
-
+ public Action get(Object key)
+ {
// Variables
Object result;
@@ -101,80 +89,84 @@
result = actionMap.get(key);
// Check Parent
- if (result == null) {
+ if (result == null)
result = parent.get(key);
- } // if
return (Action) result;
-
- } // get()
+ }
/**
* put
* @param key TODO
* @param action TODO
*/
- public void put(Object key, Action action) {
- if (action == null) {
+ public void put(Object key, Action action)
+ {
+ if (action == null)
actionMap.remove(key);
- } else {
+ else
actionMap.put(key, action);
- } // if
- } // put()
+ }
/**
* remove
* @param key TODO
*/
- public void remove(Object key) {
+ public void remove(Object key)
+ {
actionMap.remove(key);
- } // remove()
+ }
/**
* getParent
* @returns ActionMap
*/
- public ActionMap getParent() {
+ public ActionMap getParent()
+ {
return parent;
- } // getParent()
+ }
/**
* setParent
* @param parentMap TODO
*/
- public void setParent(ActionMap parentMap) {
+ public void setParent(ActionMap parentMap)
+ {
parent = parentMap;
- } // setParent()
+ }
/**
* size
* @returns int
*/
- public int size() {
+ public int size()
+ {
return actionMap.size();
- } // size()
+ }
/**
* clear
*/
- public void clear() {
+ public void clear()
+ {
actionMap.clear();
- } // clear()
+ }
/**
* keys
* @returns Object[]
*/
- public Object[] keys() {
+ public Object[] keys()
+ {
return convertSet(actionMap.keySet());
- } // keys()
+ }
/**
* allKeys
* @returns Object[]
*/
- public Object[] allKeys() {
-
+ public Object[] allKeys()
+ {
// Variables
Set set;
@@ -182,9 +174,8 @@
set = new HashSet();
// Get Key Sets
- if (parent != null) {
+ if (parent != null)
set.addAll(Arrays.asList(parent.allKeys()));
- } // if
set.addAll(actionMap.keySet());
return convertSet(set);
@@ -188,11 +179,10 @@
set.addAll(actionMap.keySet());
return convertSet(set);
-
} // allKeys()
- private Object[] convertSet(Set set) {
-
+ private Object[] convertSet(Set set)
+ {
// Variables
int index;
Iterator iterator;
@@ -202,27 +192,20 @@
keys = new Object[set.size()];
iterator = set.iterator();
index = 0;
- while (iterator.hasNext()) {
+ while (iterator.hasNext())
keys[index++] = iterator.next();
- } // while
-
return keys;
-
- } // convertSet()
-
-
- //-------------------------------------------------------------
- // Interface: Serializable ------------------------------------
- //-------------------------------------------------------------
+ }
/**
* writeObject
* @param stream TODO
* @exception IOException TODO
*/
- private void writeObject(ObjectOutputStream value0) throws IOException {
+ private void writeObject(ObjectOutputStream value0) throws IOException
+ {
// TODO
- } // writeObject()
+ }
/**
* readObject
@@ -230,9 +213,9 @@
* @exception ClassNotFoundException TODO
* @exception IOException TODO
*/
- private void readObject(ObjectInputStream value0) throws ClassNotFoundException, IOException {
+ private void readObject(ObjectInputStream value0)
+ throws ClassNotFoundException, IOException
+ {
// TODO
- } // readObject()
-
-
-} // ActionMap
+ }
+}
Index: javax/swing/ComponentInputMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ComponentInputMap.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ComponentInputMap.java
--- javax/swing/ComponentInputMap.java 9 Aug 2002 04:26:10 -0000 1.1
+++ javax/swing/ComponentInputMap.java 10 Jul 2004 09:43:45 -0000
@@ -1,5 +1,5 @@
/* ComponentInputMap.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -37,79 +37,69 @@
package javax.swing;
+
/**
- * ComponentInputMap
* @author Andrew Selkirk
- * @version 1.0
+ * @author Michael Koch
*/
-public class ComponentInputMap extends InputMap {
-
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
+public class ComponentInputMap extends InputMap
+{
/**
* component
*/
private JComponent component;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor ComponentInputMap
* @param value0 TODO
*/
- public ComponentInputMap(JComponent value0) {
+ public ComponentInputMap(JComponent value0)
+ {
// TODO
- } // ComponentInputMap()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ }
/**
* put
* @param keystroke TODO
* @param value TODO
*/
- public void put(KeyStroke keystroke, Object value) {
+ public void put(KeyStroke keystroke, Object value)
+ {
// TODO
- } // put()
+ }
/**
* clear
*/
- public void clear() {
+ public void clear()
+ {
// TODO
- } // clear()
+ }
/**
* remove
* @param keystroke TODO
*/
- public void remove(KeyStroke keystroke) {
+ public void remove(KeyStroke keystroke)
+ {
// TODO
- } // remove()
+ }
/**
* setParent
* @param parent TODO
*/
- public void setParent(InputMap parent) {
+ public void setParent(InputMap parent)
+ {
// TODO
- } // setParent()
+ }
/**
* getComponent
* @returns JComponent
*/
- public JComponent getComponent() {
+ public JComponent getComponent()
+ {
return null; // TODO
- } // getComponent()
-
-
-} // ComponentInputMap
+ }
+}
Index: javax/swing/InputMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/InputMap.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 InputMap.java
--- javax/swing/InputMap.java 11 Jun 2003 13:20:39 -0000 1.3
+++ javax/swing/InputMap.java 10 Jul 2004 09:43:45 -0000
@@ -1,5 +1,5 @@
/* InputMap.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -43,9 +42,9 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -49,19 +48,18 @@
import java.util.Map;
import java.util.Set;
+
/**
- * InputMap
* @author Andrew Selkirk
- * @version 1.0
+ * @author Michael Koch
+ *
+ * @since 1.3
*/
-public class InputMap implements Serializable
+public class InputMap
+ implements Serializable
{
static final long serialVersionUID = -5429059542008604257L;
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
/**
* inputMap
*/
@@ -72,30 +70,21 @@
*/
private InputMap parent = null;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor InputMap
*/
- public InputMap() {
+ public InputMap()
+ {
// TODO
- } // InputMap()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ }
/**
* get
* @param value0 TODO
* @returns Object
*/
- public Object get(KeyStroke keystroke) {
-
+ public Object get(KeyStroke keystroke)
+ {
// Variables
Object result;
@@ -103,80 +92,83 @@
result = inputMap.get(keystroke);
// Check Parent
- if (result == null) {
+ if (result == null)
result = parent.get(keystroke);
- } // if
-
return result;
-
- } // get()
+ }
/**
* put
* @param keystroke TODO
* @param actionMapKey TODO
*/
- public void put(KeyStroke keystroke, Object actionMapKey) {
- if (actionMapKey == null) {
+ public void put(KeyStroke keystroke, Object actionMapKey)
+ {
+ if (actionMapKey == null)
inputMap.remove(keystroke);
- } else {
+ else
inputMap.put(keystroke, actionMapKey);
- } // if
- } // put()
+ }
/**
* remove
* @param keystroke TODO
*/
- public void remove(KeyStroke keystroke) {
+ public void remove(KeyStroke keystroke)
+ {
inputMap.remove(keystroke);
- } // remove()
+ }
/**
* getParent
* @returns InputMap
*/
- public InputMap getParent() {
+ public InputMap getParent()
+ {
return parent;
- } // getParent()
+ }
/**
* setParent
* @param parentMap TODO
*/
- public void setParent(InputMap parentMap) {
+ public void setParent(InputMap parentMap)
+ {
parent = parentMap;
- } // setParent()
+ }
/**
* size
* @returns int
*/
- public int size() {
+ public int size()
+ {
return inputMap.size();
- } // size()
+ }
/**
* clear
*/
- public void clear() {
+ public void clear()
+ {
inputMap.clear();
- } // clear()
+ }
/**
* keys
* @returns KeyStroke[]
*/
- public KeyStroke[] keys() {
+ public KeyStroke[] keys()
+ {
return convertSet(inputMap.keySet());
- } // keys()
+ }
/**
* allKeys
* @returns KeyStroke[]
*/
- public KeyStroke[] allKeys() {
-
+ public KeyStroke[] allKeys()
+ {
// Variables
Set set;
@@ -184,9 +176,8 @@
set = new HashSet();
// Get Key Sets
- if (parent != null) {
+ if (parent != null)
set.addAll(Arrays.asList(parent.allKeys()));
- } // if
set.addAll(inputMap.keySet());
return convertSet(set);
@@ -190,11 +181,10 @@
set.addAll(inputMap.keySet());
return convertSet(set);
-
} // allKeys()
- private KeyStroke[] convertSet(Set set) {
-
+ private KeyStroke[] convertSet(Set set)
+ {
// Variables
int index;
Iterator iterator;
@@ -204,27 +194,20 @@
keys = new KeyStroke[set.size()];
iterator = set.iterator();
index = 0;
- while (iterator.hasNext()) {
+ while (iterator.hasNext())
keys[index++] = (KeyStroke) iterator.next();
- } // while
-
return keys;
-
- } // convertSet()
-
-
- //-------------------------------------------------------------
- // Interface: Serializable ------------------------------------
- //-------------------------------------------------------------
+ }
/**
* writeObject
* @param stream TODO
* @exception IOException TODO
*/
- private void writeObject(ObjectOutputStream stream) throws IOException {
+ private void writeObject(ObjectOutputStream stream) throws IOException
+ {
// TODO
- } // writeObject()
+ }
/**
* readObject
@@ -232,9 +215,9 @@
* @exception ClassNotFoundException TODO
* @exception IOException TODO
*/
- private void readObject(ObjectInputStream stream) throws ClassNotFoundException, IOException {
+ private void readObject(ObjectInputStream stream)
+ throws ClassNotFoundException, IOException
+ {
// TODO
- } // readObject()
-
-
-} // InputMap
+ }
+}
Index: javax/swing/table/DefaultTableColumnModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/DefaultTableColumnModel.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DefaultTableColumnModel.java
--- javax/swing/table/DefaultTableColumnModel.java 11 Jun 2003 13:20:41 -0000 1.3
+++ javax/swing/table/DefaultTableColumnModel.java 10 Jul 2004 09:43:45 -0000
@@ -58,15 +58,11 @@
* @version 1.0
*/
public class DefaultTableColumnModel
- implements TableColumnModel, PropertyChangeListener,
- ListSelectionListener, Serializable
+ implements TableColumnModel, PropertyChangeListener, ListSelectionListener,
+ Serializable
{
static final long serialVersionUID = 6580012493508960512L;
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
/**
* tableColumns
*/
@@ -102,265 +98,283 @@
*/
protected int totalColumnWidth;
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
/**
* Constructor DefaultTableColumnModel
*/
- public DefaultTableColumnModel() {
+ public DefaultTableColumnModel()
+ {
// TODO
- } // DefaultTableColumnModel()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ }
/**
* addColumn
* @param value0 TODO
*/
- public void addColumn(TableColumn value0) {
+ public void addColumn(TableColumn value0)
+ {
// TODO
- } // addColumn()
+ }
/**
* removeColumn
* @param value0 TODO
*/
- public void removeColumn(TableColumn value0) {
+ public void removeColumn(TableColumn value0)
+ {
// TODO
- } // removeColumn()
+ }
/**
* moveColumn
* @param value0 TODO
* @param value1 TODO
*/
- public void moveColumn(int value0, int value1) {
+ public void moveColumn(int value0, int value1)
+ {
// TODO
- } // moveColumn()
+ }
/**
* setColumnMargin
* @param value0 TODO
*/
- public void setColumnMargin(int value0) {
+ public void setColumnMargin(int value0)
+ {
// TODO
- } // setColumnMargin()
+ }
/**
* getColumnCount
- * @returns int
+ * @return int
*/
- public int getColumnCount() {
+ public int getColumnCount()
+ {
return 0; // TODO
- } // getColumnCount()
+ }
/**
* getColumns
- * @returns Enumeration
+ * @return Enumeration
*/
- public Enumeration getColumns() {
+ public Enumeration getColumns()
+ {
return null; // TODO
- } // getColumns()
+ }
/**
* getColumnIndex
* @param value0 TODO
- * @returns int
+ * @return int
*/
- public int getColumnIndex(Object value0) {
+ public int getColumnIndex(Object value0)
+ {
return 0; // TODO
- } // getColumnIndex()
+ }
/**
* getColumn
* @param value0 TODO
- * @returns TableColumn
+ * @return TableColumn
*/
- public TableColumn getColumn(int value0) {
+ public TableColumn getColumn(int value0)
+ {
return null; // TODO
- } // getColumn()
+ }
/**
* getColumnMargin
- * @returns int
+ * @return int
*/
- public int getColumnMargin() {
+ public int getColumnMargin()
+ {
return 0; // TODO
- } // getColumnMargin()
+ }
/**
* getColumnIndexAtX
* @param value0 TODO
- * @returns int
+ * @return int
*/
- public int getColumnIndexAtX(int value0) {
+ public int getColumnIndexAtX(int value0)
+ {
return 0; // TODO
- } // getColumnIndexAtX()
+ }
/**
* getTotalColumnWidth
- * @returns int
+ * @return int
*/
- public int getTotalColumnWidth() {
+ public int getTotalColumnWidth()
+ {
return 0; // TODO
- } // getTotalColumnWidth()
+ }
/**
* setSelectionModel
* @param value0 TODO
*/
- public void setSelectionModel(ListSelectionModel value0) {
+ public void setSelectionModel(ListSelectionModel value0)
+ {
// TODO
- } // setSelectionModel()
+ }
/**
* getSelectionModel
- * @returns ListSelectionModel
+ * @return ListSelectionModel
*/
- public ListSelectionModel getSelectionModel() {
+ public ListSelectionModel getSelectionModel()
+ {
return null; // TODO
- } // getSelectionModel()
+ }
/**
* setColumnSelectionAllowed
* @param value0 TODO
*/
- public void setColumnSelectionAllowed(boolean value0) {
+ public void setColumnSelectionAllowed(boolean value0)
+ {
// TODO
- } // setColumnSelectionAllowed()
+ }
/**
* getColumnSelectionAllowed
- * @returns boolean
+ * @return boolean
*/
- public boolean getColumnSelectionAllowed() {
+ public boolean getColumnSelectionAllowed()
+ {
return false; // TODO
- } // getColumnSelectionAllowed()
+ }
/**
* getSelectedColumns
- * @returns int[]
+ * @return int[]
*/
- public int[] getSelectedColumns() {
+ public int[] getSelectedColumns()
+ {
return null; // TODO
- } // getSelectedColumns()
+ }
/**
* getSelectedColumnCount
- * @returns int
+ * @return int
*/
- public int getSelectedColumnCount() {
+ public int getSelectedColumnCount()
+ {
return 0; // TODO
- } // getSelectedColumnCount()
+ }
/**
* addColumnModelListener
* @param value0 TODO
*/
- public void addColumnModelListener(TableColumnModelListener value0) {
+ public void addColumnModelListener(TableColumnModelListener value0)
+ {
// TODO
- } // addColumnModelListener()
+ }
/**
* removeColumnModelListener
* @param value0 TODO
*/
- public void removeColumnModelListener(TableColumnModelListener value0) {
+ public void removeColumnModelListener(TableColumnModelListener value0)
+ {
// TODO
- } // removeColumnModelListener()
+ }
/**
* fireColumnAdded
* @param value0 TODO
*/
- protected void fireColumnAdded(TableColumnModelEvent value0) {
+ protected void fireColumnAdded(TableColumnModelEvent value0)
+ {
// TODO
- } // fireColumnAdded()
+ }
/**
* fireColumnRemoved
* @param value0 TODO
*/
- protected void fireColumnRemoved(TableColumnModelEvent value0) {
+ protected void fireColumnRemoved(TableColumnModelEvent value0)
+ {
// TODO
- } // fireColumnRemoved()
+ }
/**
* fireColumnMoved
* @param value0 TODO
*/
- protected void fireColumnMoved(TableColumnModelEvent value0) {
+ protected void fireColumnMoved(TableColumnModelEvent value0)
+ {
// TODO
- } // fireColumnMoved()
+ }
/**
* fireColumnSelectionChanged
* @param value0 TODO
*/
- protected void fireColumnSelectionChanged(ListSelectionEvent value0) {
+ protected void fireColumnSelectionChanged(ListSelectionEvent value0)
+ {
// TODO
- } // fireColumnSelectionChanged()
+ }
/**
* fireColumnMarginChanged
*/
- protected void fireColumnMarginChanged() {
+ protected void fireColumnMarginChanged()
+ {
// TODO
- } // fireColumnMarginChanged()
+ }
/**
* getListeners
* @param value0 TODO
- * @returns EventListener[]
+ * @return EventListener[]
*/
- public EventListener[] getListeners(Class value0) {
+ public EventListener[] getListeners(Class value0)
+ {
return null; // TODO
- } // getListeners()
+ }
/**
* propertyChange
* @param value0 TODO
*/
- public void propertyChange(PropertyChangeEvent value0) {
+ public void propertyChange(PropertyChangeEvent value0)
+ {
// TODO
- } // propertyChange()
+ }
/**
* valueChanged
* @param value0 TODO
*/
- public void valueChanged(ListSelectionEvent value0) {
+ public void valueChanged(ListSelectionEvent value0)
+ {
// TODO
- } // valueChanged()
+ }
/**
* createSelectionModel
- * @returns ListSelectionModel
+ * @return ListSelectionModel
*/
- protected ListSelectionModel createSelectionModel() {
+ protected ListSelectionModel createSelectionModel()
+ {
return null; // TODO
- } // createSelectionModel()
+ }
/**
* recalcWidthCache
*/
- protected void recalcWidthCache() {
+ protected void recalcWidthCache()
+ {
// TODO
- } // recalcWidthCache()
+ }
/**
* invalidateWidthCache
*/
- private void invalidateWidthCache() {
+ private void invalidateWidthCache()
+ {
// TODO
- } // invalidateWidthCache()
-
-
-} // DefaultTableColumnModel
-
+ }
+}
Index: javax/swing/table/TableColumn.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/TableColumn.java,v
retrieving revision 1.3.18.1
diff -u -b -B -r1.3.18.1 TableColumn.java
--- javax/swing/table/TableColumn.java 24 Jun 2004 05:31:36 -0000 1.3.18.1
+++ javax/swing/table/TableColumn.java 10 Jul 2004 09:43:45 -0000
@@ -47,14 +47,11 @@
* @author Andrew Selkirk
* @version 1.0
*/
-public class TableColumn implements Serializable
+public class TableColumn
+ implements Serializable
{
static final long serialVersionUID = -6113660025878112608L;
- //-------------------------------------------------------------
- // Variables --------------------------------------------------
- //-------------------------------------------------------------
-
/**
* COLUMN_WIDTH_PROPERTY
*/
@@ -138,36 +135,35 @@
/**
* changeSupport
*/
- private SwingPropertyChangeSupport changeSupport = new SwingPropertyChangeSupport(this);
-
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
+ private SwingPropertyChangeSupport changeSupport =
+ new SwingPropertyChangeSupport(this);
/**
* Constructor TableColumn
*/
- public TableColumn() {
+ public TableColumn()
+ {
this(0, 75, null, null);
- } // TableColumn()
+ }
/**
* Constructor TableColumn
* @param modelIndex TODO
*/
- public TableColumn(int modelIndex) {
+ public TableColumn(int modelIndex)
+ {
this(modelIndex, 75, null, null);
- } // TableColumn()
+ }
/**
* Constructor TableColumn
* @param modelIndex TODO
* @param width TODO
*/
- public TableColumn(int modelIndex, int width) {
+ public TableColumn(int modelIndex, int width)
+ {
this(modelIndex, width, null, null);
- } // TableColumn()
+ }
/**
* Constructor TableColumn
@@ -177,7 +173,8 @@
* @param cellEditor TODO
*/
public TableColumn(int modelIndex, int width,
- TableCellRenderer cellRenderer, TableCellEditor cellEditor) {
+ TableCellRenderer cellRenderer, TableCellEditor cellEditor)
+ {
this.modelIndex = modelIndex;
this.width = width;
this.preferredWidth = width;
@@ -185,12 +182,7 @@
this.cellEditor = cellEditor;
this.headerValue = null;
this.identifier = null;
- } // TableColumn()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ }
/**
* firePropertyChange
@@ -198,9 +190,11 @@
* @param oldValue TODO
* @param newValue TODO
*/
- private void firePropertyChange(String property, Object oldValue, Object newValue) {
+ private void firePropertyChange(String property, Object oldValue,
+ Object newValue)
+ {
changeSupport.firePropertyChange(property, oldValue, newValue);
- } // firePropertyChange()
+ }
/**
* firePropertyChange
@@ -208,9 +202,10 @@
* @param oldValue TODO
* @param newValue TODO
*/
- private void firePropertyChange(String property, int oldValue, int newValue) {
+ private void firePropertyChange(String property, int oldValue, int newValue)
+ {
firePropertyChange(property, new Integer(oldValue), new Integer(newValue));
- } // firePropertyChange()
+ }
/**
* firePropertyChange
@@ -218,7 +213,8 @@
* @param oldValue TODO
* @param newValue TODO
*/
- private void firePropertyChange(String property, boolean oldValue, boolean newValue)
+ private void firePropertyChange(String property, boolean oldValue,
+ boolean newValue)
{
firePropertyChange(property, new Boolean(oldValue), new Boolean(newValue));
}
@@ -227,43 +223,46 @@
* setModelIndex
* @param modelIndex TODO
*/
- public void setModelIndex(int modelIndex) {
+ public void setModelIndex(int modelIndex)
+ {
this.modelIndex = modelIndex;
- } // setModelIndex()
+ }
/**
* getModelIndex
- * @returns int
+ * @return int
*/
- public int getModelIndex() {
+ public int getModelIndex()
+ {
return modelIndex;
- } // getModelIndex()
+ }
/**
* setIdentifier
* @param identifier TODO
*/
- public void setIdentifier(Object identifier) {
+ public void setIdentifier(Object identifier)
+ {
this.identifier = identifier;
- } // setIdentifier()
+ }
/**
* getIdentifier
- * @returns Object
+ * @return Object
*/
- public Object getIdentifier() {
- if (identifier == null) {
+ public Object getIdentifier()
+ {
+ if (identifier == null)
return getHeaderValue();
- } // if
return identifier;
- } // getIdentifier()
+ }
/**
* setHeaderValue
* @param headerValue TODO
*/
- public void setHeaderValue(Object headerValue) {
-
+ public void setHeaderValue(Object headerValue)
+ {
// Variables
Object oldValue;
@@ -274,25 +273,24 @@
this.headerValue = headerValue;
// Notify Listeners of change
- firePropertyChange(HEADER_VALUE_PROPERTY,
- oldValue, headerValue);
-
- } // setHeaderValue()
+ firePropertyChange(HEADER_VALUE_PROPERTY, oldValue, headerValue);
+ }
/**
* getHeaderValue
- * @returns Object
+ * @return Object
*/
- public Object getHeaderValue() {
+ public Object getHeaderValue()
+ {
return headerValue;
- } // getHeaderValue()
+ }
/**
* setHeaderRenderer
* @param headerRenderer TODO
*/
- public void setHeaderRenderer(TableCellRenderer headerRenderer) {
-
+ public void setHeaderRenderer(TableCellRenderer headerRenderer)
+ {
// Variables
TableCellRenderer oldRenderer;
@@ -303,25 +301,24 @@
this.headerRenderer = headerRenderer;
// Notify Listeners of change
- firePropertyChange(HEADER_RENDERER_PROPERTY,
- oldRenderer, headerRenderer);
-
- } // setHeaderRenderer()
+ firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer, headerRenderer);
+ }
/**
* getHeaderRenderer
- * @returns TableCellRenderer
+ * @return TableCellRenderer
*/
- public TableCellRenderer getHeaderRenderer() {
+ public TableCellRenderer getHeaderRenderer()
+ {
return headerRenderer;
- } // getHeaderRenderer()
+ }
/**
* setCellRenderer
* @param cellRenderer TODO
*/
- public void setCellRenderer(TableCellRenderer cellRenderer) {
-
+ public void setCellRenderer(TableCellRenderer cellRenderer)
+ {
// Variables
TableCellRenderer oldRenderer;
@@ -332,41 +329,42 @@
this.cellRenderer = cellRenderer;
// Notify Listeners of change
- firePropertyChange(CELL_RENDERER_PROPERTY,
- oldRenderer, cellRenderer);
-
- } // setCellRenderer()
+ firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer, cellRenderer);
+ }
/**
* getCellRenderer
- * @returns TableCellRenderer
+ * @return TableCellRenderer
*/
- public TableCellRenderer getCellRenderer() {
+ public TableCellRenderer getCellRenderer()
+ {
return cellRenderer;
- } // getCellRenderer()
+ }
/**
* setCellEditor
* @param cellEditor TODO
*/
- public void setCellEditor(TableCellEditor cellEditor) {
+ public void setCellEditor(TableCellEditor cellEditor)
+ {
this.cellEditor = cellEditor;
- } // setCellEditor()
+ }
/**
* getCellEditor
- * @returns TableCellEditor
+ * @return TableCellEditor
*/
- public TableCellEditor getCellEditor() {
+ public TableCellEditor getCellEditor()
+ {
return cellEditor;
- } // getCellEditor()
+ }
/**
* setWidth
* @param width TODO
*/
- public void setWidth(int width) {
-
+ public void setWidth(int width)
+ {
// Variables
int oldWidth;
@@ -374,145 +372,154 @@
oldWidth = this.width;
// Adjust Width within Limits
- if (width < minWidth) {
+ if (width < minWidth)
this.width = minWidth;
- } else if (width > maxWidth) {
+ else if (width > maxWidth)
this.width = maxWidth;
- } else {
+ else
this.width = width;
- } // if
- // Fire Property Change
firePropertyChange(COLUMN_WIDTH_PROPERTY, oldWidth, this.width);
-
- } // setWidth()
+ }
/**
* getWidth
- * @returns int
+ * @return int
*/
- public int getWidth() {
+ public int getWidth()
+ {
return width;
- } // getWidth()
+ }
/**
* setPreferredWidth
* @param preferredWidth TODO
*/
- public void setPreferredWidth(int preferredWidth) {
- if (preferredWidth < minWidth) {
+ public void setPreferredWidth(int preferredWidth)
+ {
+ if (preferredWidth < minWidth)
this.preferredWidth = minWidth;
- } else if (preferredWidth > maxWidth) {
+ else if (preferredWidth > maxWidth)
this.preferredWidth = maxWidth;
- } else {
+ else
this.preferredWidth = preferredWidth;
- } // if
- } // setPreferredWidth()
+ }
/**
* getPreferredWidth
- * @returns int
+ * @return int
*/
- public int getPreferredWidth() {
+ public int getPreferredWidth()
+ {
return preferredWidth;
- } // getPreferredWidth()
+ }
/**
* setMinWidth
* @param minWidth TODO
*/
- public void setMinWidth(int minWidth) {
+ public void setMinWidth(int minWidth)
+ {
this.minWidth = minWidth;
setWidth(getWidth());
setPreferredWidth(getPreferredWidth());
- } // setMinWidth()
+ }
/**
* getMinWidth
- * @returns int
+ * @return int
*/
- public int getMinWidth() {
+ public int getMinWidth()
+ {
return minWidth;
- } // getMinWidth()
+ }
/**
* setMaxWidth
* @param maxWidth TODO
*/
- public void setMaxWidth(int maxWidth) {
+ public void setMaxWidth(int maxWidth)
+ {
this.maxWidth = maxWidth;
setWidth(getWidth());
setPreferredWidth(getPreferredWidth());
- } // setMaxWidth()
+ }
/**
* getMaxWidth
- * @returns int
+ * @return int
*/
- public int getMaxWidth() {
+ public int getMaxWidth()
+ {
return maxWidth;
- } // getMaxWidth()
+ }
/**
* setResizable
* @param isResizable TODO
*/
- public void setResizable(boolean isResizable) {
+ public void setResizable(boolean isResizable)
+ {
this.isResizable = isResizable;
- } // setResizable()
+ }
/**
* getResizable
- * @returns boolean
+ * @return boolean
*/
- public boolean getResizable() {
+ public boolean getResizable()
+ {
return isResizable;
- } // getResizable()
+ }
/**
* sizeWidthToFit
*/
- public void sizeWidthToFit() {
+ public void sizeWidthToFit()
+ {
// TODO
- } // sizeWidthToFit()
+ }
/**
* disableResizedPosting
*/
- public void disableResizedPosting() {
+ public void disableResizedPosting()
+ {
// Does nothing
- } // disableResizedPosting()
+ }
/**
* enableResizedPosting
*/
- public void enableResizedPosting() {
+ public void enableResizedPosting()
+ {
// Does nothing
- } // enableResizedPosting()
+ }
/**
* addPropertyChangeListener
- * @param listener TODO
+ * @param listener the listener to all
*/
- public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+ public synchronized void addPropertyChangeListener(PropertyChangeListener listener)
+ {
changeSupport.addPropertyChangeListener(listener);
- } // addPropertyChangeListener()
+ }
/**
* removePropertyChangeListener
- * @param listener TODO
+ * @param listener the listener to remove
*/
- public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+ public synchronized void removePropertyChangeListener(PropertyChangeListener listener)
+ {
changeSupport.removePropertyChangeListener(listener);
- } // removePropertyChangeListener()
+ }
/**
* createDefaultHeaderRenderer
- * @returns TableCellRenderer
+ * @return TableCellRenderer
*/
- protected TableCellRenderer createDefaultHeaderRenderer() {
+ protected TableCellRenderer createDefaultHeaderRenderer()
+ {
return new DefaultTableCellRenderer();
- } // createDefaultHeaderRenderer()
-
-
-} // TableColumn
+ }
+}
Index: javax/swing/table/TableColumnModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/TableColumnModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TableColumnModel.java
--- javax/swing/table/TableColumnModel.java 12 Oct 2003 13:33:31 -0000 1.2
+++ javax/swing/table/TableColumnModel.java 10 Jul 2004 09:43:45 -0000
@@ -37,7 +37,6 @@
package javax.swing.table;
-// Imports
import java.util.Enumeration;
import javax.swing.ListSelectionModel;
import javax.swing.event.TableColumnModelListener;
@@ -46,8 +46,8 @@
* TableColumnModel public interface
* @author Andrew Selkirk
*/
-public interface TableColumnModel {
-
+public interface TableColumnModel
+{
/**
* addColumn
* @param column TableColumn
@@ -75,13 +75,13 @@
/**
* getColumnCount
- * @returns Column count
+ * @return Column count
*/
int getColumnCount();
/**
* getColumns
- * @returns Enumeration of columns
+ * @return Enumeration of columns
*/
Enumeration getColumns();
@@ -99,19 +99,19 @@
/**
* getColumnMargin
- * @returns Column margin
+ * @return Column margin
*/
int getColumnMargin();
/**
* getColumnIndexAtX
- * @returns Column index as position x
+ * @return Column index as position x
*/
int getColumnIndexAtX(int xPosition);
/**
* getTotalColumnWidth
- * @returns Total column width
+ * @return Total column width
*/
int getTotalColumnWidth();
@@ -123,19 +123,19 @@
/**
* getColumnSelectionAllowed
- * @returns true if column selection allowed, false otherwise
+ * @return true if column selection allowed, false otherwise
*/
boolean getColumnSelectionAllowed();
/**
* getSelectedColumns
- * @returns Selected columns
+ * @return Selected columns
*/
int[] getSelectedColumns();
/**
* getSelectedColumnCount
- * @returns Count of selected columns
+ * @return Count of selected columns
*/
int getSelectedColumnCount();
@@ -162,6 +162,4 @@
* @param listener TableColumnModelListener
*/
void removeColumnModelListener(TableColumnModelListener listener);
-
-
-} // TableColumnModel
+}
Index: javax/swing/table/TableModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/TableModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TableModel.java
--- javax/swing/table/TableModel.java 12 Oct 2003 13:33:31 -0000 1.2
+++ javax/swing/table/TableModel.java 10 Jul 2004 09:43:45 -0000
@@ -37,9 +37,9 @@
package javax.swing.table;
-// Imports
import javax.swing.event.TableModelListener;
+
/**
* TableModel public interface
* @author Andrew Selkirk
@@ -44,31 +44,31 @@
* TableModel public interface
* @author Andrew Selkirk
*/
-public interface TableModel {
-
+public interface TableModel
+{
/**
* getRowCount
- * @returns row count
+ * @return row count
*/
int getRowCount();
/**
* getColumnCount
- * @returns column count
+ * @return column count
*/
int getColumnCount();
/**
* getColumnName
* @param columnIndex Column index
- * @returns Column name
+ * @return Column name
*/
String getColumnName(int columnIndex);
/**
* getColumnClass
* @param columnIndex Column index
- * @returns Column class
+ * @return Column class
*/
Class getColumnClass(int columnIndex);
@@ -76,7 +76,7 @@
* isCellEditable
* @param rowIndex Row index
* @param columnIndex Column index
- * @returns true if editable, false otherwise
+ * @return true if editable, false otherwise
*/
boolean isCellEditable(int rowIndex, int columnIndex);
@@ -84,7 +84,7 @@
* getValueAt
* @param rowIndex Row index
* @param columnIndex Column index
- * @returns Value at specified indices
+ * @return Value at specified indices
*/
Object getValueAt(int rowIndex, int columnIndex);
@@ -107,6 +107,4 @@
* @param listener TableModelListener
*/
void removeTableModelListener(TableModelListener listener);
-
-
-} // TableModel
+}
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.3.8.11
diff -u -b -B -r1.3.8.11 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java 29 Jun 2004 09:59:11 -0000 1.3.8.11
+++ javax/swing/text/AbstractDocument.java 10 Jul 2004 09:43:45 -0000
@@ -92,8 +92,7 @@
return new LeafElement(parent, a, p0, p1 - p0);
}
- public Position createPosition(final int offset)
- throws BadLocationException
+ public Position createPosition(final int offset) throws BadLocationException
{
if (offset < 0 || offset > getLength())
throw new BadLocationException(getText(0, getLength()), offset);
@@ -199,8 +198,7 @@
return null;
}
- public String getText(int offset, int length)
- throws BadLocationException
+ public String getText(int offset, int length) throws BadLocationException
{
return content.getString(offset, length);
}
@@ -255,8 +253,7 @@
{
}
- public void remove(int offset, int length)
- throws BadLocationException
+ public void remove(int offset, int length) throws BadLocationException
{
}
Index: javax/swing/text/TextAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/TextAction.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 TextAction.java
--- javax/swing/text/TextAction.java 10 Jan 2004 21:07:44 -0000 1.2
+++ javax/swing/text/TextAction.java 10 Jul 2004 09:43:45 -0000
@@ -44,53 +45,45 @@
/**
* TextAction
* @author Andrew Selkirk
- * @version 1.0
*/
-public abstract class TextAction extends AbstractAction {
-
- //-------------------------------------------------------------
- // Initialization ---------------------------------------------
- //-------------------------------------------------------------
-
+public abstract class TextAction extends AbstractAction
+{
/**
* Constructor TextAction
* @param name TODO
*/
- public TextAction(String name) {
+ public TextAction(String name)
+ {
// TODO
- } // TextAction()
-
-
- //-------------------------------------------------------------
- // Methods ----------------------------------------------------
- //-------------------------------------------------------------
+ }
/**
* getTextComponent
* @param event TODO
- * @returns JTextComponent
+ * @return JTextComponent
*/
- protected final JTextComponent getTextComponent(ActionEvent event) {
+ protected final JTextComponent getTextComponent(ActionEvent event)
+ {
return null; // TODO
- } // getTextComponent()
+ }
/**
* augmentList
* @param list1 TODO
* @param list2 TODO
- * @returns Action[]
+ * @return Action[]
*/
- public static final Action[] augmentList(Action[] list1, Action[] list2) {
+ public static final Action[] augmentList(Action[] list1, Action[] list2)
+ {
return null; // TODO
- } // augmentList()
+ }
/**
* getFocusedComponent
- * @returns JTextComponent
+ * @return JTextComponent
*/
- protected final JTextComponent getFocusedComponent() {
+ protected final JTextComponent getFocusedComponent()
+ {
return null; // TODO
- } // getFocusedComponent()
-
-
-} // TextAction
+ }
+}