--- old/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java 2016-01-25 00:12:52.000000000 +0400 +++ new/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java 2016-01-25 00:12:52.000000000 +0400 @@ -212,6 +212,7 @@ // UI Installation/De-installation public void installUI(final JComponent c) { + super.installUI(c); this.tabPane = (JTabbedPane)c; calculatedBaseline = false; @@ -827,7 +828,7 @@ if (scrollableTabLayoutEnabled() && tabScroller.croppedEdge.isParamsSet() && tabScroller.croppedEdge.getTabIndex() == tabIndex && isHorizontalTabPlacement()) { final int availTextWidth = tabScroller.croppedEdge.getCropline() - (textRect.x - tabRect.x) - tabScroller.croppedEdge.getCroppedSideWidth(); - clippedTitle = SwingUtilities2.clipStringIfNecessary(null, metrics, title, availTextWidth); + clippedTitle = getTextUIDrawing().getClippedString(null, metrics, title, availTextWidth); } paintText(g, tabPlacement, font, metrics, tabIndex, clippedTitle, textRect, isSelected); @@ -1006,13 +1007,13 @@ } } g.setColor(fg); - SwingUtilities2.drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x, textRect.y + metrics.getAscent()); + getTextUIDrawing().drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x, textRect.y + metrics.getAscent()); } else { // tab disabled g.setColor(tabPane.getBackgroundAt(tabIndex).brighter()); - SwingUtilities2.drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x, textRect.y + metrics.getAscent()); + getTextUIDrawing().drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x, textRect.y + metrics.getAscent()); g.setColor(tabPane.getBackgroundAt(tabIndex).darker()); - SwingUtilities2.drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x - 1, textRect.y + metrics.getAscent() - 1); + getTextUIDrawing().drawStringUnderlineCharAt(tabPane, g, title, mnemIndex, textRect.x - 1, textRect.y + metrics.getAscent() - 1); } } @@ -1639,7 +1640,7 @@ } else { // plain text final String title = tabPane.getTitleAt(tabIndex); - width += SwingUtilities2.stringWidth(tabPane, metrics, title); + width += getTextUIDrawing().getStringWidth(tabPane, metrics, title); } } return width;