--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java Fri Apr 04 11:18:28 2014 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java Mon Apr 07 15:34:27 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, 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
@@ -37,6 +37,10 @@
import javax.swing.event.*;
import javax.swing.plaf.*;
+import static sun.swing.SwingUtilities2.drawHLine;
+import static sun.swing.SwingUtilities2.drawRect;
+import static sun.swing.SwingUtilities2.drawVLine;
+
/**
* Implementation of ScrollBarUI for the Basic Look and Feel
@@ -572,17 +576,17 @@
g.translate(thumbBounds.x, thumbBounds.y);
g.setColor(thumbDarkShadowColor);
- g.drawRect(0, 0, w-1, h-1);
+ drawRect(g, 0, 0, w - 1, h - 1);
g.setColor(thumbColor);
- g.fillRect(0, 0, w-1, h-1);
+ g.fillRect(0, 0, w - 1, h - 1);
g.setColor(thumbHighlightColor);
- g.drawLine(1, 1, 1, h-2);
- g.drawLine(2, 1, w-3, 1);
+ drawVLine(g, 1, 1, h - 2);
+ drawHLine(g, 2, w - 3, 1);
g.setColor(thumbLightShadowColor);
- g.drawLine(2, h-2, w-2, h-2);
- g.drawLine(w-2, 1, w-2, h-3);
+ drawHLine(g, 2, w - 2, h - 2);
+ drawVLine(g, w - 2, 1, h - 3);
g.translate(-thumbBounds.x, -thumbBounds.y);
}