[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] FYI: Swing whitespace cleanup
|
From: |
Mark Wielaard |
|
Subject: |
[cp-patches] FYI: Swing whitespace cleanup |
|
Date: |
Thu, 23 Sep 2004 17:02:07 +0200 |
Hi,
There were a couple of files that only different in whitespace between
libgcj gui branch and classpath cvs head. This patch merges them.
2004-09-23 Mark Wielaard <address@hidden>
* javax/swing/AbstractButton.java: Whitespace cleanup.
* javax/swing/DefaultButtonModel.java: Likewise.
* javax/swing/JLabel.java: Likewise.
* javax/swing/KeyStroke.java: Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
* javax/swing/plaf/basic/BasicComboBoxUI.java: Likewise.
* javax/swing/plaf/basic/BasicComboPopup.java: Likewise.
* javax/swing/plaf/basic/BasicTableHeaderUI.java: Likewise.
* javax/swing/plaf/basic/BasicTableUI.java: Likewise.
* javax/swing/plaf/basic/BasicTextUI.java: Likewise.
* javax/swing/table/DefaultTableCellRenderer.java: Likewise.
* javax/swing/text/AbstractDocument.java: Likewise.
* javax/swing/text/AttributeSet.java: Likewise.
* javax/swing/text/DefaultEditorKit.java: Likewise.
A cvs diff -b showed that it was all indeed whitespace except for two
files (BasicTableHeaderUI.java and BasicTableUI.java) which were also
missing the correct copyright header.
Committed.
Cheers,
Mark
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.21
diff -u -r1.21 AbstractButton.java
--- javax/swing/AbstractButton.java 23 Sep 2004 13:10:56 -0000 1.21
+++ javax/swing/AbstractButton.java 23 Sep 2004 14:58:23 -0000
@@ -234,7 +234,7 @@
/** The time in miliseconds in which clicks get coalesced into a single
* <code>ActionEvent</code>. */
long multiClickThreshhold;
-
+
/** Listener the button uses to receive PropertyChangeEvents from its
Action. */
PropertyChangeListener actionPropertyChangeListener;
@@ -299,9 +299,9 @@
/** Fired in a PropertyChangeEvent when the "verticalTextPosition" property
changes. */
public static final String VERTICAL_TEXT_POSITION_CHANGED_PROPERTY =
"verticalTextPosition";
- /**
- * A Java Accessibility extension of the AbstractButton.
- */
+ /**
+ * A Java Accessibility extension of the AbstractButton.
+ */
protected abstract class AccessibleAbstractButton
extends AccessibleJComponent implements AccessibleAction, AccessibleValue,
AccessibleText
@@ -433,7 +433,7 @@
}
public String getSelectedText()
- {
+ {
return null; // TODO
}
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.12
diff -u -r1.12 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java 4 Sep 2004 20:52:29 -0000 1.12
+++ javax/swing/DefaultButtonModel.java 23 Sep 2004 14:58:24 -0000
@@ -340,7 +340,7 @@
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
null, ItemEvent.SELECTED));
if (group != null)
- group.setSelected(this, true);
+ group.setSelected(this, true);
}
else if ((oldstate & SELECTED) == SELECTED && (newstate & SELECTED) == 0)
@@ -348,7 +348,7 @@
fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
null, ItemEvent.DESELECTED));
if (group != null)
- group.setSelected(this, false);
+ group.setSelected(this, false);
}
else if (((oldstate & ARMED) == ARMED && (oldstate & PRESSED) == PRESSED)
Index: javax/swing/JLabel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JLabel.java,v
retrieving revision 1.14
diff -u -r1.14 JLabel.java
--- javax/swing/JLabel.java 4 Sep 2004 20:31:20 -0000 1.14
+++ javax/swing/JLabel.java 23 Sep 2004 14:58:24 -0000
@@ -368,7 +368,7 @@
public void setDisplayedMnemonic(int mnemonic)
{
if (displayedMnemonic != mnemonic)
- {
+ {
firePropertyChange(DISPLAYED_MNEMONIC_CHANGED_PROPERTY,
displayedMnemonic, mnemonic);
displayedMnemonic = mnemonic;
@@ -386,7 +386,7 @@
* @param mnemonic The character to use for the mnemonic.
*/
public void setDisplayedMnemonic(char mnemonic)
- {
+ {
setDisplayedMnemonic((int) mnemonic);
}
@@ -416,16 +416,16 @@
{
if (newIndex < -1 || (text != null && newIndex >= text.length()))
throw new IllegalArgumentException();
-
+
if (text == null || text.charAt(newIndex) != displayedMnemonic)
newIndex = -1;
-
+
if (newIndex != displayedMnemonicIndex)
- {
- firePropertyChange(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY,
- displayedMnemonicIndex, newIndex);
- displayedMnemonicIndex = newIndex;
- }
+ {
+ firePropertyChange(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY,
+ displayedMnemonicIndex, newIndex);
+ displayedMnemonicIndex = newIndex;
+ }
}
/**
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/KeyStroke.java,v
retrieving revision 1.10
diff -u -r1.10 KeyStroke.java
--- javax/swing/KeyStroke.java 4 Sep 2004 17:14:01 -0000 1.10
+++ javax/swing/KeyStroke.java 23 Sep 2004 14:58:24 -0000
@@ -46,9 +46,9 @@
implements Serializable
{
static final long serialVersionUID = -9060180771037902530L;
- private KeyStroke() {
+ private KeyStroke() {
}
-
+
protected KeyStroke(char keyChar, int keyCode, int modifiers,
boolean onKeyRelease)
{
@@ -65,12 +65,12 @@
return (KeyStroke) getAWTKeyStroke(keyChar);
}
- /**
+ /**
* @deprecated Use address@hidden #getKeyStroke(char)}
*
* This method, unlike all the other factory methods on this object,
* returns a non-cached, non-shared object. New code should not use it.
- */
+ */
public static KeyStroke getKeyStroke(char keyChar, boolean onKeyRelease)
{
return new KeyStroke(keyChar, KeyEvent.VK_UNDEFINED, 0, onKeyRelease);
@@ -81,7 +81,7 @@
return (KeyStroke) getAWTKeyStroke(keyChar, modifiers);
}
- public static KeyStroke getKeyStroke(int keyCode, int modifiers,
+ public static KeyStroke getKeyStroke(int keyCode, int modifiers,
boolean onKeyRelease)
{
return (KeyStroke) getAWTKeyStroke(keyCode, modifiers, onKeyRelease);
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.5
diff -u -r1.5 BasicButtonListener.java
--- javax/swing/plaf/basic/BasicButtonListener.java 4 Sep 2004 17:14:01
-0000 1.5
+++ javax/swing/plaf/basic/BasicButtonListener.java 23 Sep 2004 14:58:24
-0000
@@ -73,7 +73,7 @@
button.repaint();
}
}
-
+
public void focusLost(FocusEvent e)
{
if (e.getSource() instanceof AbstractButton)
Index: javax/swing/plaf/basic/BasicComboBoxUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,v
retrieving revision 1.2
diff -u -r1.2 BasicComboBoxUI.java
--- javax/swing/plaf/basic/BasicComboBoxUI.java 22 Sep 2004 12:43:13 -0000
1.2
+++ javax/swing/plaf/basic/BasicComboBoxUI.java 23 Sep 2004 14:58:24 -0000
@@ -1127,7 +1127,6 @@
*/
public void intervalRemoved(ListDataEvent e)
{
-
// recalculate display size of the JComboBox.
largestItemSize = getLargestItemSize();
comboBox.repaint();
Index: javax/swing/plaf/basic/BasicComboPopup.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboPopup.java,v
retrieving revision 1.2
diff -u -r1.2 BasicComboPopup.java
--- javax/swing/plaf/basic/BasicComboPopup.java 22 Sep 2004 12:43:13 -0000
1.2
+++ javax/swing/plaf/basic/BasicComboPopup.java 23 Sep 2004 14:58:24 -0000
@@ -837,7 +837,7 @@
}
if (e.getPropertyName().equals(JComboBox.MODEL_CHANGED_PROPERTY))
{
- list.setModel((ComboBoxModel) e.getNewValue());
+ list.setModel((ComboBoxModel) e.getNewValue());
revalidate();
repaint();
}
Index: javax/swing/plaf/basic/BasicTableHeaderUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicTableHeaderUI.java
--- javax/swing/plaf/basic/BasicTableHeaderUI.java 4 Sep 2004 21:14:06
-0000 1.1
+++ javax/swing/plaf/basic/BasicTableHeaderUI.java 23 Sep 2004 14:58:24
-0000
@@ -1,3 +1,40 @@
+/* BasicTableHeaderUI.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;
Index: javax/swing/plaf/basic/BasicTableUI.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTableUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicTableUI.java
--- javax/swing/plaf/basic/BasicTableUI.java 4 Sep 2004 21:14:06 -0000
1.1
+++ javax/swing/plaf/basic/BasicTableUI.java 23 Sep 2004 14:58:24 -0000
@@ -1,3 +1,40 @@
+/* BasicTableUI.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.Color;
Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.11
diff -u -r1.11 BasicTextUI.java
--- javax/swing/plaf/basic/BasicTextUI.java 4 Sep 2004 17:14:01 -0000
1.11
+++ javax/swing/plaf/basic/BasicTextUI.java 23 Sep 2004 14:58:24 -0000
@@ -159,7 +159,7 @@
}
}
}
-
+
static EditorKit kit = new DefaultEditorKit();
RootView rootView = new RootView();
@@ -254,7 +254,7 @@
}
protected void installKeyboardActions()
- {
+ {
// load any bindings for the older Keymap interface
Keymap km = JTextComponent.getKeymap(getKeymapName());
if (km == null)
Index: javax/swing/table/DefaultTableCellRenderer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/swing/table/DefaultTableCellRenderer.java,v
retrieving revision 1.8
diff -u -r1.8 DefaultTableCellRenderer.java
--- javax/swing/table/DefaultTableCellRenderer.java 4 Sep 2004 21:14:06
-0000 1.8
+++ javax/swing/table/DefaultTableCellRenderer.java 23 Sep 2004 14:58:24
-0000
@@ -122,7 +122,7 @@
{
if (value!=null)
super.setText(value.toString());
-
+
setOpaque(true);
if (isSelected)
{
@@ -137,7 +137,7 @@
setEnabled(table.isEnabled());
setFont(table.getFont());
- return this;
+ return this;
}
/**
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.10
diff -u -r1.10 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java 4 Sep 2004 17:14:01 -0000
1.10
+++ javax/swing/text/AbstractDocument.java 23 Sep 2004 14:58:24 -0000
@@ -431,22 +431,22 @@
{
return Collections.enumeration(tree_children);
}
-
+
public boolean getAllowsChildren()
{
return true;
}
-
+
public TreeNode getChildAt(int index)
{
return (TreeNode) tree_children.get(index);
}
-
+
public int getChildCount()
{
return tree_children.size();
}
-
+
public int getIndex(TreeNode node)
{
return tree_children.indexOf(node);
@@ -551,28 +551,28 @@
{
return AbstractDocument.this;
}
-
+
public Element getElement(int index)
{
return (Element) element_children.get(index);
}
-
+
public String getName()
{
return (String) getAttribute(NameAttribute);
}
-
+
public Element getParentElement()
{
return element_parent;
}
-
+
public abstract int getEndOffset();
-
+
public abstract int getElementCount();
-
+
public abstract int getElementIndex(int offset);
-
+
public abstract int getStartOffset();
}
Index: javax/swing/text/AttributeSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AttributeSet.java,v
retrieving revision 1.6
diff -u -r1.6 AttributeSet.java
--- javax/swing/text/AttributeSet.java 4 Sep 2004 17:14:01 -0000 1.6
+++ javax/swing/text/AttributeSet.java 23 Sep 2004 14:58:24 -0000
@@ -56,7 +56,7 @@
static interface ParagraphAttribute
{
}
-
+
static Object NameAttribute = StyleConstants.NameAttribute;
static Object ResolveAttribute = StyleConstants.ResolveAttribute;
Index: javax/swing/text/DefaultEditorKit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultEditorKit.java,v
retrieving revision 1.8
diff -u -r1.8 DefaultEditorKit.java
--- javax/swing/text/DefaultEditorKit.java 4 Sep 2004 17:14:01 -0000
1.8
+++ javax/swing/text/DefaultEditorKit.java 23 Sep 2004 14:58:24 -0000
@@ -347,7 +347,7 @@
{
return new PlainDocument();
}
-
+
public Action[] getActions()
{
return defaultActions;
signature.asc
Description: This is a digitally signed message part
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] FYI: Swing whitespace cleanup,
Mark Wielaard <=