Index: javax/swing/plaf/basic/BasicBorders.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicBorders.java,v
retrieving revision 1.16
diff -u -r1.16 BasicBorders.java
--- javax/swing/plaf/basic/BasicBorders.java 6 Jul 2005 20:55:54 -0000 1.16
+++ javax/swing/plaf/basic/BasicBorders.java 18 Oct 2005 22:06:04 -0000
@@ -806,9 +806,9 @@
*/
public MarginBorder()
{
+ // Nothing to do here.
}
-
/**
* Measures the width of this border.
*
@@ -1313,33 +1313,32 @@
*
* @author Sascha Brawer (address@hidden)
*/
- public static class SplitPaneBorder
- implements Border, UIResource
+ public static class SplitPaneBorder implements Border, UIResource
{
/**
* Indicates that the top edge shall be not be painted
- * by address@hidden #paintRect(java.awt.Graphics, int, int, int, int, int)}.
+ * by address@hidden #paintRect}.
*/
private static final int SUPPRESS_TOP = 1;
/**
* Indicates that the left edge shall be not be painted
- * by address@hidden #paintRect(java.awt.Graphics, int, int, int, int, int)}.
+ * by address@hidden #paintRect}.
*/
private static final int SUPPRESS_LEFT = 2;
/**
* Indicates that the bottom edge shall be not be painted
- * by address@hidden #paintRect(java.awt.Graphics, int, int, int, int, int)}.
+ * by address@hidden #paintRect}.
*/
private static final int SUPPRESS_BOTTOM = 4;
/**
* Indicates that the right edge shall be not be painted
- * by address@hidden #paintRect(java.awt.Graphics, int, int, int, int, int)}.
+ * by address@hidden #paintRect}.
*/
private static final int SUPPRESS_RIGHT = 8;
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.11
diff -u -r1.11 BasicButtonListener.java
--- javax/swing/plaf/basic/BasicButtonListener.java 2 Jul 2005 20:32:50 -0000 1.11
+++ javax/swing/plaf/basic/BasicButtonListener.java 18 Oct 2005 22:06:04 -0000
@@ -55,9 +55,8 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-public class BasicButtonListener
- implements MouseListener, MouseMotionListener, FocusListener,
- ChangeListener, PropertyChangeListener
+public class BasicButtonListener implements MouseListener, MouseMotionListener,
+ FocusListener, ChangeListener, PropertyChangeListener
{
public BasicButtonListener(AbstractButton b)
{
@@ -66,10 +65,12 @@
public void propertyChange(PropertyChangeEvent e)
{
+ // TODO: What should be done here, if anything?
}
protected void checkOpacity(AbstractButton b)
{
+ // TODO: What should be done here?
}
public void focusGained(FocusEvent e)
@@ -129,18 +130,22 @@
public void stateChanged(ChangeEvent e)
{
+ // TODO: What should be done here, if anything?
}
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
public void mouseDragged(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
public void mouseClicked(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
Index: javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,v
retrieving revision 1.10
diff -u -r1.10 BasicCheckBoxMenuItemUI.java
--- javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 12 Oct 2005 12:09:59 -0000 1.10
+++ javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java 18 Oct 2005 22:06:04 -0000
@@ -98,5 +98,6 @@
MenuElement[] path,
MenuSelectionManager manager)
{
+ // TODO: What should be done here?
}
}
Index: javax/swing/plaf/basic/BasicComboBoxEditor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java,v
retrieving revision 1.6
diff -u -r1.6 BasicComboBoxEditor.java
--- javax/swing/plaf/basic/BasicComboBoxEditor.java 28 Jul 2005 19:37:54 -0000 1.6
+++ javax/swing/plaf/basic/BasicComboBoxEditor.java 18 Oct 2005 22:06:04 -0000
@@ -168,6 +168,7 @@
*/
public UIResource()
{
+ // Nothing to do here.
}
}
}
Index: javax/swing/plaf/basic/BasicComboBoxRenderer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java,v
retrieving revision 1.7
diff -u -r1.7 BasicComboBoxRenderer.java
--- javax/swing/plaf/basic/BasicComboBoxRenderer.java 18 Sep 2005 15:50:52 -0000 1.7
+++ javax/swing/plaf/basic/BasicComboBoxRenderer.java 18 Oct 2005 22:06:04 -0000
@@ -156,6 +156,7 @@
*/
public UIResource()
{
+ // Nothing to do here.
}
}
}
Index: javax/swing/plaf/basic/BasicDesktopIconUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicDesktopIconUI.java
--- javax/swing/plaf/basic/BasicDesktopIconUI.java 2 Jul 2005 20:32:50 -0000 1.4
+++ javax/swing/plaf/basic/BasicDesktopIconUI.java 18 Oct 2005 22:06:04 -0000
@@ -365,6 +365,7 @@
*/
public BasicDesktopIconUI()
{
+ // Nothing to do here.
}
/**
@@ -585,6 +586,7 @@
}
catch (PropertyVetoException pve)
{
+ // We do nothing if the attempt has been vetoed.
}
}
}
Index: javax/swing/plaf/basic/BasicDesktopPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java,v
retrieving revision 1.8
diff -u -r1.8 BasicDesktopPaneUI.java
--- javax/swing/plaf/basic/BasicDesktopPaneUI.java 12 Oct 2005 12:09:59 -0000 1.8
+++ javax/swing/plaf/basic/BasicDesktopPaneUI.java 18 Oct 2005 22:06:04 -0000
@@ -75,13 +75,14 @@
{
if (desktop.getSelectedFrame() != null)
{
- try
- {
- desktop.getSelectedFrame().setClosed(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ desktop.getSelectedFrame().setClosed(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempts has been vetoed.
+ }
}
}
@@ -113,13 +114,14 @@
{
if (desktop.getSelectedFrame() != null)
{
- try
- {
- desktop.getSelectedFrame().setMaximum(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ desktop.getSelectedFrame().setMaximum(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempts has been vetoed.
+ }
}
}
@@ -151,13 +153,14 @@
{
if (desktop.getSelectedFrame() != null)
{
- try
- {
- desktop.getSelectedFrame().setIcon(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ desktop.getSelectedFrame().setIcon(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempt has been vetoed.
+ }
}
}
@@ -237,16 +240,17 @@
JInternalFrame frame = desktop.getSelectedFrame();
if (frame != null)
{
- try
- {
- if (frame.isIcon())
- frame.setIcon(false);
- else if (frame.isMaximum())
- frame.setMaximum(false);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ if (frame.isIcon())
+ frame.setIcon(false);
+ else if (frame.isMaximum())
+ frame.setMaximum(false);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempt has been vetoed.
+ }
}
}
@@ -305,6 +309,7 @@
*/
public BasicDesktopPaneUI()
{
+ // Nothing to do here.
}
/**
Index: javax/swing/plaf/basic/BasicFileChooserUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,v
retrieving revision 1.14
diff -u -r1.14 BasicFileChooserUI.java
--- javax/swing/plaf/basic/BasicFileChooserUI.java 12 Oct 2005 19:46:08 -0000 1.14
+++ javax/swing/plaf/basic/BasicFileChooserUI.java 18 Oct 2005 22:06:06 -0000
@@ -106,6 +106,7 @@
*/
public AcceptAllFileFilter()
{
+ // Nothing to do here.
}
/**
@@ -144,6 +145,7 @@
*/
protected ApproveSelectionAction()
{
+ // Nothing to do here.
}
/**
@@ -184,6 +186,7 @@
*/
public BasicFileView()
{
+ // Nothing to do here.
}
/**
@@ -305,6 +308,7 @@
*/
protected CancelSelectionAction()
{
+ // Nothing to do here.
}
/**
@@ -332,6 +336,7 @@
*/
protected ChangeToParentDirectoryAction()
{
+ // Nothing to do here.
}
/**
@@ -449,6 +454,7 @@
*/
protected GoHomeAction()
{
+ // Nothing to do here.
}
/**
@@ -478,6 +484,7 @@
*/
protected NewFolderAction()
{
+ // Nothing to do here.
}
/**
@@ -513,6 +520,7 @@
*/
protected SelectionListener()
{
+ // Nothing to do here.
}
/**
@@ -545,6 +553,7 @@
*/
protected UpdateAction()
{
+ // Nothing to do here.
}
/**
Index: javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java,v
retrieving revision 1.3
diff -u -r1.3 BasicFormattedTextFieldUI.java
--- javax/swing/plaf/basic/BasicFormattedTextFieldUI.java 14 Sep 2005 07:58:07 -0000 1.3
+++ javax/swing/plaf/basic/BasicFormattedTextFieldUI.java 18 Oct 2005 22:06:06 -0000
@@ -49,6 +49,7 @@
{
public BasicFormattedTextFieldUI()
{
+ // Nothing to do here.
}
public static ComponentUI createUI(JComponent c)
Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.16
diff -u -r1.16 BasicGraphicsUtils.java
--- javax/swing/plaf/basic/BasicGraphicsUtils.java 5 Aug 2005 12:28:04 -0000 1.16
+++ javax/swing/plaf/basic/BasicGraphicsUtils.java 18 Oct 2005 22:06:06 -0000
@@ -71,6 +71,7 @@
*/
public BasicGraphicsUtils()
{
+ // Nothing to do here.
}
Index: javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java,v
retrieving revision 1.15
diff -u -r1.15 BasicInternalFrameTitlePane.java
--- javax/swing/plaf/basic/BasicInternalFrameTitlePane.java 15 Sep 2005 20:24:14 -0000 1.15
+++ javax/swing/plaf/basic/BasicInternalFrameTitlePane.java 18 Oct 2005 22:06:06 -0000
@@ -100,13 +100,14 @@
{
if (frame.isClosable())
{
- try
- {
- frame.setClosed(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ frame.setClosed(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempt has been vetoed.
+ }
}
}
}
@@ -138,13 +139,14 @@
{
if (frame.isIconifiable() && ! frame.isIcon())
{
- try
- {
- frame.setIcon(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ frame.setIcon(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempt has been vetoed.
+ }
}
}
}
@@ -175,13 +177,14 @@
{
try
{
- if (frame.isMaximizable() && ! frame.isMaximum())
- frame.setMaximum(true);
- else if (frame.isMaximum())
- frame.setMaximum(false);
+ if (frame.isMaximizable() && ! frame.isMaximum())
+ frame.setMaximum(true);
+ else if (frame.isMaximum())
+ frame.setMaximum(false);
}
catch (PropertyVetoException pve)
{
+ // We do nothing if the attempt has been vetoed.
}
}
}
@@ -240,13 +243,14 @@
{
if (frame.isMaximum())
{
- try
- {
- frame.setMaximum(false);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ frame.setMaximum(false);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if the attempt has been vetoed.
+ }
}
}
}
@@ -481,6 +485,7 @@
*/
public void removeLayoutComponent(Component c)
{
+ // Nothing to do here.
}
}
Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.21
diff -u -r1.21 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java 12 Oct 2005 12:09:59 -0000 1.21
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java 18 Oct 2005 22:06:06 -0000
@@ -445,6 +445,7 @@
*/
public void addLayoutComponent(String name, Component c)
{
+ // Nothing to do here.
}
/**
@@ -634,6 +635,7 @@
*/
public void removeLayoutComponent(Component c)
{
+ // Nothing to do here.
}
}
@@ -1135,6 +1137,7 @@
*/
public BasicInternalFrameUI(JInternalFrame b)
{
+ // Nothing to do here.
}
/**
Index: javax/swing/plaf/basic/BasicLabelUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.19
diff -u -r1.19 BasicLabelUI.java
--- javax/swing/plaf/basic/BasicLabelUI.java 12 Oct 2005 12:09:59 -0000 1.19
+++ javax/swing/plaf/basic/BasicLabelUI.java 18 Oct 2005 22:06:07 -0000
@@ -59,9 +59,7 @@
* This is the Basic Look and Feel class for the JLabel. One BasicLabelUI
* object is used to paint all JLabels that utilize the Basic Look and Feel.
*/
-public class BasicLabelUI
- extends LabelUI
- implements PropertyChangeListener
+public class BasicLabelUI extends LabelUI implements PropertyChangeListener
{
/** The labelUI that is shared by all labels. */
protected static BasicLabelUI labelUI;
@@ -413,8 +411,6 @@
*/
public void propertyChange(PropertyChangeEvent e)
{
- JLabel c = (JLabel) e.getSource();
- c.revalidate();
- c.repaint();
+ // What to do here?
}
}
Index: javax/swing/plaf/basic/BasicListUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicListUI.java,v
retrieving revision 1.34
diff -u -r1.34 BasicListUI.java
--- javax/swing/plaf/basic/BasicListUI.java 18 Oct 2005 17:48:03 -0000 1.34
+++ javax/swing/plaf/basic/BasicListUI.java 18 Oct 2005 22:06:07 -0000
@@ -134,6 +134,7 @@
*/
protected void repaintCellFocus()
{
+ // TODO: Implement this properly.
}
}
@@ -190,6 +191,7 @@
*/
public void valueChanged(ListSelectionEvent e)
{
+ // TODO: Implement this properly.
}
}
@@ -476,6 +478,7 @@
*/
public void mousePressed(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -486,6 +489,7 @@
*/
public void mouseReleased(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -496,6 +500,7 @@
*/
public void mouseEntered(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -506,6 +511,7 @@
*/
public void mouseExited(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -516,6 +522,7 @@
*/
public void mouseDragged(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -526,6 +533,7 @@
*/
public void mouseMoved(MouseEvent event)
{
+ // TODO: What should be done here, if anything?
}
}
@@ -995,6 +1003,7 @@
*/
protected void uninstallKeyboardActions()
{
+ // TODO: Implement this properly.
}
/**
Index: javax/swing/plaf/basic/BasicMenuBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java,v
retrieving revision 1.13
diff -u -r1.13 BasicMenuBarUI.java
--- javax/swing/plaf/basic/BasicMenuBarUI.java 12 Oct 2005 12:09:59 -0000 1.13
+++ javax/swing/plaf/basic/BasicMenuBarUI.java 18 Oct 2005 22:06:07 -0000
@@ -256,6 +256,7 @@
{
public void stateChanged(ChangeEvent event)
{
+ // TODO: What should be done here, if anything?
}
}
@@ -334,6 +335,7 @@
*/
public void mousePressed(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -343,6 +345,7 @@
*/
public void mouseReleased(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -352,6 +355,7 @@
*/
public void mouseExited(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -361,6 +365,7 @@
*/
public void mouseDragged(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -370,6 +375,7 @@
*/
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -379,6 +385,7 @@
*/
public void mouseEntered(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
}
}
Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.29
diff -u -r1.29 BasicMenuItemUI.java
--- javax/swing/plaf/basic/BasicMenuItemUI.java 12 Oct 2005 12:09:59 -0000 1.29
+++ javax/swing/plaf/basic/BasicMenuItemUI.java 18 Oct 2005 22:06:07 -0000
@@ -834,6 +834,7 @@
*/
protected MouseInputHandler()
{
+ // Nothing to do here.
}
/**
@@ -979,11 +980,11 @@
* Tbis method is invoked when mouse exits the menu item while it is being
* dragged
*
- * @param e
- * The MenuDragMouseEvent
+ * @param e the MenuDragMouseEvent
*/
public void menuDragMouseExited(MenuDragMouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -1019,6 +1020,7 @@
*/
public void menuKeyPressed(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -1029,6 +1031,7 @@
*/
public void menuKeyReleased(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -1040,6 +1043,7 @@
*/
public void menuKeyTyped(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
}
Index: javax/swing/plaf/basic/BasicMenuUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuUI.java,v
retrieving revision 1.17
diff -u -r1.17 BasicMenuUI.java
--- javax/swing/plaf/basic/BasicMenuUI.java 12 Oct 2005 12:09:59 -0000 1.17
+++ javax/swing/plaf/basic/BasicMenuUI.java 18 Oct 2005 22:06:08 -0000
@@ -244,6 +244,7 @@
protected void setupPostTimer(JMenu menu)
{
+ // TODO: Implement this properly.
}
/**
@@ -355,6 +356,7 @@
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
public void mousePressed(MouseEvent e)
@@ -455,6 +457,7 @@
*/
public void propertyChange(PropertyChangeEvent e)
{
+ // TODO: Implement this properly.
}
}
@@ -536,6 +539,7 @@
*/
public void menuDragMouseExited(MenuDragMouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -546,6 +550,7 @@
*/
public void menuDragMouseReleased(MenuDragMouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
}
@@ -562,6 +567,7 @@
*/
public void menuKeyPressed(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -571,6 +577,7 @@
*/
public void menuKeyReleased(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -581,6 +588,7 @@
*/
public void menuKeyTyped(MenuKeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
}
}
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.26
diff -u -r1.26 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java 12 Oct 2005 12:10:00 -0000 1.26
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java 18 Oct 2005 22:06:09 -0000
@@ -141,13 +141,14 @@
optionPane);
if (inf != null)
{
- try
- {
- inf.setClosed(true);
- }
- catch (PropertyVetoException pve)
- {
- }
+ try
+ {
+ inf.setClosed(true);
+ }
+ catch (PropertyVetoException pve)
+ {
+ // We do nothing if attempt has been vetoed.
+ }
}
}
}
@@ -526,6 +527,7 @@
*/
public void paintIcon(Component c, Graphics g, int x, int y)
{
+ // Nothing to do here.
}
}
@@ -645,6 +647,7 @@
*/
public BasicOptionPaneUI()
{
+ // Nothing to do here.
}
/**
Index: javax/swing/plaf/basic/BasicPasswordFieldUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicPasswordFieldUI.java
--- javax/swing/plaf/basic/BasicPasswordFieldUI.java 14 Sep 2005 07:58:07 -0000 1.4
+++ javax/swing/plaf/basic/BasicPasswordFieldUI.java 18 Oct 2005 22:06:09 -0000
@@ -49,6 +49,7 @@
{
public BasicPasswordFieldUI()
{
+ // Nothing to do here.
}
public View create(Element elem)
Index: javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,v
retrieving revision 1.9
diff -u -r1.9 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 31 Aug 2005 15:23:10 -0000 1.9
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java 18 Oct 2005 22:06:09 -0000
@@ -98,5 +98,6 @@
MenuElement[] path,
MenuSelectionManager manager)
{
+ // TODO: Implement this properly.
}
}
Index: javax/swing/plaf/basic/BasicRootPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,v
retrieving revision 1.9
diff -u -r1.9 BasicRootPaneUI.java
--- javax/swing/plaf/basic/BasicRootPaneUI.java 6 Oct 2005 13:53:26 -0000 1.9
+++ javax/swing/plaf/basic/BasicRootPaneUI.java 18 Oct 2005 22:06:09 -0000
@@ -116,6 +116,7 @@
public void propertyChange(PropertyChangeEvent event)
{
+ // TODO: Implement this properly.
}
/**
Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.17
diff -u -r1.17 BasicScrollPaneUI.java
--- javax/swing/plaf/basic/BasicScrollPaneUI.java 12 Oct 2005 12:10:00 -0000 1.17
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java 18 Oct 2005 22:06:09 -0000
@@ -215,6 +215,7 @@
*/
public void mouseWheelMoved(MouseWheelEvent event)
{
+ // TODO: Implement this properly.
}
}
Index: javax/swing/plaf/basic/BasicSplitPaneDivider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java,v
retrieving revision 1.10
diff -u -r1.10 BasicSplitPaneDivider.java
--- javax/swing/plaf/basic/BasicSplitPaneDivider.java 8 Jul 2005 15:24:08 -0000 1.10
+++ javax/swing/plaf/basic/BasicSplitPaneDivider.java 18 Oct 2005 22:06:09 -0000
@@ -802,6 +802,7 @@
*/
protected DividerLayout()
{
+ // Nothing to do here.
}
/**
Index: javax/swing/plaf/basic/BasicSplitPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,v
retrieving revision 1.19
diff -u -r1.19 BasicSplitPaneUI.java
--- javax/swing/plaf/basic/BasicSplitPaneUI.java 17 Oct 2005 19:49:24 -0000 1.19
+++ javax/swing/plaf/basic/BasicSplitPaneUI.java 18 Oct 2005 22:06:09 -0000
@@ -938,6 +938,7 @@
*/
public BasicSplitPaneUI()
{
+ // Nothing to do here.
}
/**
@@ -1410,6 +1411,7 @@
*/
public void paint(Graphics g, JComponent jc)
{
+ // TODO: What should be done here?
}
/**
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.28
diff -u -r1.28 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java 12 Oct 2005 12:10:00 -0000 1.28
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java 18 Oct 2005 22:06:11 -0000
@@ -1181,6 +1181,7 @@
*/
private class ScrollingViewport extends JViewport implements UIResource
{
+ // TODO: Maybe remove this inner class.
}
/**
Index: javax/swing/plaf/basic/BasicTableHeaderUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,v
retrieving revision 1.10
diff -u -r1.10 BasicTableHeaderUI.java
--- javax/swing/plaf/basic/BasicTableHeaderUI.java 13 Oct 2005 19:30:10 -0000 1.10
+++ javax/swing/plaf/basic/BasicTableHeaderUI.java 18 Oct 2005 22:06:11 -0000
@@ -57,8 +57,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
-public class BasicTableHeaderUI
- extends TableHeaderUI
+public class BasicTableHeaderUI extends TableHeaderUI
{
public static ComponentUI createUI(JComponent h)
@@ -73,13 +72,40 @@
public class MouseInputHandler implements MouseInputListener
{
- public void mouseClicked(MouseEvent e) {}
- public void mouseDragged(MouseEvent e) {}
- public void mouseEntered(MouseEvent e) {}
- public void mouseExited(MouseEvent e) {}
- public void mouseMoved(MouseEvent e) {}
- public void mousePressed(MouseEvent e) {}
- public void mouseReleased(MouseEvent e) {}
+ public void mouseClicked(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mouseDragged(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mouseEntered(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mouseExited(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mouseMoved(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mousePressed(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
+
+ public void mouseReleased(MouseEvent e)
+ {
+ // TODO: Implement this properly.
+ }
}
protected MouseInputListener createMouseInputListener()
@@ -102,6 +128,7 @@
protected void installKeyboardActions()
{
+ // TODO: Implement this properly.
}
protected void installListeners()
@@ -126,6 +153,7 @@
protected void uninstallKeyboardActions()
{
+ // TODO: Implement this properly.
}
protected void uninstallListeners()
Index: javax/swing/plaf/basic/BasicTableUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTableUI.java,v
retrieving revision 1.32
diff -u -r1.32 BasicTableUI.java
--- javax/swing/plaf/basic/BasicTableUI.java 18 Oct 2005 17:48:03 -0000 1.32
+++ javax/swing/plaf/basic/BasicTableUI.java 18 Oct 2005 22:06:12 -0000
@@ -148,9 +148,12 @@
{
public void focusGained(FocusEvent e)
{
+ // TODO: Implement this properly.
}
+
public void focusLost(FocusEvent e)
{
+ // TODO: Implement this properly.
}
}
@@ -190,21 +193,30 @@
public void mouseClicked(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
+
public void mouseDragged(MouseEvent e)
{
curr = new Point(e.getX(), e.getY());
updateSelection(e.isControlDown());
}
+
public void mouseEntered(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
+
public void mouseExited(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
+
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
+
public void mousePressed(MouseEvent e)
{
ListSelectionModel rowModel = table.getSelectionModel();
@@ -1109,6 +1121,7 @@
protected void uninstallKeyboardActions()
{
+ // TODO: Implement this properly.
}
protected void uninstallListeners()
Index: javax/swing/plaf/basic/BasicTextAreaUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicTextAreaUI.java
--- javax/swing/plaf/basic/BasicTextAreaUI.java 14 Sep 2005 07:58:07 -0000 1.4
+++ javax/swing/plaf/basic/BasicTextAreaUI.java 18 Oct 2005 22:06:12 -0000
@@ -55,6 +55,7 @@
public BasicTextAreaUI()
{
+ // Nothing to do here.
}
public View create(Element elem)
Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.47
diff -u -r1.47 BasicTextUI.java
--- javax/swing/plaf/basic/BasicTextUI.java 18 Oct 2005 15:15:47 -0000 1.47
+++ javax/swing/plaf/basic/BasicTextUI.java 18 Oct 2005 22:06:12 -0000
@@ -93,11 +93,11 @@
/**
* A address@hidden DefaultCaret} that implements address@hidden UIResource}.
*/
- public static class BasicCaret extends DefaultCaret
- implements UIResource
+ public static class BasicCaret extends DefaultCaret implements UIResource
{
public BasicCaret()
{
+ // Nothing to do here.
}
}
@@ -109,6 +109,7 @@
{
public BasicHighlighter()
{
+ // Nothing to do here.
}
}
@@ -253,10 +254,10 @@
*
* This is delegated to the real root view.
*
- * @param pos the position of the character in the model
+ * @param position the position of the character in the model
* @param a the area that is occupied by the view
- * @param bias either address@hidden Position.Bias.Forward} or
- * address@hidden Position.Bias.Backward} depending on the preferred
+ * @param bias either address@hidden Position.Bias#Forward} or
+ * address@hidden Position.Bias#Backward} depending on the preferred
* direction bias. If null this defaults to
* Position.Bias.Forward
*
@@ -435,6 +436,7 @@
*/
public BasicTextUI()
{
+ // Nothing to do here.
}
/**
@@ -809,8 +811,8 @@
{
// This method does nothing. All the background filling is done by the
// ComponentUI update method. However, the method is called by paint
- // to provide a way for subclasses to draw something different (e.g. background
- // images etc) on the background.
+ // to provide a way for subclasses to draw something different (e.g.
+ // background images etc) on the background.
}
/**
@@ -897,10 +899,10 @@
/**
* Maps a position in the document into the coordinate space of the View.
* The output rectangle usually reflects the font height but has a width
- * of zero. A bias of address@hidden Position.Bias.Forward} is used in this method.
+ * of zero. A bias of address@hidden Position.Bias#Forward} is used in this method.
*
+ * @param t the text component
* @param pos the position of the character in the model
- * @param a the area that is occupied by the view
*
* @return a rectangle that gives the location of the document position
* inside the view coordinate space
@@ -920,10 +922,10 @@
* The output rectangle usually reflects the font height but has a width
* of zero.
*
+ * @param t the text component
* @param pos the position of the character in the model
- * @param a the area that is occupied by the view
- * @param bias either address@hidden Position.Bias.Forward} or
- * address@hidden Position.Bias.Backward} depending on the preferred
+ * @param bias either address@hidden Position.Bias#Forward} or
+ * address@hidden Position.Bias#Backward} depending on the preferred
* direction bias. If null this defaults to
* Position.Bias.Forward
*
Index: javax/swing/plaf/basic/BasicToolBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToolBarUI.java,v
retrieving revision 1.15
diff -u -r1.15 BasicToolBarUI.java
--- javax/swing/plaf/basic/BasicToolBarUI.java 12 Oct 2005 12:10:00 -0000 1.15
+++ javax/swing/plaf/basic/BasicToolBarUI.java 18 Oct 2005 22:06:13 -0000
@@ -1016,6 +1016,7 @@
*/
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
Index: javax/swing/plaf/basic/BasicToolTipUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToolTipUI.java,v
retrieving revision 1.10
diff -u -r1.10 BasicToolTipUI.java
--- javax/swing/plaf/basic/BasicToolTipUI.java 12 Oct 2005 12:10:00 -0000 1.10
+++ javax/swing/plaf/basic/BasicToolTipUI.java 18 Oct 2005 22:06:13 -0000
@@ -160,6 +160,7 @@
*/
protected void installListeners(JComponent c)
{
+ // TODO: Implement this properly.
}
/**
@@ -228,6 +229,7 @@
*/
protected void uninstallListeners(JComponent c)
{
+ // TODO: Implement this properly.
}
/**
Index: javax/swing/plaf/basic/BasicTreeUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v
retrieving revision 1.102
diff -u -r1.102 BasicTreeUI.java
--- javax/swing/plaf/basic/BasicTreeUI.java 18 Oct 2005 17:46:37 -0000 1.102
+++ javax/swing/plaf/basic/BasicTreeUI.java 18 Oct 2005 22:06:13 -0000
@@ -112,11 +112,11 @@
* the Basic look and feel.
*
* @see javax.swing.JTree
- * @author Sascha Brawer (address@hidden)
+ *
* @author Lillian Angel (address@hidden)
+ * @author Sascha Brawer (address@hidden)
*/
-public class BasicTreeUI
- extends TreeUI
+public class BasicTreeUI extends TreeUI
{
/** Collapse Icon for the tree. */
protected transient Icon collapsedIcon;
@@ -255,7 +255,7 @@
private KeyListener keyListener;
private PropertyChangeListener selectionModelPropertyChangeListener;
private ComponentListener componentListener;
- private CellEditorListener cellEditorListener;
+ CellEditorListener cellEditorListener;
private TreeExpansionListener treeExpansionListener;
private TreeModelListener treeModelListener;
@@ -810,6 +810,7 @@
*/
protected void prepareForUIInstall()
{
+ // TODO: Implement this properly.
}
/**
@@ -818,6 +819,7 @@
*/
protected void completeUIInstall()
{
+ // TODO: Implement this properly.
}
/**
@@ -826,6 +828,7 @@
*/
protected void completeUIUninstall()
{
+ // TODO: Implement this properly.
}
/**
@@ -1034,6 +1037,7 @@
*/
protected void uninstallKeyboardActions()
{
+ // TODO: Implement this properly.
}
/**
@@ -1959,8 +1963,7 @@
/**
* Updates the preferred size when scrolling, if necessary.
*/
- public class ComponentHandler
- extends ComponentAdapter
+ public class ComponentHandler extends ComponentAdapter
implements ActionListener
{
/**
@@ -1976,6 +1979,7 @@
*/
public ComponentHandler()
{
+ // Nothing to do here.
}
/**
@@ -1986,6 +1990,7 @@
*/
public void componentMoved(ComponentEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -1994,6 +1999,7 @@
*/
protected void startTimer()
{
+ // TODO: Implement this properly.
}
/**
@@ -2015,21 +2021,22 @@
*/
public void actionPerformed(ActionEvent ae)
{
+ // TODO: Implement this properly.
}
- }// ComponentHandler
+ }
/**
* Listener responsible for getting cell editing events and updating the tree
* accordingly.
*/
- public class CellEditorHandler
- implements CellEditorListener
+ public class CellEditorHandler implements CellEditorListener
{
/**
* Constructor
*/
public CellEditorHandler()
{
+ // Nothing to do here.
}
/**
@@ -2110,6 +2117,7 @@
*/
public FocusHandler()
{
+ // Nothing to do here.
}
/**
@@ -2121,6 +2129,7 @@
*/
public void focusGained(FocusEvent e)
{
+ // TODO: Implement this properly.
}
/**
@@ -2132,8 +2141,9 @@
*/
public void focusLost(FocusEvent e)
{
+ // TODO: Implement this properly.
}
- }// FocusHandler
+ }
/**
* This is used to get multiple key down events to appropriately genereate
@@ -2153,6 +2163,7 @@
*/
public KeyHandler()
{
+ // Nothing to do here.
}
/**
@@ -2166,6 +2177,7 @@
*/
public void keyTyped(KeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2176,6 +2188,7 @@
*/
public void keyPressed(KeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2186,22 +2199,22 @@
*/
public void keyReleased(KeyEvent e)
{
+ // TODO: What should be done here, if anything?
}
- }// KeyHandler
+ }
/**
* MouseListener is responsible for updating the selection based on mouse
* events.
*/
- public class MouseHandler
- extends MouseAdapter
- implements MouseMotionListener
+ public class MouseHandler extends MouseAdapter implements MouseMotionListener
{
/**
* Constructor
*/
public MouseHandler()
{
+ // Nothing to do here.
}
/**
@@ -2212,6 +2225,7 @@
*/
public void mousePressed(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2225,6 +2239,7 @@
*/
public void mouseDragged(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2236,6 +2251,7 @@
*/
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2246,16 +2262,16 @@
*/
public void mouseReleased(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
- }// MouseHandler
+ }
/**
* MouseInputHandler handles passing all mouse events, including mouse motion
* events, until the mouse is released to the destination it is constructed
* with.
*/
- public class MouseInputHandler
- implements MouseInputListener
+ public class MouseInputHandler implements MouseInputListener
{
/** Source that events are coming from */
protected Component source;
@@ -2276,6 +2292,8 @@
public MouseInputHandler(Component source, Component destination,
MouseEvent e)
{
+ this.source = source;
+ this.destination = destination;
}
/**
@@ -2287,6 +2305,7 @@
*/
public void mouseClicked(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2355,6 +2374,7 @@
*/
public void mouseReleased(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2365,6 +2385,7 @@
*/
public void mouseEntered(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2375,6 +2396,7 @@
*/
public void mouseExited(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2388,6 +2410,7 @@
*/
public void mouseDragged(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2399,6 +2422,7 @@
*/
public void mouseMoved(MouseEvent e)
{
+ // TODO: What should be done here, if anything?
}
/**
@@ -2406,8 +2430,9 @@
*/
protected void removeFromSource()
{
+ // TODO: Implement this properly.
}
- }// MouseInputHandler
+ }
/**
* Class responsible for getting size of node, method is forwarded to
@@ -2422,6 +2447,7 @@
*/
public NodeDimensionsHandler()
{
+ // Nothing to do here.
}
/**
@@ -2469,6 +2495,7 @@
*/
public PropertyChangeHandler()
{
+ // Nothing to do here.
}
/**
@@ -2480,8 +2507,9 @@
*/
public void propertyChange(PropertyChangeEvent event)
{
+ // TODO: What should be done here, if anything?
}
- }// PropertyChangeHandler
+ }
/**
* Listener on the TreeSelectionModel, resets the row selection if any of the
@@ -2496,6 +2524,7 @@
*/
public SelectionModelPropertyChangeHandler()
{
+ // Nothing to do here.
}
/**
@@ -2507,8 +2536,9 @@
*/
public void propertyChange(PropertyChangeEvent event)
{
+ // TODO: What should be done here, if anything?
}
- }// SelectionModelPropertyChangeHandler
+ }
/**
* ActionListener that invokes cancelEditing when action performed.
@@ -2522,6 +2552,7 @@
*/
public TreeCancelEditingAction(String name)
{
+ // TODO: Implement this properly.
}
/**
@@ -2532,6 +2563,7 @@
*/
public void actionPerformed(ActionEvent e)
{
+ // TODO: Implement this properly.
}
/**
@@ -2541,9 +2573,10 @@
*/
public boolean isEnabled()
{
+ // TODO: Implement this properly.
return false;
}
- }// TreeCancelEditingAction
+ }
/**
* Updates the TreeState in response to nodes expanding/collapsing.
@@ -2557,6 +2590,7 @@
*/
public TreeExpansionHandler()
{
+ // Nothing to do here.
}
/**
@@ -2609,6 +2643,7 @@
*/
public TreeHomeAction(int direction, String name)
{
+ // TODO: Implement this properly
}
/**
@@ -2619,6 +2654,7 @@
*/
public void actionPerformed(ActionEvent e)
{
+ // TODO: Implement this properly
}
/**
@@ -2628,9 +2664,10 @@
*/
public boolean isEnabled()
{
+ // TODO: Implement this properly
return false;
}
- }// TreeHomeAction
+ }
/**
* TreeIncrementAction is used to handle up/down actions. Selection is moved
@@ -2653,6 +2690,7 @@
*/
public TreeIncrementAction(int direction, String name)
{
+ // TODO: Implement this properly
}
/**
@@ -2733,21 +2771,22 @@
*/
public boolean isEnabled()
{
+ // TODO: Implement this properly
return false;
}
- }// TreeIncrementAction
+ }
/**
* Forwards all TreeModel events to the TreeState.
*/
- public class TreeModelHandler
- implements TreeModelListener
+ public class TreeModelHandler implements TreeModelListener
{
/**
* Constructor
*/
public TreeModelHandler()
{
+ // Nothing to do here.
}
/**
@@ -2828,8 +2867,7 @@
/**
* TreePageAction handles page up and page down events.
*/
- public class TreePageAction
- extends AbstractAction
+ public class TreePageAction extends AbstractAction
{
/** Specifies the direction to adjust the selection by. */
protected int direction;
@@ -2844,6 +2882,7 @@
*/
public TreePageAction(int direction, String name)
{
+ this.direction = direction;
}
/**
@@ -2854,6 +2893,7 @@
*/
public void actionPerformed(ActionEvent e)
{
+ // TODO: Implement this properly.
}
/**
@@ -2871,14 +2911,14 @@
* Listens for changes in the selection model and updates the display
* accordingly.
*/
- public class TreeSelectionHandler
- implements TreeSelectionListener
+ public class TreeSelectionHandler implements TreeSelectionListener
{
/**
* Constructor
*/
public TreeSelectionHandler()
{
+ // Nothing to do here.
}
/**
@@ -2898,8 +2938,7 @@
/**
* For the first selected row expandedness will be toggled.
*/
- public class TreeToggleAction
- extends AbstractAction
+ public class TreeToggleAction extends AbstractAction
{
/**
* Constructor
@@ -2909,6 +2948,7 @@
*/
public TreeToggleAction(String name)
{
+ // Nothing to do here.
}
/**
@@ -2919,6 +2959,7 @@
*/
public void actionPerformed(ActionEvent e)
{
+ // TODO: Implement this properly.
}
/**
@@ -2936,8 +2977,7 @@
* TreeTraverseAction is the action used for left/right keys. Will toggle the
* expandedness of a node, as well as potentially incrementing the selection.
*/
- public class TreeTraverseAction
- extends AbstractAction
+ public class TreeTraverseAction extends AbstractAction
{
/**
* Determines direction to traverse, 1 means expand, -1 means collapse.
@@ -2954,6 +2994,7 @@
*/
public TreeTraverseAction(int direction, String name)
{
+ this.direction = direction;
}
/**
@@ -2999,9 +3040,10 @@
*/
public boolean isEnabled()
{
+ // TODO: Implement this properly
return false;
}
- } // TreeTraverseAction
+ }
/**
* Returns the cell bounds for painting selected cells Package private for use
@@ -3165,8 +3207,6 @@
* of the current object
* @param descent
* is the number of elements drawn
- * @param childNumber
- * is the index of the current child in the tree
* @param depth
* is the depth of the current object in the tree
* @param tree
@@ -3178,62 +3218,62 @@
* @return int current descent of the tree
*/
int paintControlIcons(Graphics g, int indentation, int descent,
- int depth, JTree tree, TreeModel mod,
- Object node)
- {
- int rowHeight = getRowHeight();
- TreePath path = new TreePath(getPathToRoot(node, 0));
- Icon icon = getCurrentControlIcon(path);
+ int depth, JTree tree, TreeModel mod,
+ Object node)
+ {
+ int rowHeight = getRowHeight();
+ TreePath path = new TreePath(getPathToRoot(node, 0));
+ Icon icon = getCurrentControlIcon(path);
- Rectangle clip = tree.getVisibleRect();
- if (indentation > clip.x + clip.width + rightChildIndent
- || descent > clip.y + clip.height + getRowHeight())
- return descent;
+ Rectangle clip = tree.getVisibleRect();
+ if (indentation > clip.x + clip.width + rightChildIndent
+ || descent > clip.y + clip.height + getRowHeight())
+ return descent;
- if (mod.isLeaf(node))
- descent += rowHeight;
- else
- {
- if (!node.equals(mod.getRoot()) &&
- (tree.isRootVisible() || getLevel(node) != 1))
- {
- int width = icon.getIconWidth();
- int height = icon.getIconHeight() + 2;
- int posX = indentation - rightChildIndent;
- int posY = descent;
- if (width > rightChildIndent)
- posX -= gap;
- else posX += width/2;
+ if (mod.isLeaf(node))
+ descent += rowHeight;
+ else
+ {
+ if (!node.equals(mod.getRoot()) &&
+ (tree.isRootVisible() || getLevel(node) != 1))
+ {
+ int width = icon.getIconWidth();
+ int height = icon.getIconHeight() + 2;
+ int posX = indentation - rightChildIndent;
+ int posY = descent;
+ if (width > rightChildIndent)
+ posX -= gap;
+ else posX += width/2;
- if (height < rowHeight)
- posY += height/2;
+ if (height < rowHeight)
+ posY += height/2;
- icon.paintIcon(tree, g, posX, posY);
- }
+ icon.paintIcon(tree, g, posX, posY);
+ }
- if (depth > 0 || tree.isRootVisible())
- descent += rowHeight;
+ if (depth > 0 || tree.isRootVisible())
+ descent += rowHeight;
- if (tree.isExpanded(path))
- {
- int max = 0;
- if (!mod.isLeaf(node))
- max = mod.getChildCount(node);
+ if (tree.isExpanded(path))
+ {
+ int max = 0;
+ if (!mod.isLeaf(node))
+ max = mod.getChildCount(node);
- for (int i = 0; i < max; i++)
- {
- int indent = indentation + rightChildIndent;
- if (depth == 0 && !tree.isRootVisible())
- indent = 1;
+ for (int i = 0; i < max; i++)
+ {
+ int indent = indentation + rightChildIndent;
+ if (depth == 0 && !tree.isRootVisible())
+ indent = 1;
- descent = paintControlIcons(g, indent, descent, depth + 1,
- tree, mod, mod.getChild(node, i));
- }
- }
- }
+ descent = paintControlIcons(g, indent, descent, depth + 1,
+ tree, mod, mod.getChild(node, i));
+ }
+ }
+ }
- return descent;
- }
+ return descent;
+ }
/**
* Returns true if the LookAndFeel implements the control icons. Package
@@ -3726,6 +3766,7 @@
*/
protected void prepareForUIUninstall()
{
+ // TODO: Implement this properly.
}
/**
Index: javax/swing/plaf/basic/BasicViewportUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicViewportUI.java,v
retrieving revision 1.19
diff -u -r1.19 BasicViewportUI.java
--- javax/swing/plaf/basic/BasicViewportUI.java 12 Oct 2005 12:10:00 -0000 1.19
+++ javax/swing/plaf/basic/BasicViewportUI.java 18 Oct 2005 22:06:13 -0000
@@ -53,6 +53,7 @@
}
protected void uninstallDefaults(JComponent c)
{
+ // TODO: Implement this properly.
}
public static ComponentUI createUI(JComponent c)