< prev index next >
src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java
Print this page
rev 1580 : 6727661: Code improvement and warnings removing from the swing/plaf packages
Summary: Removed unnecessary castings and other warnings
Reviewed-by: alexp
Contributed-by: Florian Brunner <fbrunnerlist@gmx.ch>
*** 81,92 ****
private static Border rolloverBorder;
private static Border nonRolloverBorder;
private static Border nonRolloverToggleBorder;
private boolean rolloverBorders = false;
! private HashMap borderTable = new HashMap();
! private Hashtable rolloverTable = new Hashtable();
/**
* As of Java 2 platform v1.3 this previously undocumented field is no
* longer used.
--- 81,92 ----
private static Border rolloverBorder;
private static Border nonRolloverBorder;
private static Border nonRolloverToggleBorder;
private boolean rolloverBorders = false;
! private HashMap<AbstractButton, Border> borderTable = new HashMap<AbstractButton, Border>();
! private Hashtable<AbstractButton, Boolean> rolloverTable = new Hashtable<AbstractButton, Boolean>();
/**
* As of Java 2 platform v1.3 this previously undocumented field is no
* longer used.
*** 169,179 ****
uninstallComponents();
uninstallListeners();
uninstallKeyboardActions();
// Clear instance vars
! if (isFloating() == true)
setFloating(false, null);
floatingToolBar = null;
dragWindow = null;
dockingSource = null;
--- 169,179 ----
uninstallComponents();
uninstallListeners();
uninstallKeyboardActions();
// Clear instance vars
! if (isFloating())
setFloating(false, null);
floatingToolBar = null;
dragWindow = null;
dockingSource = null;
*** 271,283 ****
if ( toolBarFocusListener != null )
{
// Put focus listener on all components in toolbar
Component[] components = toolBar.getComponents();
! for ( int i = 0; i < components.length; ++i )
! {
! components[ i ].addFocusListener( toolBarFocusListener );
}
}
}
protected void uninstallListeners( )
--- 271,282 ----
if ( toolBarFocusListener != null )
{
// Put focus listener on all components in toolbar
Component[] components = toolBar.getComponents();
! for (Component component : components) {
! component.addFocusListener(toolBarFocusListener);
}
}
}
protected void uninstallListeners( )
*** 305,317 ****
if ( toolBarFocusListener != null )
{
// Remove focus listener from all components in toolbar
Component[] components = toolBar.getComponents();
! for ( int i = 0; i < components.length; ++i )
! {
! components[ i ].removeFocusListener( toolBarFocusListener );
}
toolBarFocusListener = null;
}
handler = null;
--- 304,315 ----
if ( toolBarFocusListener != null )
{
// Remove focus listener from all components in toolbar
Component[] components = toolBar.getComponents();
! for (Component component : components) {
! component.removeFocusListener(toolBarFocusListener);
}
toolBarFocusListener = null;
}
handler = null;
*** 614,627 ****
*/
protected void installRolloverBorders ( JComponent c ) {
// Put rollover borders on buttons
Component[] components = c.getComponents();
! for ( int i = 0; i < components.length; ++i ) {
! if ( components[ i ] instanceof JComponent ) {
! ( (JComponent)components[ i ] ).updateUI();
! setBorderToRollover( components[ i ] );
}
}
}
/**
--- 612,625 ----
*/
protected void installRolloverBorders ( JComponent c ) {
// Put rollover borders on buttons
Component[] components = c.getComponents();
! for (Component component : components) {
! if (component instanceof JComponent) {
! ((JComponent) component).updateUI();
! setBorderToRollover(component);
}
}
}
/**
*** 638,651 ****
*/
protected void installNonRolloverBorders ( JComponent c ) {
// Put non-rollover borders on buttons. These borders reduce the margin.
Component[] components = c.getComponents();
! for ( int i = 0; i < components.length; ++i ) {
! if ( components[ i ] instanceof JComponent ) {
! ( (JComponent)components[ i ] ).updateUI();
! setBorderToNonRollover( components[ i ] );
}
}
}
/**
--- 636,649 ----
*/
protected void installNonRolloverBorders ( JComponent c ) {
// Put non-rollover borders on buttons. These borders reduce the margin.
Component[] components = c.getComponents();
! for (Component component : components) {
! if (component instanceof JComponent) {
! ((JComponent) component).updateUI();
! setBorderToNonRollover(component);
}
}
}
/**
*** 662,673 ****
*/
protected void installNormalBorders ( JComponent c ) {
// Put back the normal borders on buttons
Component[] components = c.getComponents();
! for ( int i = 0; i < components.length; ++i ) {
! setBorderToNormal( components[ i ] );
}
}
/**
* Sets the border of the component to have a rollover border which
--- 660,671 ----
*/
protected void installNormalBorders ( JComponent c ) {
// Put back the normal borders on buttons
Component[] components = c.getComponents();
! for (Component component : components) {
! setBorderToNormal(component);
}
}
/**
* Sets the border of the component to have a rollover border which
*** 679,689 ****
*/
protected void setBorderToRollover(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = (Border)borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
// Only set the border if its the default border
--- 677,687 ----
*/
protected void setBorderToRollover(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
// Only set the border if its the default border
*** 719,729 ****
*/
protected void setBorderToNonRollover(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = (Border)borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
// Only set the border if its the default border
--- 717,727 ----
*/
protected void setBorderToNonRollover(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
// Only set the border if its the default border
*** 763,776 ****
*/
protected void setBorderToNormal(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = (Border)borderTable.remove(b);
b.setBorder(border);
! Boolean value = (Boolean)rolloverTable.remove(b);
if (value != null) {
b.setRolloverEnabled(value.booleanValue());
}
}
}
--- 761,774 ----
*/
protected void setBorderToNormal(Component c) {
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
! Border border = borderTable.remove(b);
b.setBorder(border);
! Boolean value = rolloverTable.remove(b);
if (value != null) {
b.setRolloverEnabled(value.booleanValue());
}
}
}
*** 783,793 ****
public boolean isFloating() {
return floating;
}
public void setFloating(boolean b, Point p) {
! if (toolBar.isFloatable() == true) {
boolean visible = false;
Window ancestor = SwingUtilities.getWindowAncestor(toolBar);
if (ancestor != null) {
visible = ancestor.isVisible();
}
--- 781,791 ----
public boolean isFloating() {
return floating;
}
public void setFloating(boolean b, Point p) {
! if (toolBar.isFloatable()) {
boolean visible = false;
Window ancestor = SwingUtilities.getWindowAncestor(toolBar);
if (ancestor != null) {
visible = ancestor.isVisible();
}
*** 951,961 ****
return null;
}
protected void dragTo(Point position, Point origin)
{
! if (toolBar.isFloatable() == true)
{
try
{
if (dragWindow == null)
dragWindow = createDragWindow(toolBar);
--- 949,959 ----
return null;
}
protected void dragTo(Point position, Point origin)
{
! if (toolBar.isFloatable())
{
try
{
if (dragWindow == null)
dragWindow = createDragWindow(toolBar);
*** 1001,1011 ****
}
}
protected void floatAt(Point position, Point origin)
{
! if(toolBar.isFloatable() == true)
{
try
{
Point offset = dragWindow.getOffset();
if (offset == null) {
--- 999,1009 ----
}
}
protected void floatAt(Point position, Point origin)
{
! if(toolBar.isFloatable())
{
try
{
Point offset = dragWindow.getOffset();
if (offset == null) {
*** 1172,1182 ****
public void mouseReleased(MouseEvent evt) {
if (!tb.isEnabled()) {
return;
}
! if (isDragging == true) {
Point position = evt.getPoint();
if (origin == null)
origin = evt.getComponent().getLocationOnScreen();
floatAt(position, origin);
}
--- 1170,1180 ----
public void mouseReleased(MouseEvent evt) {
if (!tb.isEnabled()) {
return;
}
! if (isDragging) {
Point position = evt.getPoint();
if (origin == null)
origin = evt.getComponent().getLocationOnScreen();
floatAt(position, origin);
}
*** 1240,1250 ****
}
}
protected class FrameListener extends WindowAdapter {
public void windowClosing(WindowEvent w) {
! if (toolBar.isFloatable() == true) {
if (dragWindow != null)
dragWindow.setVisible(false);
floating = false;
if (floatingToolBar == null)
floatingToolBar = createFloatingWindow(toolBar);
--- 1238,1248 ----
}
}
protected class FrameListener extends WindowAdapter {
public void windowClosing(WindowEvent w) {
! if (toolBar.isFloatable()) {
if (dragWindow != null)
dragWindow.setVisible(false);
floating = false;
if (floatingToolBar == null)
floatingToolBar = createFloatingWindow(toolBar);
< prev index next >