commit f0c9e697ea228630e50378cfea9eeec2e1d34156
author Anton Tarasov <anton.tarasov@jetbrains.com> Fri Mar 02 20:33:21 2018 +0300
committer Anton Tarasov <anton.tarasov@jetbrains.com> Fri Mar 02 20:54:27 2018 +0300
tree cfe6e588e420db3c384411d0de14839babae2152
parent bd5e539299814f42031b8489904c1ed011b65a70

JRE-675 typo in the fix for JRE-604

src/share/classes/javax/swing/RepaintManager.java

diff --git a/src/share/classes/javax/swing/RepaintManager.java b/src/share/classes/javax/swing/RepaintManager.java
index 4af8859..3f767e9 100644
--- a/src/share/classes/javax/swing/RepaintManager.java
+++ b/src/share/classes/javax/swing/RepaintManager.java
@@ -1579,18 +1579,15 @@
                 Graphics g, int clipX, int clipY,
                 int clipW, int clipH)
         {
-            Graphics gg = g;
-            // [tav] For the scaling graphics we need to compensate the toplevel insets rounding error
-            // to place [0, 0] of the client area in its correct device pixel.
-            if (g instanceof SunGraphics2D) {
-                SunGraphics2D sg = (SunGraphics2D)gg;
+            SunGraphics2D sg = (SunGraphics2D)g.create();
+            try {
+                // [tav] For the scaling graphics we need to compensate the toplevel insets rounding error
+                // to place [0, 0] of the client area in its correct device pixel.
                 if (sg.transformState == SunGraphics2D.TRANSFORM_TRANSLATESCALE) {
                     Point2D err = getInsetsRoundingError(sg);
                     double errX = err.getX();
                     double errY = err.getY();
                     if (errX != 0 || errY != 0) {
-                        gg = sg = (SunGraphics2D)sg.create();
-
                         // save the current tx
                         AffineTransform tx = sg.transform;
 
@@ -1632,15 +1629,13 @@
                         sg.setTransform(newTx);
                     }
                 }
-            }
-            try {
                 if (image instanceof VolatileImage && isPixelsCopying(c, g)) {
-                    paintDoubleBufferedFPScales(c, image, gg, clipX, clipY, clipW, clipH);
+                    paintDoubleBufferedFPScales(c, image, sg, clipX, clipY, clipW, clipH);
                 } else {
-                    paintDoubleBufferedImpl(c, image, gg, clipX, clipY, clipW, clipH);
+                    paintDoubleBufferedImpl(c, image, sg, clipX, clipY, clipW, clipH);
                 }
             } finally {
-                if (gg != g) g.dispose();
+                sg.dispose();
             }
         }