--- old/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2011-12-01 18:54:56.419357213 +0100
+++ new/src/share/classes/sun/java2d/pipe/BufferedPaints.java	2011-12-01 18:54:56.261358851 +0100
@@ -25,10 +25,16 @@
 
 package sun.java2d.pipe;
 
+import static sun.java2d.pipe.BufferedOpCodes.RESET_PAINT;
+import static sun.java2d.pipe.BufferedOpCodes.SET_COLOR;
+import static sun.java2d.pipe.BufferedOpCodes.SET_GRADIENT_PAINT;
+import static sun.java2d.pipe.BufferedOpCodes.SET_LINEAR_GRADIENT_PAINT;
+import static sun.java2d.pipe.BufferedOpCodes.SET_RADIAL_GRADIENT_PAINT;
+import static sun.java2d.pipe.BufferedOpCodes.SET_TEXTURE_PAINT;
+
 import java.awt.Color;
 import java.awt.GradientPaint;
 import java.awt.LinearGradientPaint;
-import java.awt.MultipleGradientPaint;
 import java.awt.MultipleGradientPaint.ColorSpaceType;
 import java.awt.MultipleGradientPaint.CycleMethod;
 import java.awt.Paint;
@@ -39,12 +45,11 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
+
 import sun.awt.image.PixelConverter;
 import sun.java2d.SunGraphics2D;
 import sun.java2d.SurfaceData;
 import sun.java2d.loops.CompositeType;
-import sun.java2d.loops.SurfaceType;
-import static sun.java2d.pipe.BufferedOpCodes.*;
 
 public class BufferedPaints {
 
@@ -247,7 +252,7 @@
         BufferedImage bi = paint.getImage();
         SurfaceData dstData = sg2d.surfaceData;
         SurfaceData srcData =
-            dstData.getSourceSurfaceData(bi, sg2d.TRANSFORM_ISIDENT,
+            dstData.getSourceSurfaceData(bi, SunGraphics2D.TRANSFORM_ISIDENT,
                                          CompositeType.SrcOver, null);
         boolean filter =
             (sg2d.interpolationType !=