Index: javax/swing/JFrame.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JFrame.java,v retrieving revision 1.15 diff -u -r1.15 JFrame.java --- javax/swing/JFrame.java 25 Sep 2004 16:25:15 -0000 1.15 +++ javax/swing/JFrame.java 27 Sep 2004 07:47:19 -0000 @@ -218,27 +218,27 @@ { case WindowEvent.WINDOW_CLOSING: { - switch (close_action) + switch (close_action) { - case EXIT_ON_CLOSE: - { - System.exit(0); - break; - } - case DISPOSE_ON_CLOSE: - { - dispose(); - break; - } - case HIDE_ON_CLOSE: - { - setVisible(false); + case EXIT_ON_CLOSE: + { + System.exit(0); break; - } - case DO_NOTHING_ON_CLOSE: - break; + } + case DISPOSE_ON_CLOSE: + { + dispose(); + break; + } + case HIDE_ON_CLOSE: + { + setVisible(false); + break; + } + case DO_NOTHING_ON_CLOSE: + break; } - break; + break; } case WindowEvent.WINDOW_CLOSED: case WindowEvent.WINDOW_OPENED: @@ -246,7 +246,7 @@ case WindowEvent.WINDOW_DEICONIFIED: case WindowEvent.WINDOW_ACTIVATED: case WindowEvent.WINDOW_DEACTIVATED: - break; + break; } } Index: javax/swing/JRadioButton.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JRadioButton.java,v retrieving revision 1.11 diff -u -r1.11 JRadioButton.java --- javax/swing/JRadioButton.java 5 Sep 2004 20:03:23 -0000 1.11 +++ javax/swing/JRadioButton.java 27 Sep 2004 07:47:19 -0000 @@ -68,7 +68,6 @@ */ public class JRadioButton extends JToggleButton { - /** * Compatible with Sun's JDK. */ @@ -110,7 +109,7 @@ { this(null, null, false); } - + /** * Constructs a radio button using the labelling, state * and icon specified by the supplied action. @@ -122,7 +121,7 @@ this(); setAction(a); } - + /** * Constructs an unselected radio button with the supplied icon * and no text. @@ -142,9 +141,9 @@ * selected state. Otherwise, the button is unselected. */ public JRadioButton(Icon icon, boolean selected) - { + { this(null, icon, selected); - } + } /** * Constructs an unselected radio button using the supplied text @@ -156,7 +155,7 @@ { this(text, null, false); } - + /** * Constructs a radio button with the supplied text and state. * @@ -168,7 +167,7 @@ { this(text, null, selected); } - + /** * Constructs an unselected radio button with the supplied text * and icon. @@ -195,7 +194,7 @@ borderPainted = false; contentAreaFilled = false; } - + /** * Returns the accessible context for this JRadioButton, * in the form of an instance of AccessibleJRadioButton. Index: javax/swing/JRootPane.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v retrieving revision 1.14 diff -u -r1.14 JRootPane.java --- javax/swing/JRootPane.java 26 Sep 2004 18:24:05 -0000 1.14 +++ javax/swing/JRootPane.java 27 Sep 2004 07:47:19 -0000 @@ -318,7 +318,7 @@ public static final int FILE_CHOOSER_DIALOG = 6; public static final int QUESTION_DIALOG = 7; public static final int WARNING_DIALOG = 8; - + /** DOCUMENT ME! */ protected Component glassPane; Index: javax/swing/JTextField.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/JTextField.java,v retrieving revision 1.13 diff -u -r1.13 JTextField.java --- javax/swing/JTextField.java 26 Sep 2004 18:56:27 -0000 1.13 +++ javax/swing/JTextField.java 27 Sep 2004 07:47:19 -0000 @@ -158,7 +158,7 @@ setDocument(doc == null ? createDefaultModel() : doc); if (text != null) - setText(text); + setText(text); } /** @@ -336,9 +336,9 @@ if (action != null) { - removeActionListener(action); - action.removePropertyChangeListener(actionPropertyChangeListener); - actionPropertyChangeListener = null; + removeActionListener(action); + action.removePropertyChangeListener(actionPropertyChangeListener); + actionPropertyChangeListener = null; } Action oldAction = action; @@ -346,10 +346,10 @@ if (action != null) { - addActionListener(action); - actionPropertyChangeListener = - createActionPropertyChangeListener(action); - action.addPropertyChangeListener(actionPropertyChangeListener); + addActionListener(action); + actionPropertyChangeListener = + createActionPropertyChangeListener(action); + action.addPropertyChangeListener(actionPropertyChangeListener); } firePropertyChange("horizontalAlignment", oldAction, newAction); @@ -378,21 +378,21 @@ { return new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) - { - // Update properties "action" and "horizontalAlignment". - String name = event.getPropertyName(); - - if (name.equals("enabled")) - { - boolean enabled = ((Boolean) event.getNewValue()).booleanValue(); - JTextField.this.setEnabled(enabled); - } - else if (name.equals(Action.SHORT_DESCRIPTION)) - { - JTextField.this.setToolTipText((String) event.getNewValue()); - } - } + public void propertyChange(PropertyChangeEvent event) + { + // Update properties "action" and "horizontalAlignment". + String name = event.getPropertyName(); + + if (name.equals("enabled")) + { + boolean enabled = ((Boolean) event.getNewValue()).booleanValue(); + JTextField.this.setEnabled(enabled); + } + else if (name.equals(Action.SHORT_DESCRIPTION)) + { + JTextField.this.setToolTipText((String) event.getNewValue()); + } + } }; } @@ -403,13 +403,13 @@ { if (action != null) { - setEnabled(action.isEnabled()); - setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION)); + setEnabled(action.isEnabled()); + setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION)); } else { - setEnabled(true); - setToolTipText(null); + setEnabled(true); + setToolTipText(null); } } Index: javax/swing/SpinnerNumberModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/SpinnerNumberModel.java,v retrieving revision 1.4 diff -u -r1.4 SpinnerNumberModel.java --- javax/swing/SpinnerNumberModel.java 26 Sep 2004 15:37:26 -0000 1.4 +++ javax/swing/SpinnerNumberModel.java 27 Sep 2004 07:47:19 -0000 @@ -259,8 +259,8 @@ { if (minimum != newMinimum) { - minimum = newMinimum; - fireStateChanged(); + minimum = newMinimum; + fireStateChanged(); } } @@ -273,8 +273,8 @@ { if (maximum != newMaximum) { - maximum = newMaximum; - fireStateChanged(); + maximum = newMaximum; + fireStateChanged(); } } @@ -290,8 +290,8 @@ if (stepSize != newStepSize) { - stepSize = newStepSize; - fireStateChanged(); + stepSize = newStepSize; + fireStateChanged(); } } } Index: javax/swing/plaf/basic/BasicArrowButton.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicArrowButton.java,v retrieving revision 1.7 diff -u -r1.7 BasicArrowButton.java --- javax/swing/plaf/basic/BasicArrowButton.java 26 Sep 2004 15:21:13 -0000 1.7 +++ javax/swing/plaf/basic/BasicArrowButton.java 27 Sep 2004 07:47:19 -0000 @@ -97,35 +97,34 @@ { public Insets getBorderInsets(Component c) { - return new Insets(2, 2, 2, 2); + return new Insets(2, 2, 2, 2); } public boolean isBorderOpaque() { - return true; + return true; } public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { - System.out.println("PAINTING BORDER"); - Color saved = g.getColor(); - g.setColor(highlight); + Color saved = g.getColor(); + g.setColor(highlight); - g.drawLine(x + 1, y + 1, x + w - 1, y + 1); - g.drawLine(x + 1, y + 1, x + 1, y + h - 1); + g.drawLine(x + 1, y + 1, x + w - 1, y + 1); + g.drawLine(x + 1, y + 1, x + 1, y + h - 1); - g.setColor(shadow); + g.setColor(shadow); - g.drawLine(x + 1, y + h - 1, x + w - 1, y + h - 1); - g.drawLine(x + w - 1, y + 1, x + w - 1, y + h - 1); + g.drawLine(x + 1, y + h - 1, x + w - 1, y + h - 1); + g.drawLine(x + w - 1, y + 1, x + w - 1, y + h - 1); - g.setColor(darkShadow); + g.setColor(darkShadow); - g.drawLine(x, y + h, x + w, y + h); - g.drawLine(x + w, y, x + w, y + h); + g.drawLine(x, y + h, x + w, y + h); + g.drawLine(x + w, y, x + w, y + h); - g.setColor(saved); + g.setColor(saved); } }; @@ -261,18 +260,18 @@ switch (direction) { case NORTH: - arrow = upIcon; + arrow = upIcon; break; case SOUTH: - arrow = downIcon; + arrow = downIcon; break; case EAST: case RIGHT: - arrow = rightIcon; + arrow = rightIcon; break; case WEST: case LEFT: - arrow = leftIcon; + arrow = leftIcon; break; } @@ -286,59 +285,59 @@ if (size != defaultSize) { - float scale = size * 1f / defaultSize; - for (int i = 0; i < 3; i++) - { - xPoints[i] *= scale; - yPoints[i] *= scale; - } + float scale = size * 1f / defaultSize; + for (int i = 0; i < 3; i++) + { + xPoints[i] *= scale; + yPoints[i] *= scale; + } } g.translate(x, y); switch (direction) { case NORTH: - x1 = xPoints[0] + 2; - y1 = yPoints[0]; - y2 = y1; - x2 = xPoints[2] - 1; - break; + x1 = xPoints[0] + 2; + y1 = yPoints[0]; + y2 = y1; + x2 = xPoints[2] - 1; + break; case SOUTH: - x1 = xPoints[1]; - y1 = yPoints[1] + 1; - x2 = xPoints[2] - 1; - y2 = yPoints[2]; - break; + x1 = xPoints[1]; + y1 = yPoints[1] + 1; + x2 = xPoints[2] - 1; + y2 = yPoints[2]; + break; case LEFT: case WEST: - x1 = xPoints[0] + 1; - y1 = yPoints[0] + 1; - x2 = x1; - y2 = yPoints[2] + 1; - break; + x1 = xPoints[0] + 1; + y1 = yPoints[0] + 1; + x2 = x1; + y2 = yPoints[2] + 1; + break; case RIGHT: case EAST: - x1 = xPoints[2]; - y1 = yPoints[2] + 1; - x2 = xPoints[1] - 1; - y2 = yPoints[1] + 1; - break; + x1 = xPoints[2]; + y1 = yPoints[2] + 1; + x2 = xPoints[1] - 1; + y2 = yPoints[1] + 1; + break; } Color saved = g.getColor(); if (isEnabled) { - g.setColor(Color.DARK_GRAY); + g.setColor(Color.DARK_GRAY); - if (arrow != null) - g.fillPolygon(xPoints, yPoints, 3); + if (arrow != null) + g.fillPolygon(xPoints, yPoints, 3); } else { - g.setColor(Color.GRAY); - g.fillPolygon(xPoints, yPoints, 3); - g.setColor(Color.WHITE); - g.drawLine(x1, y1, x2, y2); + g.setColor(Color.GRAY); + g.fillPolygon(xPoints, yPoints, 3); + g.setColor(Color.WHITE); + g.drawLine(x1, y1, x2, y2); } g.setColor(saved); g.translate(-x, -y); Index: javax/swing/plaf/basic/BasicScrollBarUI.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v retrieving revision 1.8 diff -u -r1.8 BasicScrollBarUI.java --- javax/swing/plaf/basic/BasicScrollBarUI.java 26 Sep 2004 15:21:13 -0000 1.8 +++ javax/swing/plaf/basic/BasicScrollBarUI.java 27 Sep 2004 07:47:19 -0000 @@ -154,10 +154,10 @@ decrButton.removeMouseListener(buttonListener); incrButton = createIncreaseButton(scrollbar.getOrientation()); decrButton = createDecreaseButton(scrollbar.getOrientation()); - incrButton.addMouseListener(buttonListener); - decrButton.addMouseListener(buttonListener); - calculatePreferredSize(); - layoutContainer(scrollbar); + incrButton.addMouseListener(buttonListener); + decrButton.addMouseListener(buttonListener); + calculatePreferredSize(); + layoutContainer(scrollbar); } layoutContainer(scrollbar); scrollbar.repaint(); @@ -231,7 +231,7 @@ // Only need to check it if it's block scrolling // We only block scroll if the click occurs // in the track. - if (! trackListener.shouldScroll(direction)) + if (! trackListener.shouldScroll(direction)) { trackHighlight = NO_HIGHLIGHT; scrollbar.repaint(); @@ -273,13 +273,13 @@ currentMouseY = e.getY(); if (scrollbar.getValueIsAdjusting()) { - int value; - if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL) - value = valueForXPosition(currentMouseX) - offset; - else - value = valueForYPosition(currentMouseY) - offset; + int value; + if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL) + value = valueForXPosition(currentMouseX) - offset; + else + value = valueForYPosition(currentMouseY) - offset; - scrollbar.setValue(value); + scrollbar.setValue(value); } } @@ -356,7 +356,7 @@ scrollTimer.stop(); if (scrollbar.getValueIsAdjusting()) - scrollbar.setValueIsAdjusting(false); + scrollbar.setValueIsAdjusting(false); scrollbar.repaint(); } @@ -372,14 +372,14 @@ { int value; if (scrollbar.getOrientation() == HORIZONTAL) - value = valueForXPosition(currentMouseX); + value = valueForXPosition(currentMouseX); else - value = valueForYPosition(currentMouseY); + value = valueForYPosition(currentMouseY); if (direction == POSITIVE_SCROLL) - return (value > scrollbar.getValue()); + return (value > scrollbar.getValue()); else - return (value < scrollbar.getValue()); + return (value < scrollbar.getValue()); } } @@ -518,10 +518,10 @@ : SwingConstants.SOUTH); else { - if (orientation == SwingConstants.HORIZONTAL) - ((BasicArrowButton) incrButton).setDirection(SwingConstants.EAST); - else - ((BasicArrowButton) incrButton).setDirection(SwingConstants.SOUTH); + if (orientation == SwingConstants.HORIZONTAL) + ((BasicArrowButton) incrButton).setDirection(SwingConstants.EAST); + else + ((BasicArrowButton) incrButton).setDirection(SwingConstants.SOUTH); } return incrButton; } @@ -542,10 +542,10 @@ : SwingConstants.NORTH); else { - if (orientation == SwingConstants.HORIZONTAL) - ((BasicArrowButton) decrButton).setDirection(SwingConstants.WEST); - else - ((BasicArrowButton) decrButton).setDirection(SwingConstants.NORTH); + if (orientation == SwingConstants.HORIZONTAL) + ((BasicArrowButton) decrButton).setDirection(SwingConstants.WEST); + else + ((BasicArrowButton) decrButton).setDirection(SwingConstants.NORTH); } return decrButton; } @@ -725,19 +725,19 @@ // System.err.println(this + ".getThumbBounds()"); if (max == min) { - thumbRect.x = trackRect.x; - thumbRect.y = trackRect.y; - if (scrollbar.getOrientation() == HORIZONTAL) - { - thumbRect.width = getMinimumThumbSize().width; - thumbRect.height = trackRect.height; - } - else - { - thumbRect.width = trackRect.width; - thumbRect.height = getMinimumThumbSize().height; - } - return thumbRect; + thumbRect.x = trackRect.x; + thumbRect.y = trackRect.y; + if (scrollbar.getOrientation() == HORIZONTAL) + { + thumbRect.width = getMinimumThumbSize().width; + thumbRect.height = trackRect.height; + } + else + { + thumbRect.width = trackRect.width; + thumbRect.height = getMinimumThumbSize().height; + } + return thumbRect; } if (scrollbar.getOrientation() == HORIZONTAL) @@ -752,7 +752,7 @@ else { thumbRect.x = trackRect.x; - thumbRect.y = trackRect.y + value * trackRect.height / (max - min); + thumbRect.y = trackRect.y + value * trackRect.height / (max - min); thumbRect.width = trackRect.width; thumbRect.height = extent * trackRect.height / (max - min); @@ -874,7 +874,7 @@ configureScrollBarColors(); calculatePreferredSize(); - layoutContainer(scrollbar); + layoutContainer(scrollbar); } } Index: javax/swing/plaf/basic/BasicSplitPaneDivider.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java,v retrieving revision 1.5 diff -u -r1.5 BasicSplitPaneDivider.java --- javax/swing/plaf/basic/BasicSplitPaneDivider.java 26 Sep 2004 15:21:13 -0000 1.5 +++ javax/swing/plaf/basic/BasicSplitPaneDivider.java 27 Sep 2004 07:47:19 -0000 @@ -164,23 +164,23 @@ { public Insets getBorderInsets(Component c) { - return new Insets(2, 2, 2, 2); + return new Insets(2, 2, 2, 2); } public boolean isBorderOpaque() { - return false; + return false; } public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { - Color saved = g.getColor(); - g.setColor(Color.BLACK); + Color saved = g.getColor(); + g.setColor(Color.BLACK); - g.drawRect(x + 2, y + 2, width - 4, height - 4); + g.drawRect(x + 2, y + 2, width - 4, height - 4); - g.setColor(saved); + g.setColor(saved); } }; Index: javax/swing/table/DefaultTableColumnModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/table/DefaultTableColumnModel.java,v retrieving revision 1.8 diff -u -r1.8 DefaultTableColumnModel.java --- javax/swing/table/DefaultTableColumnModel.java 26 Sep 2004 15:15:47 -0000 1.8 +++ javax/swing/table/DefaultTableColumnModel.java 27 Sep 2004 07:47:19 -0000 @@ -204,7 +204,7 @@ * @return int */ public int getColumnIndexAtX(int x) - { + { for (int i = 0; i < tableColumns.size(); ++i) { int w = ((TableColumn)tableColumns.get(i)).getWidth(); @@ -311,7 +311,7 @@ { return (TableColumnModelListener[]) listenerList.getListeners(TableColumnModelListener.class); - } + } /** * fireColumnAdded Index: javax/swing/table/JTableHeader.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/table/JTableHeader.java,v retrieving revision 1.6 diff -u -r1.6 JTableHeader.java --- javax/swing/table/JTableHeader.java 26 Sep 2004 15:15:47 -0000 1.6 +++ javax/swing/table/JTableHeader.java 27 Sep 2004 07:47:19 -0000 @@ -118,7 +118,7 @@ } public String getAccessibleDescription() - { + { throw new Error("not implemented"); } @@ -128,9 +128,9 @@ } public String getAccessibleName() - { + { throw new Error("not implemented"); - } + } public AccessibleRole getAccessibleRole() { Index: javax/swing/text/DocumentFilter.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/DocumentFilter.java,v retrieving revision 1.2 diff -u -r1.2 DocumentFilter.java --- javax/swing/text/DocumentFilter.java 26 Sep 2004 12:16:34 -0000 1.2 +++ javax/swing/text/DocumentFilter.java 27 Sep 2004 07:47:19 -0000 @@ -50,19 +50,19 @@ public abstract Document getDocument(); public abstract void insertString(int offset, String string, - AttributeSet attr) + AttributeSet attr) throws BadLocationException; public abstract void remove(int offset, int length) throws BadLocationException; public abstract void replace(int offset, int length, String string, - AttributeSet attrs) + AttributeSet attrs) throws BadLocationException; } public void insertString(DocumentFilter.FilterBypass fb, int offset, - String string, AttributeSet attr) + String string, AttributeSet attr) throws BadLocationException { fb.insertString(offset, string, attr); @@ -75,7 +75,7 @@ } public void replace(DocumentFilter.FilterBypass fb, int offset, int length, - String text, AttributeSet attr) + String text, AttributeSet attr) throws BadLocationException { fb.replace(offset, length, text, attr); Index: javax/swing/text/JTextComponent.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/JTextComponent.java,v retrieving revision 1.15 diff -u -r1.15 JTextComponent.java --- javax/swing/text/JTextComponent.java 26 Sep 2004 18:30:11 -0000 1.15 +++ javax/swing/text/JTextComponent.java 27 Sep 2004 07:47:20 -0000 @@ -557,7 +557,7 @@ public static final String DEFAULT_KEYMAP = "default"; public static final String FOCUS_ACCELERATOR_KEY = "focusAcceleratorKey"; - + private static Hashtable keymaps = new Hashtable(); private Keymap keymap; @@ -932,12 +932,12 @@ { try { - return doc.getText(getSelectionStart(), getSelectionEnd()); + return doc.getText(getSelectionStart(), getSelectionEnd()); } catch (BadLocationException e) { - // This should never happen. - return null; + // This should never happen. + return null; } } @@ -1246,18 +1246,18 @@ try { - int start = getSelectionStart(); - int end = getSelectionEnd(); - + int start = getSelectionStart(); + int end = getSelectionEnd(); + // Remove selected text. if (dot != mark) - doc.remove(start, end - start); + doc.remove(start, end - start); // Insert new text. - doc.insertString(start, content, null); + doc.insertString(start, content, null); - // Set dot to new position. - setCaretPosition(start + content.length()); + // Set dot to new position. + setCaretPosition(start + content.length()); } catch (BadLocationException e) { Index: javax/swing/text/NavigationFilter.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/NavigationFilter.java,v retrieving revision 1.2 diff -u -r1.2 NavigationFilter.java --- javax/swing/text/NavigationFilter.java 26 Sep 2004 12:16:34 -0000 1.2 +++ javax/swing/text/NavigationFilter.java 27 Sep 2004 07:47:20 -0000 @@ -58,13 +58,13 @@ } public void moveDot(NavigationFilter.FilterBypass fb, int dot, - Position.Bias bias) + Position.Bias bias) { fb.moveDot(dot, bias); } public void setDot(NavigationFilter.FilterBypass fb, int dot, - Position.Bias bias) + Position.Bias bias) { fb.setDot(dot, bias); }