jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java
changeset 12650 0006acd3a5fa
parent 12047 320a714614e9
child 23010 6dadb192ad81
equal deleted inserted replaced
12649:331b9dca607f 12650:0006acd3a5fa
    28 import java.awt.*;
    28 import java.awt.*;
    29 import java.awt.image.BufferedImage;
    29 import java.awt.image.BufferedImage;
    30 
    30 
    31 import javax.swing.*;
    31 import javax.swing.*;
    32 import javax.swing.border.Border;
    32 import javax.swing.border.Border;
       
    33 import javax.swing.plaf.UIResource;
    33 import javax.swing.plaf.basic.BasicHTML;
    34 import javax.swing.plaf.basic.BasicHTML;
    34 import javax.swing.text.View;
    35 import javax.swing.text.View;
    35 
    36 
    36 import apple.laf.*;
    37 import apple.laf.*;
    37 import apple.laf.JRSUIConstants.*;
    38 import apple.laf.JRSUIConstants.*;
    74     }
    75     }
    75 
    76 
    76     protected void setThemeBorder(final AbstractButton b) {
    77     protected void setThemeBorder(final AbstractButton b) {
    77         super.setThemeBorder(b);
    78         super.setThemeBorder(b);
    78 
    79 
    79         // Set the correct border
    80         Border border = b.getBorder();
    80         b.setBorder(AquaButtonBorder.getBevelButtonBorder());
    81         if (border == null || border instanceof UIResource) {
       
    82             // Set the correct border
       
    83             b.setBorder(AquaButtonBorder.getBevelButtonBorder());
       
    84         }
    81     }
    85     }
    82 
    86 
    83     protected abstract AquaButtonBorder getPainter();
    87     protected abstract AquaButtonBorder getPainter();
    84 
    88 
    85     public synchronized void paint(final Graphics g, final JComponent c) {
    89     public synchronized void paint(final Graphics g, final JComponent c) {