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

*** 825,852 ****
                                                    x, y, width, height);
          Rectangle oldClip = g2.getClipBounds();
  
          if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
              g2.setColor(getSelectionBackground());
!             SwingUtilities2.drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
              g2.setColor(getSelectionForeground());
              g2.clipRect(fillStart, y, amountFull, height);
!             SwingUtilities2.drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
          } else { // VERTICAL
              g2.setColor(getSelectionBackground());
              AffineTransform rotate =
                      AffineTransform.getRotateInstance(Math.PI/2);
              g2.setFont(progressBar.getFont().deriveFont(rotate));
              renderLocation = getStringPlacement(g2, progressString,
                                                    x, y, width, height);
!             SwingUtilities2.drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
              g2.setColor(getSelectionForeground());
              g2.clipRect(x, fillStart, width, amountFull);
!             SwingUtilities2.drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
          }
          g2.setClip(oldClip);
      }
  
--- 825,852 ----
                                                    x, y, width, height);
          Rectangle oldClip = g2.getClipBounds();
  
          if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
              g2.setColor(getSelectionBackground());
!             getTextUIDrawing().drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
              g2.setColor(getSelectionForeground());
              g2.clipRect(fillStart, y, amountFull, height);
!             getTextUIDrawing().drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
          } else { // VERTICAL
              g2.setColor(getSelectionBackground());
              AffineTransform rotate =
                      AffineTransform.getRotateInstance(Math.PI/2);
              g2.setFont(progressBar.getFont().deriveFont(rotate));
              renderLocation = getStringPlacement(g2, progressString,
                                                    x, y, width, height);
!             getTextUIDrawing().drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
              g2.setColor(getSelectionForeground());
              g2.clipRect(x, fillStart, width, amountFull);
!             getTextUIDrawing().drawString(progressBar, g2, progressString,
                                         renderLocation.x, renderLocation.y);
          }
          g2.setClip(oldClip);
      }
  
*** 868,878 ****
       */
      protected Point getStringPlacement(Graphics g, String progressString,
                                         int x,int y,int width,int height) {
          FontMetrics fontSizer = SwingUtilities2.getFontMetrics(progressBar, g,
                                              progressBar.getFont());
!         int stringWidth = SwingUtilities2.stringWidth(progressBar, fontSizer,
                                                        progressString);
  
          if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
              return new Point(x + Math.round(width/2 - stringWidth/2),
                               y + ((height +
--- 868,878 ----
       */
      protected Point getStringPlacement(Graphics g, String progressString,
                                         int x,int y,int width,int height) {
          FontMetrics fontSizer = SwingUtilities2.getFontMetrics(progressBar, g,
                                              progressBar.getFont());
!         int stringWidth = getTextUIDrawing().getStringWidth(progressBar, fontSizer,
                                                        progressString);
  
          if (progressBar.getOrientation() == JProgressBar.HORIZONTAL) {
              return new Point(x + Math.round(width/2 - stringWidth/2),
                               y + ((height +
*** 897,907 ****
              size = new Dimension(getPreferredInnerHorizontal());
              // Ensure that the progress string will fit
              if (progressBar.isStringPainted()) {
                  // I'm doing this for completeness.
                  String progString = progressBar.getString();
!                 int stringWidth = SwingUtilities2.stringWidth(
                            progressBar, fontSizer, progString);
                  if (stringWidth > size.width) {
                      size.width = stringWidth;
                  }
                  // This uses both Height and Descent to be sure that
--- 897,907 ----
              size = new Dimension(getPreferredInnerHorizontal());
              // Ensure that the progress string will fit
              if (progressBar.isStringPainted()) {
                  // I'm doing this for completeness.
                  String progString = progressBar.getString();
!                 int stringWidth = getTextUIDrawing().getStringWidth(
                            progressBar, fontSizer, progString);
                  if (stringWidth > size.width) {
                      size.width = stringWidth;
                  }
                  // This uses both Height and Descent to be sure that
*** 924,934 ****
                          fontSizer.getDescent();
                  if (stringHeight > size.width) {
                      size.width = stringHeight;
                  }
                  // This is also for completeness.
!                 int stringWidth = SwingUtilities2.stringWidth(
                                         progressBar, fontSizer, progString);
                  if (stringWidth > size.height) {
                      size.height = stringWidth;
                  }
              }
--- 924,934 ----
                          fontSizer.getDescent();
                  if (stringHeight > size.width) {
                      size.width = stringHeight;
                  }
                  // This is also for completeness.
!                 int stringWidth = getTextUIDrawing().getStringWidth(
                                         progressBar, fontSizer, progString);
                  if (stringWidth > size.height) {
                      size.height = stringWidth;
                  }
              }