--- old/src/share/classes/sun/java2d/pipe/LoopPipe.java 2009-06-22 21:32:54.000000000 +0200 +++ new/src/share/classes/sun/java2d/pipe/LoopPipe.java 2009-06-22 21:32:54.000000000 +0200 @@ -55,7 +55,7 @@ { int tX = sg2d.transX; int tY = sg2d.transY; - sg2d.loops.drawLineLoop.DrawLine(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().drawLineLoop.DrawLine(sg2d, sg2d.getSurfaceData(), x1 + tX, y1 + tY, x2 + tX, y2 + tY); } @@ -63,7 +63,7 @@ public void drawRect(SunGraphics2D sg2d, int x, int y, int width, int height) { - sg2d.loops.drawRectLoop.DrawRect(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().drawRectLoop.DrawRect(sg2d, sg2d.getSurfaceData(), x + sg2d.transX, y + sg2d.transY, width, height); @@ -98,7 +98,7 @@ int nPoints) { int nPointsArray[] = { nPoints }; - sg2d.loops.drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(), xPoints, yPoints, nPointsArray, 1, sg2d.transX, sg2d.transY, @@ -110,7 +110,7 @@ int nPoints) { int nPointsArray[] = { nPoints }; - sg2d.loops.drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().drawPolygonsLoop.DrawPolygons(sg2d, sg2d.getSurfaceData(), xPoints, yPoints, nPointsArray, 1, sg2d.transX, sg2d.transY, @@ -120,7 +120,7 @@ public void fillRect(SunGraphics2D sg2d, int x, int y, int width, int height) { - sg2d.loops.fillRectLoop.FillRect(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().fillRectLoop.FillRect(sg2d, sg2d.getSurfaceData(), x + sg2d.transX, y + sg2d.transY, width, height); @@ -184,7 +184,7 @@ transX = 0; transY = 0; } - sg2d.loops.drawPathLoop.DrawPath(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().drawPathLoop.DrawPath(sg2d, sg2d.getSurfaceData(), transX, transY, p2df); return; } @@ -302,7 +302,7 @@ transX = 0; transY = 0; } - sg2d.loops.fillPathLoop.FillPath(sg2d, sg2d.getSurfaceData(), + sg2d.getLoops().fillPathLoop.FillPath(sg2d, sg2d.getSurfaceData(), transX, transY, p2df); return; } @@ -330,7 +330,7 @@ // REMIND: Region.filter produces a Java-only iterator // with no native counterpart... } else { - sun.java2d.loops.FillSpans fs = sg2d.loops.fillSpansLoop; + sun.java2d.loops.FillSpans fs = sg2d.getLoops().fillSpansLoop; if (fs != null) { fs.FillSpans(sg2d, sg2d.getSurfaceData(), si); return; @@ -343,7 +343,7 @@ int y = spanbox[1]; int w = spanbox[2] - x; int h = spanbox[3] - y; - sg2d.loops.fillRectLoop.FillRect(sg2d, sd, x, y, w, h); + sg2d.getLoops().fillRectLoop.FillRect(sg2d, sd, x, y, w, h); } } }