src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonUI.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -273,11 +273,11 @@
         // Paint the Icon
         if(b.getIcon() != null) {
             paintIcon(g,c,iconRect);
         }
 
-        if (text != null && !text.equals("")){
+        if (text != null && !text.isEmpty()){
             View v = (View) c.getClientProperty(BasicHTML.propertyKey);
             if (v != null) {
                 v.paint(g, textRect);
             } else {
                 paintText(g, b, textRect, text);

@@ -493,11 +493,11 @@
      */
     public int getBaseline(JComponent c, int width, int height) {
         super.getBaseline(c, width, height);
         AbstractButton b = (AbstractButton)c;
         String text = b.getText();
-        if (text == null || "".equals(text)) {
+        if (text == null || text.isEmpty()) {
             return -1;
         }
         FontMetrics fm = b.getFontMetrics(b.getFont());
         layout(b, fm, width, height);
         return BasicHTML.getBaseline(b, textRect.y, fm.getAscent(),