summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog43
-rw-r--r--javax/swing/plaf/basic/BasicButtonUI.java5
-rw-r--r--javax/swing/plaf/basic/BasicInternalFrameTitlePane.java2
-rw-r--r--javax/swing/plaf/basic/BasicInternalFrameUI.java8
-rw-r--r--javax/swing/plaf/basic/BasicMenuBarUI.java8
-rw-r--r--javax/swing/plaf/basic/BasicMenuUI.java26
-rw-r--r--javax/swing/plaf/basic/BasicPanelUI.java3
-rw-r--r--javax/swing/plaf/basic/BasicScrollBarUI.java2
-rw-r--r--javax/swing/plaf/basic/BasicSplitPaneUI.java10
-rw-r--r--javax/swing/plaf/basic/BasicTableHeaderUI.java2
-rw-r--r--javax/swing/plaf/basic/BasicTextUI.java1
-rw-r--r--javax/swing/plaf/basic/BasicToolBarUI.java20
12 files changed, 78 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog
index e22de2b42..1e080cc08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2006-03-13 Roman Kennke <kennke@aicas.com>
+
+ * javax/swing/plaf/basic/BasicButtonUI.java
+ (uninstallDefaults): Only uninstall border if it's a UIResource.
+ * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+ (SystemMenuBar.isFocusTraversable): Fixed typo in signature.
+ * javax/swing/plaf/basic/BasicInternalFrameUI.java
+ (installUI): Don't touch the opaque flag of the glassPane and
+ the frame. Don't invalidate.
+ * javax/swing/plaf/basic/BasicInternalFrameUI.java
+ (installUI): Don't touch the opaque flag of the glassPane.
+ * javax/swing/plaf/basic/BasicMenuBarUI.java
+ (properyChangeListener): Made field private.
+ (ChangeHandler): Made class private.
+ (ContainerHandler): Made class private.
+ (PropertyChangeHandler): Made class private.
+ * javax/swing/plaf/basic/BasicMenuUI.java
+ (MenuHandler): Made class private.
+ (PropertyChangeHandler): Removed unneeded class.
+ (MenuDragMouseHandler): Made class private.
+ (MenuKeyHandler): Made class private.
+ * javax/swing/plaf/basic/BasicPanelUI.java
+ (installDefaults): Made method protected. Don't set opaque
+ flag.
+ * javax/swing/plaf/basic/BasicScrollBarUI.java
+ (TrackListener.shouldScroll): Made method private.
+ * javax/swing/plaf/basic/BasicSplitPaneUI.java
+ (BasicHorizontalLayoutManager.BasicHorizontalLayoutManager):
+ Made constructor package private.
+ * javax/swing/plaf/basic/BasicTableHeaderUI.java
+ (cellBorder): Made field private.
+ * javax/swing/plaf/basic/BasicTextUI.java
+ (installDefaults): Don't make component opaque.
+ * javax/swing/plaf/basic/BasicToolBarUI.java
+ (createNonRollOverBorder): Don't create UIResource border.
+ (createRollOverBorder): Don't create UIResource border.
+ (installComponents): Moved setRolloverBorders call here.
+ (installDefaults): Moved setRolloverBorders call from here.
+ (installUI): Don't make toolbar opaque.
+ (setBorderToNonRollover): Handle AbstractButton instead of
+ JButton here.
+ (uninstallComponents): Don't nullify class fields here.
+
2006-03-13 David Gilbert <david.gilbert@object-refinery.com>
* javax/swing/SwingUtilities.java
diff --git a/javax/swing/plaf/basic/BasicButtonUI.java b/javax/swing/plaf/basic/BasicButtonUI.java
index 7a63331b9..ba00d73db 100644
--- a/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/javax/swing/plaf/basic/BasicButtonUI.java
@@ -173,7 +173,8 @@ public class BasicButtonUI extends ButtonUI
b.setFont(null);
b.setForeground(null);
b.setBackground(null);
- b.setBorder(null);
+ if (b.getBorder() instanceof UIResource)
+ b.setBorder(null);
b.setIconTextGap(defaultTextIconGap);
b.setMargin(null);
}
@@ -308,7 +309,7 @@ public class BasicButtonUI extends ButtonUI
* @param c The component to paint the state of
*/
public void paint(Graphics g, JComponent c)
- {
+ {
AbstractButton b = (AbstractButton) c;
Rectangle tr = new Rectangle();
diff --git a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index 56022f333..41d50bcd5 100644
--- a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -340,7 +340,7 @@ public class BasicInternalFrameTitlePane extends JComponent
*
* @return True if this Component can receive focus.
*/
- public boolean isFocusTransversable()
+ public boolean isFocusTraversable()
{
return true;
}
diff --git a/javax/swing/plaf/basic/BasicInternalFrameUI.java b/javax/swing/plaf/basic/BasicInternalFrameUI.java
index f6cbeec88..aad7f6899 100644
--- a/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -1119,12 +1119,8 @@ public class BasicInternalFrameUI extends InternalFrameUI
installComponents();
installKeyboardActions();
- ((JComponent) frame.getRootPane().getGlassPane()).setOpaque(false);
if (! frame.isSelected())
- frame.getRootPane().getGlassPane().setVisible(true);
-
- frame.setOpaque(true);
- frame.invalidate();
+ frame.getGlassPane().setVisible(true);
}
}
@@ -1140,9 +1136,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
uninstallListeners();
uninstallDefaults();
- ((JComponent) frame.getRootPane().getGlassPane()).setOpaque(true);
frame.getRootPane().getGlassPane().setVisible(false);
-
frame = null;
}
diff --git a/javax/swing/plaf/basic/BasicMenuBarUI.java b/javax/swing/plaf/basic/BasicMenuBarUI.java
index daa9b0d6b..a21514467 100644
--- a/javax/swing/plaf/basic/BasicMenuBarUI.java
+++ b/javax/swing/plaf/basic/BasicMenuBarUI.java
@@ -68,7 +68,7 @@ public class BasicMenuBarUI extends MenuBarUI
protected ContainerListener containerListener;
/*Property change listeners that listener to PropertyChangeEvent from menu bar*/
- protected PropertyChangeListener propertyChangeListener;
+ private PropertyChangeListener propertyChangeListener;
/* menu bar for which this UI delegate is for*/
protected JMenuBar menuBar;
@@ -252,7 +252,7 @@ public class BasicMenuBarUI extends MenuBarUI
menuBar = null;
}
- protected class ChangeHandler implements ChangeListener
+ private class ChangeHandler implements ChangeListener
{
public void stateChanged(ChangeEvent event)
{
@@ -264,7 +264,7 @@ public class BasicMenuBarUI extends MenuBarUI
* This class handles ContainerEvents fired by JMenuBar. It revalidates
* and repaints menu bar whenever menu is added or removed from it.
*/
- protected class ContainerHandler implements ContainerListener
+ private class ContainerHandler implements ContainerListener
{
/**
* This method is called whenever menu is added to the menu bar
@@ -292,7 +292,7 @@ public class BasicMenuBarUI extends MenuBarUI
/**
* This class handles PropertyChangeEvents fired from the JMenuBar
*/
- protected class PropertyChangeHandler implements PropertyChangeListener
+ private class PropertyChangeHandler implements PropertyChangeListener
{
/**
* This method is called whenever one of the properties of the MenuBar
diff --git a/javax/swing/plaf/basic/BasicMenuUI.java b/javax/swing/plaf/basic/BasicMenuUI.java
index e638b68e1..4fb250d24 100644
--- a/javax/swing/plaf/basic/BasicMenuUI.java
+++ b/javax/swing/plaf/basic/BasicMenuUI.java
@@ -41,7 +41,6 @@ package javax.swing.plaf.basic;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.JComponent;
@@ -391,7 +390,7 @@ public class BasicMenuUI extends BasicMenuItemUI
/**
* This class handles MenuEvents fired by the JMenu
*/
- protected class MenuHandler implements MenuListener
+ private class MenuHandler implements MenuListener
{
/**
* This method is called when menu is cancelled. The menu is cancelled
@@ -440,24 +439,7 @@ public class BasicMenuUI extends BasicMenuItemUI
}
/**
- * This class handles PropertyChangeEvents fired from the JMenu
- */
- protected class PropertyChangeHandler implements PropertyChangeListener
- {
- /**
- * This method is called whenever one of the properties of the menu item
- * changes.
- *
- * @param e The PropertyChangeEvent.
- */
- public void propertyChange(PropertyChangeEvent e)
- {
- // TODO: Implement this properly.
- }
- }
-
- /**
- * @deprecated
+ * Obsolete as of JDK1.4.
*/
public class ChangeHandler implements ChangeListener
{
@@ -501,7 +483,7 @@ public class BasicMenuUI extends BasicMenuItemUI
/**
* This class handles mouse dragged events occuring in the menu.
*/
- protected class MenuDragMouseHandler implements MenuDragMouseListener
+ private class MenuDragMouseHandler implements MenuDragMouseListener
{
/**
* This method is invoked when mouse is dragged over the menu item.
@@ -553,7 +535,7 @@ public class BasicMenuUI extends BasicMenuItemUI
* This class handles key events occuring when menu item is visible on the
* screen.
*/
- protected class MenuKeyHandler implements MenuKeyListener
+ private class MenuKeyHandler implements MenuKeyListener
{
/**
* This method is invoked when key has been pressed
diff --git a/javax/swing/plaf/basic/BasicPanelUI.java b/javax/swing/plaf/basic/BasicPanelUI.java
index 783cec473..4f535f653 100644
--- a/javax/swing/plaf/basic/BasicPanelUI.java
+++ b/javax/swing/plaf/basic/BasicPanelUI.java
@@ -61,11 +61,10 @@ public class BasicPanelUI extends PanelUI
}
}
- public void installDefaults(JPanel p)
+ protected void installDefaults(JPanel p)
{
LookAndFeel.installColorsAndFont(p, "Panel.background", "Panel.foreground",
"Panel.font");
- p.setOpaque(true);
}
/**
diff --git a/javax/swing/plaf/basic/BasicScrollBarUI.java b/javax/swing/plaf/basic/BasicScrollBarUI.java
index c8713c934..0ab2914ea 100644
--- a/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -383,7 +383,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
*
* @return Whether the thumb should keep scrolling.
*/
- public boolean shouldScroll(int direction)
+ boolean shouldScroll(int direction)
{
int value;
if (scrollbar.getOrientation() == HORIZONTAL)
diff --git a/javax/swing/plaf/basic/BasicSplitPaneUI.java b/javax/swing/plaf/basic/BasicSplitPaneUI.java
index 8a7c9d2a2..906acfe16 100644
--- a/javax/swing/plaf/basic/BasicSplitPaneUI.java
+++ b/javax/swing/plaf/basic/BasicSplitPaneUI.java
@@ -101,6 +101,16 @@ public class BasicSplitPaneUI extends SplitPaneUI
protected int[] sizes = new int[3];
/**
+ * Creates a new instance. This is package private because the reference
+ * implementation has no public constructor either. Still, we need to
+ * call it from BasicVerticalLayoutManager.
+ */
+ BasicHorizontalLayoutManager()
+ {
+ // Nothing to do here.
+ }
+
+ /**
* This method adds the component given to the JSplitPane. The position of
* the component is given by the constraints object.
*
diff --git a/javax/swing/plaf/basic/BasicTableHeaderUI.java b/javax/swing/plaf/basic/BasicTableHeaderUI.java
index 1e8e39f38..c6f9e37df 100644
--- a/javax/swing/plaf/basic/BasicTableHeaderUI.java
+++ b/javax/swing/plaf/basic/BasicTableHeaderUI.java
@@ -96,7 +96,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
/**
* The header cell border.
*/
- protected Border cellBorder;
+ private Border cellBorder;
/**
* If not null, one of the columns is currently being dragged.
diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java
index 181e52022..bc5917105 100644
--- a/javax/swing/plaf/basic/BasicTextUI.java
+++ b/javax/swing/plaf/basic/BasicTextUI.java
@@ -546,7 +546,6 @@ public abstract class BasicTextUI extends TextUI
public void installUI(final JComponent c)
{
super.installUI(c);
- c.setOpaque(true);
textComponent = (JTextComponent) c;
Document doc = textComponent.getDocument();
diff --git a/javax/swing/plaf/basic/BasicToolBarUI.java b/javax/swing/plaf/basic/BasicToolBarUI.java
index 261db687a..b022faacb 100644
--- a/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -60,6 +60,7 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.Hashtable;
+import javax.swing.AbstractButton;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -72,8 +73,8 @@ import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.border.Border;
+import javax.swing.border.EtchedBorder;
import javax.swing.event.MouseInputListener;
-import javax.swing.plaf.BorderUIResource.EtchedBorderUIResource;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ToolBarUI;
import javax.swing.plaf.UIResource;
@@ -307,7 +308,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
*/
protected Border createNonRolloverBorder()
{
- return new EtchedBorderUIResource();
+ return new EtchedBorder();
}
/**
@@ -328,7 +329,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
*/
protected Border createRolloverBorder()
{
- return new EtchedBorderUIResource()
+ return new EtchedBorder()
{
public void paintBorder(Component c, Graphics g, int x, int y,
int width, int height)
@@ -577,6 +578,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
rolloverBorder = createRolloverBorder();
borders = new Hashtable();
+ setRolloverBorders(toolBar.isRollover());
fillHashtable();
}
@@ -595,7 +597,6 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
floatingBorderColor = UIManager.getColor("ToolBar.floatingForeground");
floatingColor = UIManager.getColor("ToolBar.floatingBackground");
- setRolloverBorders(toolBar.isRollover());
}
/**
@@ -707,9 +708,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
if (c instanceof JToolBar)
{
toolBar = (JToolBar) c;
- toolBar.setOpaque(true);
- installDefaults();
- installComponents();
+ installDefaults();
+ installComponents();
installListeners();
installKeyboardActions();
}
@@ -754,9 +754,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
*/
protected void setBorderToNonRollover(Component c)
{
- if (c instanceof JButton)
+ if (c instanceof AbstractButton)
{
- JButton b = (JButton) c;
+ AbstractButton b = (AbstractButton) c;
b.setRolloverEnabled(false);
b.setBorder(nonRolloverBorder);
}
@@ -875,8 +875,6 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
{
installNormalBorders(toolBar);
borders = null;
- rolloverBorder = null;
- nonRolloverBorder = null;
cachedBounds = null;
floatFrame = null;
View Lorry Controller Status