Index: modules/awt/src/test/api/java/common/java/awt/PolygonTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/PolygonTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/PolygonTest.java (working copy) @@ -30,10 +30,13 @@ public class PolygonTest extends ShapeTestCase { + { + SERIALIZATION_TEST = true; + } + public PolygonTest(String name) { super(name); - filterImage = createFilter("^(polygon).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); - serializePath = getSerializePath(Polygon.class); +// filterImage = createFilter("^(polygon).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); } protected void setUp() throws Exception { @@ -304,24 +307,30 @@ return obj.getClass().getName() + "[" + data + "]"; } - public void _testSerializeRead() { - assertTrue(checkRead(new Polygon())); - assertTrue(checkRead(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3))); + public void testSerializeRead1() { + checkRead(new Polygon()); } - public void _testSerializeWrite() { - assertTrue(checkWrite(new Polygon())); - assertTrue(checkWrite(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3))); + public void testSerializeRead2() { + checkRead(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3)); } + + public void testSerializeWrite1() { + checkWrite(new Polygon()); + } + public void testSerializeWrite2() { + checkWrite(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3)); + } + public void createSerializeTemplates() { saveSerialized(new Polygon()); saveSerialized(new Polygon(new int[]{1, 2, 3}, new int[]{4, 5, 6}, 3)); } public static void main(String[] args) { -// junit.textui.TestRunner.run(PolygonTest.class); - new PolygonTest("").createSerializeTemplates(); +// new PolygonTest("").createSerializeTemplates(); + junit.textui.TestRunner.run(PolygonTest.class); } } Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Point[x=0,y=0] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=1,y=2,width=3,height=4] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Point[x=1,y=2] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Dimension[width=0,height=0] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Polygon[0 [0,0,0,0] () ()] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Polygon[3 [1,4,2,2] (1,2,3) (4,5,6)] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=0,y=0,width=0,height=0] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Dimension[width=1,height=2] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/serialization/java.awt.Rectangle[x=0,y=0,width=1,height=2] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/Tools.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/Tools.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/Tools.java (working copy) @@ -14,36 +14,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.awt.geom.AffineTransform; import java.awt.geom.CubicCurve2D; import java.awt.geom.GeneralPath; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.QuadCurve2D; +import java.awt.image.BufferedImage; +import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.Reader; import java.io.StreamTokenizer; import java.io.Writer; +import java.util.Arrays; +//import javax.imageio.ImageIO; + import org.apache.harmony.awt.gl.MultiRectAreaOp; -//import com.sun.image.codec.jpeg.JPEGCodec; -//import com.sun.image.codec.jpeg.JPEGEncodeParam; -//import com.sun.image.codec.jpeg.JPEGImageDecoder; -//import com.sun.image.codec.jpeg.JPEGImageEncoder; - import junit.framework.Assert; public abstract class Tools { + static String typeName[] = {"move", "line", "quad", "cubic", "close"}; + static int findString(String buf[], String value) { for(int i = 0; i < buf.length; i++) { if (buf[i].equals(value)) { @@ -53,6 +53,12 @@ Assert.fail("Unknown value " + value); return -1; } + + public static String getClasstPath(Class clazz) { + String name = clazz.getName(); + name = name.substring(0, name.lastIndexOf('.')); + return name.replace('.', java.io.File.separator.charAt(0)) + java.io.File.separator; + } public static class Shape { @@ -69,8 +75,41 @@ static final double IMAGE_MAX_BORDER = 100.0; static final Color backColor = Color.white; - static String typeName[] = {"move", "line", "quad", "cubic", "close"}; + public static Frame show(final java.awt.Shape shape) { + Frame f = new Frame("Shape") { + + public void paint(Graphics g) { + // Background + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); + // Fill shape + g.setColor(Color.lightGray); + ((Graphics2D)g).fill(shape); + + // Draw shape + g.setColor(Color.black); + ((Graphics2D)g).draw(shape); + +// java.awt.image.BufferedImage img = Shape.createImage(shape, null, Color.gray, Color.lightGray); +// g.drawImage(img, 0, 0, img.getWidth(), img.getHeight(), null); + } + + }; + + f.addWindowListener( + new WindowAdapter() { + public void windowClosing(WindowEvent e) { + System.exit(0); + } + } + ); + + f.setSize(600, 400); + f.show(); + return f; + } + public static void save(java.awt.Shape s, String fileName) { try { FileWriter f = new FileWriter(fileName); @@ -95,7 +134,6 @@ StreamTokenizer t = new StreamTokenizer(f); int count = 0; int type = 0; - Point2D lp = null; float coords[] = new float[6]; while(t.nextToken() != StreamTokenizer.TT_EOF) { switch(t.ttype) { @@ -144,10 +182,10 @@ return s; } - public static java.awt.image.BufferedImage createImage(java.awt.Shape src, AffineTransform t, Color draw, Color fill) { + public static java.awt.image.BufferedImage createImage(java.awt.Shape shape, AffineTransform t, Color draw, Color fill) { // Calculate image border - Rectangle r = src.getBounds(); + Rectangle r = shape.getBounds(); double border = r.getWidth() * IMAGE_REL_BORDER; border = Math.min(IMAGE_MAX_BORDER, border); border = Math.max(IMAGE_MIN_BORDER, border); @@ -159,7 +197,7 @@ t.setToTranslation(- r.getX() + border, - r.getY() + border); } java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath(); - dst.append(src.getPathIterator(t), false); + dst.append(shape.getPathIterator(t), false); java.awt.image.BufferedImage img = new java.awt.image.BufferedImage( @@ -192,15 +230,15 @@ return PathIterator.equals(s1.getPathIterator(null), s2.getPathIterator(null), delta); } - public static java.awt.Shape scale(java.awt.Shape src, double k) { - java.awt.geom.PathIterator path = src.getPathIterator(AffineTransform.getScaleInstance(k, k)); + public static java.awt.Shape scale(java.awt.Shape shape, double k) { + java.awt.geom.PathIterator path = shape.getPathIterator(AffineTransform.getScaleInstance(k, k)); java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath(path.getWindingRule()); dst.append(path, false); return dst; } - public static java.awt.Shape flip(java.awt.Shape src) { - java.awt.geom.PathIterator path = src.getPathIterator(new AffineTransform(0, 1, 1, 0, 0, 0)); + public static java.awt.Shape flip(java.awt.Shape shape) { + java.awt.geom.PathIterator path = shape.getPathIterator(new AffineTransform(0, 1, 1, 0, 0, 0)); java.awt.geom.GeneralPath dst = new java.awt.geom.GeneralPath(path.getWindingRule()); dst.append(path, false); return dst; @@ -354,33 +392,7 @@ } public static class BufferedImage { -/* - public static java.awt.image.BufferedImage load(String filename) { - java.awt.image.BufferedImage img = null; - try { - FileInputStream in = new FileInputStream(filename); - JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder(in); - img = decoder.decodeAsBufferedImage(); - in.close(); - } catch (Exception e) { - Assert.fail("Can't open file: " + filename); - } - return img; - } - public static void save(java.awt.image.BufferedImage img, String filename) { - try { - FileOutputStream out = new FileOutputStream(filename); - JPEGEncodeParam param = JPEGCodec.getDefaultJPEGEncodeParam(img); - param.setQuality(1.0f, false); - JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out, param); - encoder.encode(img); - out.close(); - } catch (Exception e) { - Assert.fail("Can't save file: " + filename); - } - } -*/ public static java.awt.image.BufferedImage load(String filename) { java.awt.image.BufferedImage img = null; try { @@ -449,6 +461,8 @@ public static class PathIterator { + public static String equalsError = ""; + static boolean coordsEquals(double coords1[], double coords2[], int count, double delta) { for(int i = 0; i < count; i++) { if (Math.abs(coords1[i] - coords2[i]) > delta) { @@ -468,21 +482,27 @@ } public static boolean equals(java.awt.geom.PathIterator p1, java.awt.geom.PathIterator p2, double delta) { + equalsError = ""; if (p1.getWindingRule() != p2.getWindingRule()) { + equalsError = "WindingRule expected " + p1.getWindingRule() + " but was " + p2.getWindingRule(); return false; } + int count = 0; double coords1[] = new double[6]; double coords2[] = new double[6]; while(!p1.isDone() && !p2.isDone()) { int type1 = p1.currentSegment(coords1); int type2 = p2.currentSegment(coords2); if (type1 != type2 || !coordsEquals(coords1, coords2, Shape.pointCount[type1], delta)) { + equalsError = "Expected #" + count + " segment "+ typeName[type1] + Arrays.toString(coords1) + " but was " + typeName[type2] + Arrays.toString(coords2); return false; } p1.next(); p2.next(); + count++; } if (p1.isDone() != p2.isDone()) { + equalsError = "Expected #" + count + " isDone " + p1.isDone() + " but was " + p2.isDone(); return false; } return true; @@ -532,6 +552,7 @@ } path.next(); } + out += "done\n"; return out; } } Index: modules/awt/src/test/api/java/common/java/awt/RectangleTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/RectangleTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/RectangleTest.java (working copy) @@ -27,11 +27,14 @@ public class RectangleTest extends SerializeTestCase { + { + SERIALIZATION_TEST = true; + } + Rectangle r; public RectangleTest(String name) { super(name); - serializePath = getSerializePath(Rectangle.class); } protected void setUp() throws Exception { @@ -338,18 +341,30 @@ assertEquals(new Rectangle2D.Double(0, 0, 5, 6), r.createUnion(new Rectangle2D.Double(0, 0, 5, 6))); // Cover } - public void testSerializeRead() { - assertTrue(checkRead(new Rectangle())); - assertTrue(checkRead(new Rectangle(1, 2))); - assertTrue(checkRead(new Rectangle(1, 2, 3, 4))); + public void testSerializeRead1() { + checkRead(new Rectangle()); } - public void testSerializeWrite() { - assertTrue(checkWrite(new Rectangle())); - assertTrue(checkWrite(new Rectangle(1, 2))); - assertTrue(checkWrite(new Rectangle(1, 2, 3, 4))); + public void testSerializeRead2() { + checkRead(new Rectangle(1, 2)); } + public void testSerializeRead3() { + checkRead(new Rectangle(1, 2, 3, 4)); + } + + public void testSerializeWrite1() { + checkWrite(new Rectangle()); + } + + public void testSerializeWrite2() { + checkWrite(new Rectangle(1, 2)); + } + + public void testSerializeWrite3() { + checkWrite(new Rectangle(1, 2, 3, 4)); + } + public void createSerializeTemplates() { saveSerialized(new Rectangle()); saveSerialized(new Rectangle(1, 2)); @@ -357,8 +372,8 @@ } public static void main(String[] args) { -// junit.textui.TestRunner.run(RectangleTest.class); - new RectangleTest("").createSerializeTemplates(); +// new RectangleTest("").createSerializeTemplates(); + junit.textui.TestRunner.run(RectangleTest.class); } } Index: modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/SerializeTestCase.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt; import java.io.File; @@ -26,84 +22,82 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.net.URL; import junit.framework.TestCase; - public class SerializeTestCase extends TestCase { - static final String POSTFIX = ".actual"; - static final String FOLDER = "serialization"; - + public static boolean SERIALIZATION_TEST = false; + public String serializePath = null; - + public SerializeTestCase(String name) { super(name); - } - - public static String getSerializePath(Class serializeClass) { - String path = System.getProperty("TEST_SRC_DIR"); - assertNotNull("Variable TEST_SRC_DIR not defined", path); - if (!path.endsWith(File.separator)) { - path += File.separator; + if (SERIALIZATION_TEST) { + String classPath = "serialization/" + Tools.getClasstPath(this.getClass()); + URL url = ClassLoader.getSystemClassLoader().getResource(classPath); + assertNotNull("Path not found " + classPath, url); + serializePath = url.getPath(); } - String name = serializeClass.getName(); - name = name.substring(0, name.lastIndexOf('.')); - path += name.replace('.', File.separator.charAt(0)) + File.separator + FOLDER + File.separator; - new File(path).mkdirs(); - return path; } public String objToStr(Object obj) { return obj.toString(); } - public boolean checkRead(Object obj) { - assertNotNull("Serialize path not defined"); + public void checkRead(Object obj) { + String file = serializePath + objToStr(obj) + ".ser"; + Object golden = loadSerialized(file); + assertTrue("Non equals objects " + file, objToStr(golden).equals(objToStr(obj))); + } + + public void checkWrite(Object obj) { + String name = objToStr(obj); + String expected = serializePath + name + ".ser"; + File actual = null; try { - Object template = loadSerialized(serializePath + objToStr(obj)); - return objToStr(template).equals(objToStr(obj)); + actual = File.createTempFile(name, ".actual", new File(serializePath)); + actual.deleteOnExit(); } catch (IOException e) { - } catch (ClassNotFoundException e) { + fail("Can't create temp file"); } - return false; + saveSerialized(obj, actual.getPath()); + assertTrue("Non equals files " + expected, compare(expected, actual.getPath())); } - public boolean checkWrite(Object obj) { - assertNotNull("Serialize path not defined"); - String file = serializePath + objToStr(obj); - saveSerialized(obj, file + POSTFIX); - return compare(file, file + POSTFIX); + public Object loadSerialized(String file) { + try { + //System.out.println("load " + file); + FileInputStream fs = new FileInputStream(file); + ObjectInputStream os = new ObjectInputStream(fs); + Object obj = os.readObject(); + os.close(); + fs.close(); + return obj; + } catch (Exception e) { + fail("Can''t read object from file " + file); + } + return null; } public void saveSerialized(Object obj) { - assertNotNull("Serialize path not defined"); saveSerialized(obj, serializePath + objToStr(obj)); } public void saveSerialized(Object obj, String file) { try { +// System.out.println("save " + file); FileOutputStream fs = new FileOutputStream(file); ObjectOutputStream os = new ObjectOutputStream(fs); os.writeObject(obj); os.close(); fs.close(); - System.out.println("Write " + file); } catch (Exception e) { - System.out.println("Can''t write object to file " + file); + fail("Can''t write object to file " + file); } } - public Object loadSerialized(String file) throws IOException, ClassNotFoundException { - FileInputStream fs = new FileInputStream(file); - ObjectInputStream os = new ObjectInputStream(fs); - Object obj = os.readObject(); - os.close(); - fs.close(); - System.out.println("Read " + file); - return obj; - } - boolean compare(String file1, String file2) { boolean cmp = false; try { @@ -136,7 +130,7 @@ fs1.close(); fs2.close(); } catch (Exception e) { - System.out.println("Can''t compare files " + file1 + " and " + file2); + fail("Can''t compare files " + file1 + " and " + file2); } return cmp; } Index: modules/awt/src/test/api/java/common/java/awt/DimensionTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/DimensionTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/DimensionTest.java (working copy) @@ -25,11 +25,14 @@ public class DimensionTest extends SerializeTestCase { + { + SERIALIZATION_TEST = true; + } + Dimension d; public DimensionTest(String name) { super(name); - serializePath = getSerializePath(Dimension.class); } protected void setUp() throws Exception { @@ -103,24 +106,30 @@ assertEquals(d.toString(), "java.awt.Dimension[width=2,height=3]"); } - public void testSerializeRead() { - assertTrue(checkRead(new Dimension())); - assertTrue(checkRead(new Dimension(1, 2))); + public void testSerializeRead1() { + checkRead(new Dimension()); } - public void testSerializeWrite() { - assertTrue(checkWrite(new Dimension())); - assertTrue(checkWrite(new Dimension(1, 2))); + public void testSerializeRead2() { + checkRead(new Dimension(1, 2)); } + public void testSerializeWrite1() { + checkWrite(new Dimension()); + } + + public void testSerializeWrite2() { + checkWrite(new Dimension(1, 2)); + } + public void createSerializeTemplates() { saveSerialized(new Dimension()); saveSerialized(new Dimension(1, 2)); } public static void main(String[] args) { -// junit.textui.TestRunner.run(DimensionTest.class); - new DimensionTest("").createSerializeTemplates(); +// new DimensionTest("").createSerializeTemplates(); + junit.textui.TestRunner.run(DimensionTest.class); } } Index: modules/awt/src/test/api/java/common/java/awt/PointTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/PointTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/PointTest.java (working copy) @@ -24,9 +24,12 @@ public class PointTest extends SerializeTestCase { + { + SERIALIZATION_TEST = true; + } + public PointTest(String name) { super(name); - serializePath = getSerializePath(Point.class); } protected void setUp() throws Exception { @@ -102,24 +105,30 @@ assertFalse(new Point(3, 3).equals(new Point(1, 2))); } - public void testSerializeRead() { - assertTrue(checkRead(new Point())); - assertTrue(checkRead(new Point(1, 2))); + public void testSerializeRead1() { + checkRead(new Point()); } - public void testSerializeWrite() { - assertTrue(checkWrite(new Point())); - assertTrue(checkWrite(new Point(1, 2))); + public void testSerializeRead2() { + checkRead(new Point(1, 2)); } + public void testSerializeWrite1() { + checkWrite(new Point()); + } + + public void testSerializeWrite2() { + checkWrite(new Point(1, 2)); + } + public void createSerializeTemplates() { saveSerialized(new Point()); saveSerialized(new Point(1, 2)); } public static void main(String[] args) { -// junit.textui.TestRunner.run(PointTest.class); - new PointTest("").createSerializeTemplates(); +// new PointTest("").createSerializeTemplates(); + junit.textui.TestRunner.run(PointTest.class); } } Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB(10,10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB(10,10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB(10,10).shape (working copy) @@ -1,476 +0,0 @@ -move 57.10623550415039 126.59548950195312 -cubic 59.97520446777344 129.07423400878906 63.22878646850586 131.78213500976562 66.15819549560547 134.1305389404297 -line 128.70675659179688 56.106964111328125 -cubic 126.49378204345703 54.33290481567383 124.6546401977539 52.802215576171875 122.48334503173828 50.92625045776367 -line 57.10623550415039 126.59548950195312 -close -move 75.4909896850586 141.33079528808594 -cubic 78.5987319946289 143.63693237304688 82.1299057006836 146.15274047851562 85.29571533203125 148.3174285888672 -line 141.7393035888672 65.76972961425781 -cubic 139.36952209472656 64.14934539794922 137.4124298095703 62.7550048828125 135.08236694335938 61.025943756103516 -line 75.4909896850586 141.33079528808594 -close -move 95.29315948486328 154.87257385253906 -cubic 98.52076721191406 156.900146484375 102.1928482055664 159.10797119140625 105.47122192382812 160.99313354492188 -line 155.32025146484375 74.30360412597656 -cubic 152.88623046875 72.90396881103516 150.88699340820312 71.70193481445312 148.48748779296875 70.19457244873047 -line 95.29315948486328 154.87257385253906 -close -move 115.99676513671875 166.7699737548828 -cubic 119.42650604248047 168.56417846679688 123.33324432373047 170.50804138183594 126.80878448486328 172.15060424804688 -line 169.53782653808594 81.7391586303711 -cubic 166.9757080078125 80.52828979492188 164.88150024414062 79.48628234863281 162.35043334960938 78.16219329833984 -line 115.99676513671875 166.7699737548828 -close -move 137.77206420898438 177.0624237060547 -cubic 141.29978942871094 178.55755615234375 145.3207550048828 180.1656494140625 148.88626098632812 181.50808715820312 -line 184.1218719482422 87.9214859008789 -cubic 181.50900268554688 86.93772888183594 179.3815460205078 86.08689880371094 176.7942352294922 84.99034118652344 -line 137.77206420898438 177.0624237060547 -close -move 160.34112548828125 185.55075073242188 -cubic 164.0153350830078 186.76190185546875 168.20494079589844 188.04647827148438 171.90982055664062 189.0984649658203 -line 199.2245635986328 92.9012451171875 -cubic 196.5224609375 92.13399505615234 194.3289794921875 91.4614486694336 191.6476287841797 90.57758331298828 -line 160.34112548828125 185.55075073242188 -close -move 183.57748413085938 192.14947509765625 -cubic 187.33975219726562 193.04959106445312 191.6295928955078 193.9806365966797 195.41416931152344 194.71888732910156 -line 214.56005859375 96.5688247680664 -cubic 211.80958557128906 96.03229522705078 209.5812225341797 95.54866790771484 206.84584045410156 94.89422607421875 -line 183.57748413085938 192.14947509765625 -close -move 207.37852478027344 196.79039001464844 -cubic 211.20233154296875 197.36911010742188 215.56053161621094 197.9342803955078 219.39793395996094 198.34930419921875 -line 230.1505126953125 98.92906951904297 -cubic 227.3681640625 98.6281509399414 225.11614990234375 98.33612060546875 222.343017578125 97.9164047241211 -line 207.37852478027344 196.79039001464844 -close -move 231.46530151367188 199.3954315185547 -cubic 235.32861328125 199.64768981933594 239.72837829589844 199.8407745361328 243.59634399414062 199.92788696289062 -line 245.8480987548828 99.9532470703125 -cubic 243.04676818847656 99.89015197753906 240.77926635742188 99.79064178466797 237.98109436035156 99.6079330444336 -line 231.46530151367188 199.3954315185547 -close -move 255.73570251464844 199.94215393066406 -cubic 259.6037902832031 199.86412048339844 264.00390625 199.68138122558594 267.86761474609375 199.43820190429688 -line 261.586181640625 99.63567352294922 -cubic 258.78778076171875 99.81180572509766 256.52020263671875 99.9059829711914 253.71881103515625 99.96249389648438 -line 255.73570251464844 199.94215393066406 -close -move 279.9393615722656 198.42019653320312 -cubic 283.77740478515625 198.01417541503906 288.1365966796875 197.45924377441406 291.9613342285156 196.88951110839844 -line 277.2279052734375 97.9808349609375 -cubic 274.4542541503906 98.39399719238281 272.20196533203125 98.68071746826172 269.4192810058594 98.97509002685547 -line 279.9393615722656 198.42019653320312 -close -move 303.9291076660156 194.84619140625 -cubic 307.7174072265625 194.11639404296875 312.0116882324219 193.19480895996094 315.7778625488281 192.30291748046875 -line 292.73358154296875 94.99433135986328 -cubic 289.99560546875 95.64273071289062 287.7653503417969 96.12136840820312 285.01239013671875 96.6517105102539 -line 303.9291076660156 194.84619140625 -close -move 327.4505310058594 189.279296875 -cubic 331.1571044921875 188.2360382080078 335.3489074707031 186.9613037109375 339.02508544921875 185.7588653564453 -line 307.9366760253906 90.71408081054688 -cubic 305.2542419433594 91.59148406982422 303.0601501464844 92.25870513916016 300.35711669921875 93.01950073242188 -line 327.4505310058594 189.279296875 -close -move 350.486572265625 181.74339294433594 -cubic 354.0582580566406 180.40797424316406 358.08648681640625 178.8075408935547 361.6205139160156 177.31907653808594 -line 322.8045654296875 85.15984344482422 -cubic 320.2130432128906 86.25135803222656 318.0824279785156 87.09785461425781 315.4654235839844 88.07632446289062 -line 350.486572265625 181.74339294433594 -close -move 372.5917053222656 172.43312072753906 -cubic 376.06982421875 170.798828125 379.9798583984375 168.8641815185547 383.41241455078125 167.07821655273438 -line 337.2559509277344 78.3675537109375 -cubic 334.7232666015625 79.68531036376953 332.6281433105469 80.72196197509766 330.0645751953125 81.92652130126953 -line 372.5917053222656 172.43312072753906 -close -move 393.96368408203125 161.31727600097656 -cubic 397.24493408203125 159.43984985351562 400.9206237792969 157.24057006835938 404.15130615234375 155.22071838378906 -line 351.1386413574219 70.42887878417969 -cubic 348.73736572265625 71.93018341064453 346.737060546875 73.12701416015625 344.3014221191406 74.52061462402344 -line 393.96368408203125 161.31727600097656 -close -move 414.1590270996094 148.6894073486328 -cubic 417.328125 146.53236389160156 420.8634338378906 144.02496337890625 423.97467041015625 141.7264404296875 -line 364.5538024902344 61.295345306396484 -cubic 362.2216796875 63.01826477050781 360.2633361816406 64.4072265625 357.89166259765625 66.02149200439453 -line 414.1590270996094 148.6894073486328 -close -move 433.3377380371094 134.5337677001953 -cubic 436.2705993652344 132.1923828125 439.5284423828125 129.4921112060547 442.4010009765625 127.02034759521484 -line 377.17681884765625 51.21926498413086 -cubic 375.0033874511719 53.08943557739258 373.1628723144531 54.614959716796875 370.9478759765625 56.38325881958008 -line 433.3377380371094 134.5337677001953 -close -move 451.2540588378906 119.11559295654297 -cubic 454.05560302734375 116.52078247070312 457.15191650390625 113.5469741821289 459.8868713378906 110.82288360595703 -line 389.3169860839844 39.97167205810547 -cubic 387.2263488769531 42.05400466918945 385.4391784667969 43.7704963684082 383.3020935058594 45.74985885620117 -line 451.2540588378906 119.11559295654297 -close -move 381.7781677246094 47.784828186035156 -cubic 379.16595458984375 50.58259582519531 376.3130187988281 53.752559661865234 373.83056640625 56.61412811279297 -line 449.36767578125 122.14382934570312 -cubic 451.2527160644531 119.97091674804688 452.8833923339844 118.15902709960938 454.87091064453125 116.03035736083984 -line 381.7781677246094 47.784828186035156 -close -move 366.2738952636719 65.65475463867188 -cubic 363.900146484375 68.60350799560547 361.307373046875 71.95034790039062 359.066162109375 74.95726013183594 -line 439.24444580078125 134.71881103515625 -cubic 440.9300842285156 132.457275390625 442.3818359375 130.58328247070312 444.1702575683594 128.3616943359375 -line 366.2738952636719 65.65475463867188 -close -move 352.0558776855469 84.75103759765625 -cubic 349.8809509277344 87.91730499267578 347.5098876953125 91.51728820800781 345.4768981933594 94.7381820678711 -line 430.0406799316406 148.11387634277344 -cubic 431.556396484375 145.7125244140625 432.8591003417969 143.73463439941406 434.4830017089844 141.3705291748047 -line 352.0558776855469 84.75103759765625 -close -move 339.33233642578125 104.90662384033203 -cubic 337.4079284667969 108.23666381835938 335.31683349609375 112.02766418457031 333.5397033691406 115.40643310546875 -line 422.0441589355469 161.95703125 -cubic 423.3589782714844 159.4572296142578 424.48883056640625 157.40890502929688 425.91436767578125 154.94215393066406 -line 339.33233642578125 104.90662384033203 -close -move 328.1333312988281 126.2097396850586 -cubic 326.48095703125 129.68589782714844 324.6960144042969 133.6468963623047 323.1956481933594 137.1650390625 -line 415.1801452636719 176.3932342529297 -cubic 416.2829284667969 173.80738830566406 417.2335510253906 171.6978759765625 418.4491882324219 169.14044189453125 -line 328.1333312988281 126.2097396850586 -close -move 318.7287292480469 148.25949096679688 -cubic 317.3507995605469 151.89402770996094 315.8778991699219 156.0379180908203 314.65887451171875 159.70765686035156 -line 409.5599365234375 191.23208618164062 -cubic 410.45111083984375 188.54928588867188 411.2262878417969 186.3683319091797 412.234375 183.7093505859375 -line 318.7287292480469 148.25949096679688 -close -move 311.0838623046875 171.27047729492188 -cubic 310.02252197265625 174.97589111328125 308.907470703125 179.20111083984375 308.0054931640625 182.93307495117188 -line 405.2068786621094 206.42539978027344 -cubic 405.863525390625 203.70849609375 406.4449462890625 201.50531005859375 407.218017578125 198.80638122558594 -line 311.0838623046875 171.27047729492188 -close -move 305.40997314453125 194.75767517089844 -cubic 304.6588439941406 198.5609588623047 303.8978271484375 202.89695739746094 303.310302734375 206.71853637695312 -line 402.1490478515625 221.91400146484375 -cubic 402.57550048828125 219.14012145996094 402.9696960449219 216.89410400390625 403.51507568359375 214.1326141357422 -line 305.40997314453125 194.75767517089844 -close -move 301.72314453125 218.73532104492188 -cubic 301.2987976074219 222.57479858398438 300.9093017578125 226.94943237304688 300.64892578125 230.79827880859375 -line 400.42083740234375 237.5484161376953 -cubic 400.6094970703125 234.7596893310547 400.8104553222656 232.50271606445312 401.1179504394531 229.7203369140625 -line 301.72314453125 218.73532104492188 -close -move 300.08795166015625 242.92840576171875 -cubic 299.9917297363281 246.79641723632812 299.9762268066406 251.19932556152344 300.045166015625 255.0677032470703 -line 400.0292663574219 253.2856903076172 -cubic 399.9793395996094 250.48440551757812 399.9873352050781 248.21604919433594 400.0570068359375 245.41500854492188 -line 300.08795166015625 242.92840576171875 -close -move 300.5205993652344 267.200439453125 -cubic 300.7539978027344 271.05303955078125 301.1129150390625 275.4325256347656 301.5104675292969 279.2765197753906 -line 400.9798889160156 268.9889831542969 -cubic 400.69183349609375 266.2036437988281 400.5066833496094 263.9446716308594 400.33758544921875 261.1534423828125 -line 300.5205993652344 267.200439453125 -close -move 303.0129089355469 291.301025390625 -cubic 303.573486328125 295.12542724609375 304.30389404296875 299.46533203125 305.0280456542969 303.2721862792969 -line 403.26641845703125 284.5847473144531 -cubic 402.74072265625 281.82122802734375 402.362548828125 279.57415771484375 401.95574951171875 276.79876708984375 -line 303.0129089355469 291.301025390625 -close -move 307.5451354980469 315.1329650878906 -cubic 308.4208679199219 318.8692321777344 309.5062561035156 323.10015869140625 310.5413818359375 326.81060791015625 -line 406.8632507324219 299.9386901855469 -cubic 406.1094970703125 297.2369384765625 405.5439147949219 295.03216552734375 404.90655517578125 292.31292724609375 -line 307.5451354980469 315.1329650878906 -close -move 314.0345153808594 338.39093017578125 -cubic 315.2274169921875 342.0664978027344 316.6709289550781 346.21795654296875 318.0227966308594 349.8590393066406 -line 411.76983642578125 315.05255126953125 -cubic 410.78125 312.3898620605469 410.0221862792969 310.20684814453125 409.1504211425781 307.5208435058594 -line 314.0345153808594 338.39093017578125 -close -move 322.42572021484375 361.0126647949219 -cubic 323.90118408203125 364.537841796875 325.65826416015625 368.5078430175781 327.2857971191406 371.9917297363281 -line 417.8871154785156 329.6667785644531 -cubic 416.6903381347656 327.10498046875 415.7555847167969 324.9929504394531 414.671630859375 322.4031677246094 -line 322.42572021484375 361.0126647949219 -close -move 332.6149597167969 382.8210754394531 -cubic 334.3759765625 386.22418212890625 336.45013427734375 390.04351806640625 338.35992431640625 393.3980712890625 -line 425.2633361816406 343.9228515625 -cubic 423.8494873046875 341.439453125 422.730224609375 339.3784484863281 421.4281005859375 336.86212158203125 -line 332.6149597167969 382.8210754394531 -close -move 344.4324645996094 403.5952453613281 -cubic 346.4423828125 406.825439453125 348.7879943847656 410.43701171875 350.9399108886719 413.6131591796875 -line 433.72772216796875 357.5223388671875 -cubic 432.1221008300781 355.1524963378906 430.83526611328125 353.171142578125 429.3377685546875 350.7644958496094 -line 344.4324645996094 403.5952453613281 -close -move 357.87921142578125 423.439697265625 -cubic 360.112060546875 426.4754943847656 362.6970520019531 429.8556213378906 365.0641784667969 432.8330993652344 -line 443.34136962890625 370.6022033691406 -cubic 441.5593566894531 368.3606872558594 440.11431884765625 366.47119140625 438.43621826171875 364.18963623046875 -line 357.87921142578125 423.439697265625 -close -move 372.55596923828125 441.9076232910156 -cubic 375.01751708984375 444.7800598144531 377.8478698730469 447.96337890625 380.43927001953125 450.77252197265625 -line 453.941162109375 382.96783447265625 -cubic 451.9711608886719 380.83233642578125 450.35626220703125 379.0160217285156 448.4886474609375 376.836669921875 -line 372.55596923828125 441.9076232910156 -close -move 388.7107238769531 459.4176940917969 -cubic 389.0095520019531 459.7189025878906 389.3442687988281 460.0549621582031 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -cubic 457.92510986328125 387.2144470214844 455.1779479980469 384.5547180175781 452.6947326660156 382.226806640625 -line 384.30291748046875 455.1827087402344 -cubic 386.1984558105469 456.95965576171875 387.78607177734375 458.49676513671875 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -cubic 460.12530517578125 389.4146423339844 459.9310302734375 389.2195739746094 459.7022705078125 388.9889831542969 -line 388.7107238769531 459.4176940917969 -close -move 443.8773498535156 374.2577819824219 -cubic 441.015625 371.76507568359375 437.7705993652344 369.0419616699219 434.84808349609375 366.6795349121094 -line 371.98309326171875 444.4483642578125 -cubic 374.1920166015625 446.23394775390625 376.0284118652344 447.7749938964844 378.19537353515625 449.6625671386719 -line 443.8773498535156 374.2577819824219 -close -move 425.5758361816406 359.4643859863281 -cubic 422.4751281738281 357.14300537109375 418.9522399902344 354.6104431152344 415.7930603027344 352.4304504394531 -line 358.9979553222656 434.7366943359375 -cubic 361.3639221191406 436.36932373046875 363.3184814453125 437.7744140625 365.6444396972656 439.5157775878906 -line 425.5758361816406 359.4643859863281 -close -move 405.8162536621094 345.8276672363281 -cubic 402.5948181152344 343.7846984863281 398.9300231933594 341.55975341796875 395.657470703125 339.65911865234375 -line 345.4356994628906 426.1332702636719 -cubic 347.866455078125 427.54498291015625 349.8635559082031 428.7574157714844 352.2594909667969 430.27691650390625 -line 405.8162536621094 345.8276672363281 -close -move 385.1833801269531 333.85076904296875 -cubic 381.7593078613281 332.0400695800781 377.85919189453125 330.0777587890625 374.38885498046875 328.4186706542969 -line 331.2567443847656 418.6385192871094 -cubic 333.8159484863281 419.8620300292969 335.90826416015625 420.91473388671875 338.4361267089844 422.2514953613281 -line 385.1833801269531 333.85076904296875 -close -move 363.4415588378906 323.45513916015625 -cubic 359.92279052734375 321.9451904296875 355.91217041015625 320.3202209472656 352.3552551269531 318.96258544921875 -line 316.6953430175781 412.3883361816406 -cubic 319.30267333984375 413.3835144042969 321.4260559082031 414.24383544921875 324.0075988769531 415.35162353515625 -line 363.4415588378906 323.45513916015625 -close -move 340.9254455566406 314.8699951171875 -cubic 337.255126953125 313.64141845703125 333.07000732421875 312.3371276855469 329.3685607910156 311.2677001953125 -line 301.6116638183594 407.3382873535156 -cubic 304.3118896484375 408.1184387207031 306.504150390625 408.8016357421875 309.18328857421875 409.69842529296875 -line 340.9254455566406 314.8699951171875 -close -move 317.7110595703125 308.1619567871094 -cubic 313.9566650390625 307.2453918457031 309.6757507324219 306.2955017089844 305.8985900878906 305.5403747558594 -line 286.29473876953125 403.6000061035156 -cubic 289.0402526855469 404.14886474609375 291.2648010253906 404.6424865722656 293.99493408203125 405.3089904785156 -line 317.7110595703125 308.1619567871094 -close -move 293.9412536621094 303.4125061035156 -cubic 290.1193542480469 302.8157958984375 285.7631530761719 302.2301940917969 281.9271545410156 301.7971496582031 -line 270.70977783203125 401.166015625 -cubic 273.49139404296875 401.4800109863281 275.74285888671875 401.7826843261719 278.5149230957031 402.2154846191406 -line 293.9412536621094 303.4125061035156 -close -move 269.8686828613281 300.69482421875 -cubic 266.0061950683594 300.42437744140625 261.6071472167969 300.21063232421875 257.739501953125 300.1053466796875 -line 255.01806640625 400.06829833984375 -cubic 257.8192443847656 400.1445617675781 260.0865478515625 400.2547302246094 262.8842468261719 400.45062255859375 -line 269.8686828613281 300.69482421875 -close -move 245.6002960205078 300.0340270996094 -cubic 241.73194885253906 300.0939025878906 237.33123779296875 300.2559509277344 233.466796875 300.48095703125 -line 239.27932739257812 400.3118896484375 -cubic 242.0781707763672 400.14892578125 244.34593200683594 400.0654296875 247.1474151611328 400.0220642089844 -line 245.6002960205078 300.0340270996094 -close -move 221.38644409179688 301.44268798828125 -cubic 217.5470733642578 301.8306884765625 213.1859893798828 302.36517333984375 209.3594512939453 302.9169006347656 -line 223.63046264648438 401.8933410644531 -cubic 226.4051513671875 401.4932861328125 228.65794372558594 401.2171936035156 231.44134521484375 400.9359130859375 -line 221.38644409179688 301.44268798828125 -close -move 197.38494873046875 304.9038391113281 -cubic 193.58929443359375 305.61669921875 189.2861785888672 306.5193176269531 185.51219177246094 307.39471435546875 -line 208.10784912109375 404.8084411621094 -cubic 210.85104370117188 404.1721496582031 213.08511352539062 403.7035217285156 215.8429718017578 403.1855773925781 -line 197.38494873046875 304.9038391113281 -close -move 173.8296356201172 310.3635559082031 -cubic 170.11972045898438 311.3893737792969 165.9235382080078 312.6443786621094 162.2435760498047 313.82940673828125 -line 192.89517211914062 409.01593017578125 -cubic 195.57977294921875 408.1514587402344 197.77505493164062 407.494873046875 200.4799041748047 406.7469787597656 -line 173.8296356201172 310.3635559082031 -close -move 150.76889038085938 317.79046630859375 -cubic 147.1849365234375 319.1117858886719 143.1422119140625 320.69683837890625 139.59559631347656 322.17193603515625 -line 177.99839782714844 414.50408935546875 -cubic 180.59835815429688 413.4226989746094 182.73526000976562 412.58489990234375 185.36050415039062 411.6170349121094 -line 150.76889038085938 317.79046630859375 -close -move 128.60867309570312 327.006103515625 -cubic 125.12541198730469 328.6238708496094 121.20886993408203 330.5400695800781 117.77073669433594 332.3095397949219 -line 163.53196716308594 421.2247314453125 -cubic 166.06781005859375 419.91961669921875 168.164794921875 418.8936462402344 170.73121643066406 417.70172119140625 -line 128.60867309570312 327.006103515625 -close -move 107.16806030273438 338.0384216308594 -cubic 103.8810806274414 339.9003601074219 100.19817352294922 342.08251953125 96.96134948730469 344.0869445800781 -line 149.60987854003906 429.1053771972656 -cubic 152.01467895507812 427.6161804199219 154.01707458496094 426.42974853515625 156.45596313476562 425.0481872558594 -line 107.16806030273438 338.0384216308594 -close -move 86.93325805664062 350.570556640625 -cubic 83.75757598876953 352.7122802734375 80.21409606933594 355.2029113769531 77.09588623046875 357.4861755371094 -line 136.17478942871094 438.1687927246094 -cubic 138.51097106933594 436.4581298828125 140.47181701660156 435.0799255371094 142.84725952148438 433.4778747558594 -line 86.93325805664062 350.570556640625 -close -move 67.67216491699219 364.663330078125 -cubic 64.73246765136719 366.9906921386719 61.46617126464844 369.67572021484375 58.586387634277344 372.13348388671875 -line 123.50379180908203 448.1974792480469 -cubic 125.68151092529297 446.3388977050781 127.52472686767578 444.82366943359375 129.74374389648438 443.06689453125 -line 67.67216491699219 364.663330078125 -close -move 49.70970153808594 379.9953308105469 -cubic 46.90060043334961 382.5762939453125 43.79503631591797 385.53521728515625 41.052181243896484 388.2455139160156 -line 111.33938598632812 459.37713623046875 -cubic 113.43482971191406 457.30657958984375 115.22516632080078 455.60076904296875 117.36676788330078 453.63311767578125 -line 49.70970153808594 379.9953308105469 -close -move 117.3233642578125 453.173583984375 -cubic 119.949462890625 450.3834533691406 122.81742095947266 447.2224426269531 125.31380462646484 444.3681640625 -line 50.041656494140625 378.5342712402344 -cubic 48.14499282836914 380.7028503417969 46.5037727355957 382.51177978515625 44.504573822021484 384.6358337402344 -line 117.3233642578125 453.173583984375 -close -move 132.9136505126953 435.3503112792969 -cubic 135.29168701171875 432.4206848144531 137.88943481445312 429.0959777832031 140.13607788085938 426.10833740234375 -line 60.211883544921875 366.00738525390625 -cubic 58.52128982543945 368.255615234375 57.06513977050781 370.1192321777344 55.2725944519043 372.32757568359375 -line 132.9136505126953 435.3503112792969 -close -move 147.19363403320312 416.3365783691406 -cubic 149.38388061523438 413.17694091796875 151.77186584472656 409.58477783203125 153.8202362060547 406.3701171875 -line 69.48591613769531 352.6325988769531 -cubic 67.95805358886719 355.0303649902344 66.6447525024414 357.00592041015625 65.00862884521484 359.3661804199219 -line 147.19363403320312 416.3365783691406 -close -move 160.01275634765625 396.2210388183594 -cubic 161.94679260253906 392.9073486328125 164.04904174804688 389.13525390625 165.83676147460938 385.772705078125 -line 77.54015350341797 338.82904052734375 -cubic 76.21696472167969 341.3178405761719 75.08011627197266 343.3576965332031 73.6468734741211 345.8133239746094 -line 160.01275634765625 396.2210388183594 -close -move 171.2945556640625 374.9869689941406 -cubic 172.9634552001953 371.5160217285156 174.76698303222656 367.5611267089844 176.283935546875 364.0477294921875 -line 84.47594451904297 324.408203125 -cubic 83.36060333251953 326.9914245605469 82.39939880371094 329.0992126464844 81.17115020751953 331.6536865234375 -line 171.2945556640625 374.9869689941406 -close -move 180.80247497558594 352.9687194824219 -cubic 182.19447326660156 349.34625244140625 183.68360900878906 345.2162170410156 184.9174041748047 341.5582275390625 -line 90.16204071044922 309.5985412597656 -cubic 89.25982666015625 312.2734680175781 88.47563171386719 314.4483642578125 87.45698547363281 317.0992736816406 -line 180.80247497558594 352.9687194824219 -close -move 188.5469512939453 330.0072937011719 -cubic 189.62576293945312 326.3052978515625 190.7606201171875 322.083984375 191.68006896972656 318.3549499511719 -line 94.58792114257812 294.4151306152344 -cubic 93.91841888427734 297.13043212890625 93.32640075683594 299.33258056640625 92.54045867919922 302.0295715332031 -line 188.5469512939453 330.0072937011719 -close -move 194.32766723632812 306.5546569824219 -cubic 195.0967559814453 302.75384521484375 195.87818908691406 298.4205322265625 196.48370361328125 294.60089111328125 -line 97.71703338623047 278.9437561035156 -cubic 97.2774658203125 281.71661376953125 96.87257385253906 283.9618835449219 96.31407165527344 286.72198486328125 -line 194.32766723632812 306.5546569824219 -close -move 198.12728881835938 282.5895080566406 -cubic 198.5694580078125 278.75311279296875 198.9793243408203 274.3818054199219 199.25770568847656 270.5355529785156 -line 99.51858520507812 263.31683349609375 -cubic 99.3168716430664 266.1038818359375 99.10538482666016 268.3594665527344 98.7849349975586 271.1398620605469 -line 198.12728881835938 282.5895080566406 -close -move 199.87570190429688 258.4073791503906 -cubic 199.99008178710938 254.53970336914062 200.0262908935547 250.1368865966797 199.9755096435547 246.26832580566406 -line 99.98412322998047 247.58055114746094 -cubic 100.02088928222656 250.3819580078125 100.00224304199219 252.65029907226562 99.91940307617188 255.4511260986328 -line 199.87570190429688 258.4073791503906 -close -move 199.55709838867188 234.13409423828125 -cubic 199.34173583984375 230.279052734375 199.0032196044922 225.89642333984375 198.62353515625 222.0495147705078 -line 99.10708618164062 231.87171936035156 -cubic 99.38218688964844 234.6590118408203 99.55677032470703 236.9193115234375 99.71279907226562 239.71212768554688 -line 199.55709838867188 234.13409423828125 -close -move 197.1775665283203 210.02008056640625 -cubic 196.63499450683594 206.19384765625 195.9250030517578 201.8514404296875 195.2188262939453 198.0422821044922 -line 96.89424896240234 216.2707977294922 -cubic 97.40682220458984 219.03561401367188 97.77433776855469 221.2833709716797 98.16802978515625 224.05975341796875 -line 197.1775665283203 210.02008056640625 -close -move 192.75421142578125 186.1575927734375 -cubic 191.89598083496094 182.4185028076172 190.83041381835938 178.18386840820312 189.812744140625 174.4701690673828 -line 93.36827087402344 200.8986053466797 -cubic 94.109130859375 203.6022186279297 94.66417694091797 205.80796813964844 95.2886734008789 208.52874755859375 -line 192.75421142578125 186.1575927734375 -close -move 186.3742218017578 162.87840270996094 -cubic 185.19871520996094 159.19900512695312 183.7748260498047 155.04258728027344 182.4403533935547 151.397216796875 -line 88.53478240966797 185.7737274169922 -cubic 89.51041412353516 188.43882751464844 90.25872802734375 190.6232147216797 91.11753845214844 193.3113250732422 -line 186.3742218017578 162.87840270996094 -close -move 178.08042907714844 140.2042694091797 -cubic 176.62156677246094 136.6744384765625 174.88308715820312 132.69851684570312 173.2721405029297 129.2095489501953 -line 82.4826889038086 171.12942504882812 -cubic 83.66687774658203 173.69410705566406 84.59109497070312 175.8078155517578 85.66249084472656 178.400146484375 -line 178.08042907714844 140.2042694091797 -close -move 167.99447631835938 118.36305236816406 -cubic 166.2443084716797 114.94376373291016 164.181640625 111.10554504394531 162.28175354003906 107.73468017578125 -line 75.16596984863281 156.8350067138672 -cubic 76.57191467285156 159.32949829101562 77.68405151367188 161.39894104003906 78.9776611328125 163.92626953125 -line 167.99447631835938 118.36305236816406 -close -move 156.2572479248047 97.51850128173828 -cubic 154.2627410888672 94.2822036743164 151.93408203125 90.66293334960938 149.79750061035156 87.48025512695312 -line 66.77099609375 143.21713256835938 -cubic 68.36443328857422 145.59072875976562 69.64071655273438 147.57437133789062 71.12606811523438 149.98451232910156 -line 156.2572479248047 97.51850128173828 -close -move 142.90557861328125 77.632080078125 -cubic 140.678466796875 74.57699584960938 138.09884643554688 71.1746826171875 135.73631286621094 68.17803192138672 -line 57.20664596557617 130.08999633789062 -cubic 58.98430252075195 132.34478759765625 60.424781799316406 134.24465942382812 62.09769821166992 136.53952026367188 -line 142.90557861328125 77.632080078125 -close -move 128.28781127929688 59.08103942871094 -cubic 125.8402328491211 56.20143127441406 123.02494812011719 53.0092658996582 120.44743347167969 50.19258499145508 -line 46.67400360107422 117.70169830322266 -cubic 48.632328033447266 119.84174346923828 50.236751556396484 121.66094970703125 52.09275817871094 123.84455871582031 -line 128.28781127929688 59.08103942871094 -close -move 112.21853637695312 41.52274703979492 -cubic 111.62396240234375 40.91862869262695 110.95616149902344 40.2454833984375 110.35533905029297 39.64466094970703 -line 39.64466094970703 110.35533905029297 -cubic 42.37564468383789 113.08631896972656 45.4672966003418 116.06755828857422 48.265045166015625 118.66929626464844 -line 116.36395263671875 45.43994140625 -cubic 114.22917175292969 43.45472717285156 112.44355773925781 41.73288345336914 110.35533905029297 39.64466094970703 -line 39.64466094970703 110.35533905029297 -cubic 40.104652404785156 110.8153305053711 40.49203872680664 111.20581817626953 40.94702911376953 111.6681137084961 -line 112.21853637695312 41.52274703979492 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB(20,20).shape (working copy) @@ -1,348 +0,0 @@ -move 123.58853912353516 190.9019775390625 -quad 132.92926025390625 198.38404846191406 142.34010314941406 204.91795349121094 -line 183.41146850585938 233.43359375 -line 240.44277954101562 151.29086303710938 -line 199.37139892578125 122.77520751953125 -quad 192.7739715576172 118.19464874267578 186.10641479492188 112.85382843017578 -line 147.08233642578125 81.59489440917969 -line 84.56446838378906 159.64303588867188 -line 123.58853912353516 190.9019775390625 -close -move 162.53448486328125 217.80099487304688 -quad 173.38336181640625 224.1159210205078 184.3314208984375 229.19720458984375 -line 229.6846160888672 250.246826171875 -line 271.78387451171875 159.54042053222656 -line 226.4306640625 138.4907989501953 -quad 219.68536376953125 135.36012268066406 212.84088134765625 131.37606811523438 -line 169.62841796875 106.22286987304688 -line 119.322021484375 192.64779663085938 -line 162.53448486328125 217.80099487304688 -close -move 207.79122924804688 238.62997436523438 -quad 220.24053955078125 242.87008666992188 232.78408813476562 245.5322723388672 -line 281.6946716308594 255.912841796875 -line 302.4557800292969 158.09170532226562 -line 253.54522705078125 147.7111358642578 -quad 246.83554077148438 146.28709411621094 240.0316162109375 143.96974182128906 -line 192.70150756835938 127.84954833984375 -line 160.4611053466797 222.50978088378906 -line 207.79122924804688 238.62997436523438 -close -move 258.9111328125 249.3526153564453 -quad 272.2071228027344 250.42306518554688 285.5092468261719 249.72384643554688 -line 335.4403076171875 247.09925842285156 -line 330.1911315917969 147.23712158203125 -line 280.26007080078125 149.86170959472656 -quad 273.60113525390625 150.21173095703125 266.93609619140625 149.6751251220703 -line 217.09735107421875 145.66262817382812 -line 209.0723876953125 245.34014892578125 -line 258.9111328125 249.3526153564453 -close -move 311.7895202636719 246.60923767089844 -quad 324.4656982421875 244.2677459716797 337.05291748046875 240.31704711914062 -line 384.7583312988281 225.34396362304688 -line 354.8121643066406 129.93313598632812 -line 307.10675048828125 144.90621948242188 -quad 300.3215026855469 147.03587341308594 293.6252136230469 148.2727813720703 -line 244.4569854736328 157.3549346923828 -line 262.62127685546875 255.69139099121094 -line 311.7895202636719 246.60923767089844 -close -move 360.84954833984375 231.37197875976562 -quad 371.9778747558594 226.49249267578125 383.0047302246094 220.34304809570312 -line 426.6731872558594 195.99009704589844 -line 377.96728515625 108.65320587158203 -line 334.298828125 133.0061492919922 -quad 327.445068359375 136.82833862304688 320.6927795410156 139.78904724121094 -line 274.90130615234375 159.86744689941406 -line 315.0580749511719 251.45034790039062 -line 360.84954833984375 231.37197875976562 -close -move 403.5491638183594 207.7245635986328 -quad 413.1248474121094 201.29714965820312 422.6269836425781 193.8922576904297 -line 462.06573486328125 163.15817260742188 -line 400.5975646972656 84.2806396484375 -line 361.1588134765625 115.01473236083984 -quad 354.4513854980469 120.24172973632812 347.8175354003906 124.69452667236328 -line 306.3025207519531 152.56033325195312 -line 362.0341491699219 235.5903778076172 -line 403.5491638183594 207.7245635986328 -close -move 440.4252624511719 179.10862731933594 -quad 448.6980895996094 171.8094940185547 456.9246520996094 163.75096130371094 -line 492.6429138183594 128.76231384277344 -line 422.6656188964844 57.32579803466797 -line 386.9473571777344 92.31444549560547 -quad 380.5831604003906 98.54862213134766 374.2652587890625 104.12293243408203 -line 336.7724304199219 137.2029266357422 -line 402.9324035644531 212.18862915039062 -line 440.4252624511719 179.10862731933594 -close -move 377.1773986816406 102.61119079589844 -quad 369.25860595703125 111.18914794921875 362.1571960449219 119.82049560546875 -line 330.38983154296875 158.43182373046875 -line 407.61248779296875 221.96656799316406 -line 439.3798522949219 183.35523986816406 -quad 444.669921875 176.9254608154297 450.6548767089844 170.4423065185547 -line 484.5704345703125 133.7035675048828 -line 411.09295654296875 65.87245178222656 -line 377.1773986816406 102.61119079589844 -close -move 347.9688720703125 138.2500762939453 -quad 340.8788757324219 148.13343811035156 334.8350524902344 158.0987548828125 -line 308.90667724609375 200.85057067871094 -line 394.41033935546875 252.7073516845703 -line 420.3387145996094 209.95550537109375 -quad 424.38214111328125 203.2885284423828 429.2236022949219 196.5395965576172 -line 458.36834716796875 155.9122314453125 -line 377.1136474609375 97.62271118164062 -line 347.9688720703125 138.2500762939453 -close -move 323.0877685546875 179.54052734375 -quad 317.4510192871094 191.0492706298828 313.1850891113281 202.66311645507812 -line 295.9455261230469 249.59707641601562 -line 389.8134460449219 284.07623291015625 -line 407.0530090332031 237.1422576904297 -quad 409.5344543457031 230.3866729736328 412.8946533203125 223.52598571777344 -line 434.88739013671875 178.62254333496094 -line 345.08050537109375 134.6370849609375 -line 323.0877685546875 179.54052734375 -close -move 305.68914794921875 227.37925720214844 -quad 302.5852355957031 240.3253936767578 301.1736755371094 253.34075927734375 -line 295.7825622558594 303.04925537109375 -line 395.1996154785156 313.83148193359375 -line 400.5906982421875 264.1229553222656 -quad 401.3151550292969 257.4431457519531 402.9332580566406 250.69407653808594 -line 414.5906677246094 202.072021484375 -line 317.3465576171875 178.7572021484375 -line 305.68914794921875 227.37925720214844 -close -move 300.06060791015625 279.92352294921875 -quad 300.3863220214844 293.1531066894531 302.4598388671875 306.34381103515625 -line 310.2242736816406 355.7372741699219 -line 409.01116943359375 340.2083740234375 -line 401.2467346191406 290.81494140625 -quad 400.1942138671875 284.1191711425781 400.0303039550781 277.4623107910156 -line 398.7997131347656 227.4774627685547 -line 298.8299865722656 229.9386749267578 -line 300.06060791015625 279.92352294921875 -close -move 308.12567138671875 331.8705139160156 -quad 311.60516357421875 343.9881591796875 316.56500244140625 356.002685546875 -line 335.644287109375 402.2193603515625 -line 428.0776672363281 364.0607604980469 -line 408.99835205078125 317.8440856933594 -quad 406.1755676269531 311.0063171386719 404.2417907714844 304.27166748046875 -line 390.4423522949219 256.213623046875 -line 294.3262634277344 283.81243896484375 -line 308.12567138671875 331.8705139160156 -close -move 327.2099304199219 378.51861572265625 -quad 332.8068542480469 389.01397705078125 339.5497131347656 399.417236328125 -line 366.7445068359375 441.3748779296875 -line 450.6597900390625 386.9852294921875 -line 423.4649658203125 345.0276184082031 -quad 419.0394287109375 338.1996765136719 415.4473876953125 331.4638366699219 -line 391.91998291015625 287.3450927734375 -line 303.68255615234375 334.39990234375 -line 327.2099304199219 378.51861572265625 -close -move 353.1867370605469 418.8256530761719 -quad 360.0107727050781 427.8336181640625 367.71405029296875 436.7801208496094 -line 400.3385925292969 474.6699523925781 -line 476.11822509765625 409.42083740234375 -line 443.4936828613281 371.5310363769531 -quad 437.8316955566406 364.9552307128906 432.8967590332031 358.44091796875 -line 402.7043762207031 318.5859069824219 -line 322.994384765625 378.97064208984375 -line 353.1867370605469 418.8256530761719 -close -move 382.9124450683594 453.4825744628906 -quad 386.2120666503906 456.9227600097656 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 455.6109313964844 384.9002380371094 450.8518371582031 380.40966796875 -line 414.48553466796875 346.0950927734375 -line 345.8563232421875 418.82769775390625 -line 382.22265625 453.1423034667969 -quad 385.92633056640625 456.6369934082031 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 457.6599426269531 386.9492492675781 455.0819396972656 384.2614440917969 -line 420.47137451171875 348.17669677734375 -line 348.3018798828125 417.3978271484375 -line 382.9124450683594 453.4825744628906 -close -move 433.9315490722656 365.284912109375 -quad 424.90728759765625 357.66412353515625 415.8196716308594 350.9352722167969 -line 375.63604736328125 321.1816711425781 -line 316.12884521484375 401.5489807128906 -line 356.3125 431.30255126953125 -quad 362.8305358886719 436.1287536621094 369.4119567871094 441.6866455078125 -line 407.6128234863281 473.9464416503906 -line 472.1324157714844 397.5447082519531 -line 433.9315490722656 365.284912109375 -close -move 396.2543029785156 337.5274963378906 -quad 385.7159729003906 330.88232421875 375.0831298828125 325.40985107421875 -line 330.6258544921875 302.52862548828125 -line 284.8634033203125 391.443115234375 -line 329.3206481933594 414.3243713378906 -quad 336.0711669921875 417.7987365722656 342.9161376953125 422.1149597167969 -line 385.2098693847656 448.7840576171875 -line 438.54803466796875 364.1965637207031 -line 396.2543029785156 337.5274963378906 -close -move 352.2908935546875 315.0690002441406 -quad 340.1484680175781 310.293701171875 327.904541015625 307.02728271484375 -line 279.5941162109375 294.1391906738281 -line 253.8179473876953 390.7601013183594 -line 302.1283874511719 403.6481628417969 -quad 308.859375 405.4438171386719 315.69189453125 408.1308898925781 -line 362.22283935546875 426.4303894042969 -line 398.82183837890625 333.3684997558594 -line 352.2908935546875 315.0690002441406 -close -move 302.1828308105469 301.8493957519531 -quad 288.9390869140625 300.0452575683594 275.66510009765625 300.0010986328125 -line 225.66537475585938 299.8348083496094 -line 225.33282470703125 399.83428955078125 -line 275.3325500488281 400.00054931640625 -quad 281.9936218261719 400.022705078125 288.6849060058594 400.9342346191406 -line 338.2273254394531 407.6831970214844 -line 351.7252502441406 308.5983581542969 -line 302.1828308105469 301.8493957519531 -close -move 249.11863708496094 301.6763610839844 -quad 236.19012451171875 303.3528747558594 223.33709716796875 306.70001220703125 -line 174.9508819580078 319.300537109375 -line 200.15196228027344 416.072998046875 -line 248.53817749023438 403.4724426269531 -quad 255.29611206054688 401.71258544921875 261.97857666015625 400.84600830078125 -line 311.5633850097656 394.4160461425781 -line 298.7034606933594 295.24639892578125 -line 249.11863708496094 301.6763610839844 -close -move 198.8717041015625 314.6153259277344 -quad 187.3799591064453 319.0646057128906 175.99293518066406 324.859130859375 -line 131.43081665039062 347.5355224609375 -line 176.7835693359375 436.65972900390625 -line 221.34568786621094 413.9833679199219 -quad 228.21376037597656 410.4884033203125 234.9770965576172 407.8698425292969 -line 281.6043395996094 389.817138671875 -line 245.49896240234375 296.5626220703125 -line 198.8717041015625 314.6153259277344 -close -move 154.73617553710938 336.9056396484375 -quad 144.90200805664062 343.052734375 135.1471405029297 350.2220764160156 -line 94.85795593261719 379.83258056640625 -line 154.07894897460938 460.41094970703125 -line 194.36813354492188 430.8004455566406 -quad 201.09408569335938 425.8572082519531 207.7407684326172 421.7025451660156 -line 250.1392364501953 395.20025634765625 -line 197.13461303710938 310.4033508300781 -line 154.73617553710938 336.9056396484375 -close -move 116.96002197265625 364.5343017578125 -quad 108.44003295898438 371.6851806640625 99.97126770019531 379.6349792480469 -line 63.51659393310547 413.855712890625 -line 131.95803833007812 486.7650146484375 -line 168.41270446777344 452.5443115234375 -quad 174.8560028076172 446.4958801269531 181.24807739257812 441.1309509277344 -line 219.54638671875 408.9869079589844 -line 155.25836181640625 332.3902893066406 -line 116.96002197265625 364.5343017578125 -close -move 166.29879760742188 454.3028564453125 -quad 174.29380798339844 446.00933837890625 181.51914978027344 437.66802978515625 -line 214.2558135986328 399.875 -line 138.66978454589844 334.4017028808594 -line 105.93312072753906 372.1947021484375 -quad 100.4512710571289 378.52325439453125 94.30439758300781 384.8996276855469 -line 59.602779388427734 420.8968200683594 -line 131.59718322753906 490.300048828125 -line 166.29879760742188 454.3028564453125 -close -move 196.12435913085938 419.73193359375 -quad 203.466796875 410.1053771972656 209.80892944335938 400.402587890625 -line 237.16537475585938 358.5501708984375 -line 153.46054077148438 303.8372802734375 -line 126.1041030883789 345.689697265625 -quad 121.75074005126953 352.349853515625 116.61271667480469 359.08624267578125 -line 86.28987121582031 398.8420715332031 -line 165.801513671875 459.4877624511719 -line 196.12435913085938 419.73193359375 -close -move 222.2163543701172 379.5886535644531 -quad 228.23439025878906 368.4251403808594 232.95420837402344 357.15875244140625 -line 252.27378845214844 311.0419921875 -line 160.04029846191406 272.4028625488281 -line 140.72071838378906 318.51959228515625 -quad 137.89007568359375 325.2764587402344 134.19207763671875 332.1362609863281 -line 110.46588897705078 376.1484069824219 -line 198.49014282226562 423.6007995605469 -line 222.2163543701172 379.5886535644531 -close -move 241.5155487060547 333.1062927246094 -quad 245.24014282226562 320.4160461425781 247.33192443847656 307.64154052734375 -line 255.41162109375 258.2986755371094 -line 156.72584533691406 242.13931274414062 -line 148.64617919921875 291.482177734375 -quad 147.55091857910156 298.1709899902344 145.56300354003906 304.944091796875 -line 131.48190307617188 352.92034912109375 -line 227.4344482421875 381.08258056640625 -line 241.5155487060547 333.1062927246094 -close -move 249.90223693847656 281.2533264160156 -quad 250.31817626953125 267.9516906738281 248.96560668945312 254.66552734375 -line 243.90162658691406 204.92262268066406 -line 144.41583251953125 215.05059814453125 -line 149.4798126220703 264.7934875488281 -quad 150.15933227539062 271.4683837890625 149.9510955810547 278.1278076171875 -line 148.38833618164062 328.1033630371094 -line 248.3394775390625 331.2289123535156 -line 249.90223693847656 281.2533264160156 -close -move 244.61456298828125 228.66355895996094 -quad 241.71347045898438 216.22348022460938 237.25840759277344 203.8810577392578 -line 220.28268432617188 156.85101318359375 -line 126.22261810302734 190.80245971679688 -line 143.19833374023438 237.83248901367188 -quad 145.66001892089844 244.65245056152344 147.22769165039062 251.37472534179688 -line 158.58326721191406 300.06817626953125 -line 255.97015380859375 277.35699462890625 -line 244.61456298828125 228.66355895996094 -close -move 227.4659881591797 180.67820739746094 -quad 222.2366943359375 169.86659240722656 215.80081176757812 159.15220642089844 -line 190.05465698242188 116.29037475585938 -line 104.33100128173828 167.7826690673828 -line 130.0771484375 210.64450073242188 -quad 134.18356323242188 217.48080444335938 137.4430694580078 224.21986389160156 -line 159.21389770507812 269.2313232421875 -line 249.23681640625 225.68966674804688 -line 227.4659881591797 180.67820739746094 -close -move 202.72543334960938 139.22164916992188 -quad 196.11447143554688 129.9349822998047 188.57711791992188 120.71582794189453 -line 156.92929077148438 82.0064697265625 -line 79.51057434082031 145.3021240234375 -line 111.15840148925781 184.01148986816406 -quad 116.58361053466797 190.64723205566406 121.25936126708984 197.21543884277344 -line 150.25625610351562 237.948486328125 -line 231.72232055664062 179.95468139648438 -line 202.72543334960938 139.22164916992188 -close -move 173.58314514160156 103.43721771240234 -quad 167.23594665527344 96.5252685546875 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -quad 97.8431625366211 168.55384826660156 106.08660125732422 175.99542236328125 -line 143.20091247558594 209.49957275390625 -line 210.20921325683594 135.2709503173828 -line 173.0948944091797 101.76679992675781 -quad 166.74757385253906 96.03690338134766 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -quad 95.0200424194336 165.73072814941406 99.92743682861328 171.0747528076172 -line 133.74620056152344 207.90260314941406 -line 207.40191650390625 140.26507568359375 -line 173.58314514160156 103.43721771240234 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RR(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RR(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RR(100,100).shape (working copy) @@ -1,93 +0,0 @@ -move 100.66352844238281 233.6361846923828 -line 53.56267547607422 312.1376037597656 -cubic 47.84400939941406 321.668701171875 49.104801177978516 333.8308410644531 56.65694046020508 341.9862365722656 -cubic 64.2090835571289 350.1416320800781 76.23870086669922 352.3315124511719 86.18034362792969 347.3606872558594 -line 93.74040222167969 343.5806579589844 -cubic 106.0898666381836 337.4059143066406 111.0954818725586 322.38909912109375 104.92074584960938 310.0396423339844 -cubic 98.74601745605469 297.6901550292969 83.72918701171875 292.6845397949219 71.37972259521484 298.8592834472656 -line 63.81966018676758 302.6393127441406 -line 75.0 325.0 -line 96.43732452392578 337.8623962402344 -line 143.53817749023438 259.3609924316406 -cubic 150.6418914794922 247.521484375 146.80276489257812 232.1649627685547 134.9632568359375 225.06126403808594 -cubic 123.12374877929688 217.95755004882812 107.7672348022461 221.7966766357422 100.66352844238281 233.6361846923828 -close -move 183.18312072753906 298.8592834472656 -line 272.6258239746094 254.13792419433594 -cubic 284.97528076171875 247.96319580078125 289.98089599609375 232.94638061523438 283.8061828613281 220.596923828125 -cubic 277.6314392089844 208.24746704101562 262.6146240234375 203.24183654785156 250.26515197753906 209.41656494140625 -line 160.8224334716797 254.13792419433594 -cubic 148.47296142578125 260.3126525878906 143.4673614501953 275.3294982910156 149.64208984375 287.678955078125 -cubic 155.81683349609375 300.0284118652344 170.8336639404297 305.0340270996094 183.18312072753906 298.8592834472656 -close -move 362.0685729980469 209.41656494140625 -line 386.1803283691406 197.36068725585938 -cubic 396.55072021484375 192.17550659179688 401.9950866699219 180.54046630859375 399.33123779296875 169.2561798095703 -cubic 396.6673889160156 157.97190856933594 386.5944519042969 150.0 375.0 150.0 -line 301.9577941894531 150.0 -cubic 288.1506652832031 150.0 276.9577941894531 161.19287109375 276.9577941894531 175.0 -cubic 276.9577941894531 188.80711364746094 288.1506652832031 200.0 301.9577941894531 200.0 -line 375.0 200.0 -line 375.0 175.0 -line 363.8196716308594 152.63931274414062 -line 339.7078857421875 164.69520568847656 -cubic 327.3584289550781 170.86993408203125 322.3528137207031 185.8867645263672 328.52752685546875 198.23622131347656 -cubic 334.7022705078125 210.585693359375 349.7191162109375 215.59130859375 362.0685729980469 209.41656494140625 -close -move 201.95779418945312 150.0 -line 101.95779418945312 150.0 -cubic 88.15067291259766 150.0 76.95779418945312 161.19287109375 76.95779418945312 175.0 -cubic 76.9577865600586 188.80711364746094 88.15067291259766 200.0 101.95779418945312 200.0 -line 201.95779418945312 200.0 -cubic 215.76490783691406 200.0 226.95779418945312 188.80711364746094 226.95779418945312 175.0 -cubic 226.95779418945312 161.19287109375 215.76490783691406 150.0 201.95779418945312 150.0 -close -move 91.14258575439453 250.49557495117188 -line 142.5921630859375 336.244873046875 -cubic 149.6958770751953 348.0843811035156 165.05238342285156 351.9234924316406 176.8918914794922 344.8197937011719 -cubic 188.73138427734375 337.716064453125 192.5705108642578 322.3595886230469 185.46681213378906 310.52008056640625 -line 134.01722717285156 224.77078247070312 -cubic 126.91352081298828 212.9312744140625 111.55701446533203 209.09214782714844 99.71751403808594 216.19586181640625 -cubic 87.87800598144531 223.299560546875 84.03887939453125 238.65606689453125 91.14258575439453 250.49557495117188 -close -move 194.04173278808594 421.9941711425781 -line 203.56268310546875 437.8623962402344 -cubic 207.52346801757812 444.4637145996094 214.30471801757812 448.8720703125 221.94541931152344 449.81268310546875 -cubic 229.58612060546875 450.7532958984375 237.2340850830078 448.1212463378906 242.67767333984375 442.67767333984375 -line 300.3030700683594 385.0522766113281 -cubic 310.0661926269531 375.2891540527344 310.066162109375 359.4600524902344 300.3030700683594 349.6969299316406 -cubic 290.5399475097656 339.9338073730469 274.7108459472656 339.9338073730469 264.9477233886719 349.6969299316406 -line 207.32232666015625 407.32232666015625 -line 225.0 425.0 -line 246.43731689453125 412.1376037597656 -line 236.9163818359375 396.2693786621094 -cubic 229.81268310546875 384.42987060546875 214.4561767578125 380.5907287597656 202.61666870117188 387.6944274902344 -cubic 190.77716064453125 394.7981262207031 186.93801879882812 410.1546630859375 194.04173278808594 421.9941711425781 -close -move 371.01373291015625 314.3415832519531 -line 392.67767333984375 292.67767333984375 -cubic 401.4749755859375 283.88037109375 402.4647521972656 269.9530029296875 395.0 260.0 -line 353.3824462890625 204.5099334716797 -cubic 345.0981750488281 193.46424865722656 329.4281311035156 191.2256622314453 318.3824462890625 199.50994873046875 -cubic 307.3367614746094 207.79421997070312 305.0981750488281 223.4642333984375 313.3824462890625 234.5099334716797 -line 355.0 290.0 -line 375.0 275.0 -line 357.32232666015625 257.32232666015625 -line 335.6584167480469 278.98626708984375 -cubic 325.89532470703125 288.7493591308594 325.89532470703125 304.5784912109375 335.6584167480469 314.3415832519531 -cubic 345.4215087890625 324.10467529296875 361.2506408691406 324.10467529296875 371.01373291015625 314.3415832519531 -close -move 293.3824462890625 124.50993347167969 -line 245.0 60.0 -cubic 240.0057373046875 53.340972900390625 232.0247802734375 49.604373931884766 223.71205139160156 50.033199310302734 -cubic 215.39932250976562 50.46202087402344 207.84523010253906 55.000022888183594 203.56268310546875 62.13760757446289 -line 152.11309814453125 147.88690185546875 -cubic 145.0093994140625 159.72640991210938 148.84852600097656 175.08291625976562 160.6880340576172 182.18661499023438 -cubic 172.5275421142578 189.29031372070312 187.88404846191406 185.45118713378906 194.9877471923828 173.61167907714844 -line 246.43731689453125 87.86239624023438 -line 225.0 75.0 -line 205.0 90.0 -line 253.3824462890625 154.5099334716797 -cubic 261.6667175292969 165.55563354492188 277.3367614746094 167.79420471191406 288.3824462890625 159.50994873046875 -cubic 299.42816162109375 151.22567749023438 301.6667175292969 135.5556182861328 293.3824462890625 124.50993347167969 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(10,30,70).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(10,30,70).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(10,30,70).shape (working copy) @@ -1,126 +0,0 @@ -move 165.0 75.5 -line 235.0 75.5 -line 235.0 74.5 -line 165.0 74.5 -line 165.0 75.5 -close -move 245.0 75.5 -line 275.0 75.5 -line 275.0 74.5 -line 245.0 74.5 -line 245.0 75.5 -close -move 345.0 75.5 -line 355.0 75.5 -line 355.0 74.5 -line 345.0 74.5 -line 345.0 75.5 -close -move 385.0 75.5 -line 455.0 75.5 -line 455.0 74.5 -line 385.0 74.5 -line 385.0 75.5 -close -move 465.0 75.5 -line 475.0 75.5 -line 475.0 75.0 -line 474.5 75.0 -line 474.5 95.0 -line 475.5 95.0 -line 475.5 75.0 -line 475.5 74.5 -line 475.0 74.5 -line 465.0 74.5 -line 465.0 75.5 -close -move 474.5 165.0 -line 474.5 175.0 -line 475.5 175.0 -line 475.5 165.0 -line 474.5 165.0 -close -move 474.5 205.0 -line 474.5 275.0 -line 475.5 275.0 -line 475.5 205.0 -line 474.5 205.0 -close -move 474.5 285.0 -line 474.5 315.0 -line 475.5 315.0 -line 475.5 285.0 -line 474.5 285.0 -close -move 474.5 385.0 -line 474.5 395.0 -line 475.5 395.0 -line 475.5 385.0 -line 474.5 385.0 -close -move 475.0 424.5 -line 405.0 424.5 -line 405.0 425.5 -line 475.0 425.5 -line 475.0 424.5 -close -move 395.0 424.5 -line 365.0 424.5 -line 365.0 425.5 -line 395.0 425.5 -line 395.0 424.5 -close -move 295.0 424.5 -line 285.0 424.5 -line 285.0 425.5 -line 295.0 425.5 -line 295.0 424.5 -close -move 255.0 424.5 -line 185.0 424.5 -line 185.0 425.5 -line 255.0 425.5 -line 255.0 424.5 -close -move 175.0 424.5 -line 145.0 424.5 -line 145.0 425.5 -line 175.0 425.5 -line 175.0 424.5 -close -move 125.5 375.0 -line 125.5 365.0 -line 124.5 365.0 -line 124.5 375.0 -line 125.5 375.0 -close -move 125.5 335.0 -line 125.5 265.0 -line 124.5 265.0 -line 124.5 335.0 -line 125.5 335.0 -close -move 125.5 255.0 -line 125.5 225.0 -line 124.5 225.0 -line 124.5 255.0 -line 125.5 255.0 -close -move 125.5 155.0 -line 125.5 145.0 -line 124.5 145.0 -line 124.5 155.0 -line 125.5 155.0 -close -move 125.5 115.0 -line 125.5 75.0 -line 125.0 75.0 -line 125.0 75.5 -line 135.0 75.5 -line 135.0 74.5 -line 125.0 74.5 -line 124.5 74.5 -line 124.5 75.0 -line 124.5 115.0 -line 125.5 115.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100BB(20,20).shape (working copy) @@ -1,140 +0,0 @@ -move 164.6562957763672 125.0 -cubic 171.0732879638672 125.0 177.65313720703125 125.0 184.39581298828125 125.0 -line 184.39581298828125 25.0 -cubic 177.65313720703125 25.0 171.0732879638672 25.0 164.6562957763672 25.0 -line 164.6562957763672 125.0 -close -move 204.3081512451172 125.0 -cubic 211.0233917236328 125.0 217.88612365722656 125.0 224.8963623046875 125.0 -line 224.8963623046875 25.0 -cubic 217.88612365722656 25.0 211.0233917236328 25.0 204.3081512451172 25.0 -line 204.3081512451172 125.0 -close -move 244.27955627441406 125.0 -cubic 250.86126708984375 125.0 257.5636291503906 125.0 264.38665771484375 125.0 -line 264.38665771484375 25.0 -cubic 257.5636291503906 25.0 250.86126708984375 25.0 244.27955627441406 25.0 -line 244.27955627441406 125.0 -close -move 284.82647705078125 125.0 -cubic 291.2139892578125 125.0 297.70025634765625 125.0 304.2853088378906 125.0 -line 304.2853088378906 25.0 -cubic 297.70025634765625 25.0 291.2139892578125 25.0 284.82647705078125 25.0 -line 284.82647705078125 125.0 -close -move 324.3367004394531 125.0 -cubic 331.1192626953125 125.0 338.0005798339844 125.0 344.9806823730469 125.0 -line 344.9806823730469 25.0 -cubic 338.0005798339844 25.0 331.1192626953125 25.0 324.3367004394531 25.0 -line 324.3367004394531 125.0 -close -move 364.3852233886719 125.0 -cubic 370.92333984375 125.0 377.5437927246094 125.0 384.24658203125 125.0 -line 384.24658203125 25.0 -cubic 377.5437927246094 25.0 370.92333984375 25.0 364.3852233886719 25.0 -line 364.3852233886719 125.0 -close -move 404.6019592285156 125.0 -cubic 411.2171630859375 125.0 417.90875244140625 125.0 424.6767272949219 125.0 -line 424.6767272949219 25.0 -cubic 417.90875244140625 25.0 411.2171630859375 25.0 404.6019592285156 25.0 -line 404.6019592285156 125.0 -close -move 444.2778015136719 125.0 -cubic 450.88116455078125 125.0 457.55426025390625 125.0 464.2969970703125 125.0 -line 464.2969970703125 25.0 -cubic 457.55426025390625 25.0 450.88116455078125 25.0 444.2778015136719 25.0 -line 444.2778015136719 125.0 -close -move 484.7343444824219 125.0 -cubic 491.2939453125 125.0 497.9168701171875 125.0 504.6031188964844 125.0 -line 504.6031188964844 25.0 -cubic 497.9168701171875 25.0 491.2939453125 25.0 484.7343444824219 25.0 -line 484.7343444824219 125.0 -close -move 524.2684326171875 125.0 -cubic 530.8832397460938 125.0 537.557861328125 125.0 544.2921752929688 125.0 -line 544.2921752929688 25.0 -cubic 537.557861328125 25.0 530.8832397460938 25.0 524.2684326171875 25.0 -line 524.2684326171875 125.0 -close -move 564.6744384765625 125.0 -cubic 568.1013793945312 125.0 571.543212890625 125.0 575.0 125.0 -line 575.0 25.0 -line 565.0 25.0 -line 565.0 125.0 -line 575.0 125.0 -line 575.0 25.0 -cubic 571.543212890625 25.0 568.1013793945312 25.0 564.6744384765625 25.0 -line 564.6744384765625 125.0 -close -move 545.0 25.0 -line 525.0 25.0 -line 525.0 125.0 -line 545.0 125.0 -line 545.0 25.0 -close -move 505.0 25.0 -line 485.0 25.0 -line 485.0 125.0 -line 505.0 125.0 -line 505.0 25.0 -close -move 465.0 25.0 -line 445.0 25.0 -line 445.0 125.0 -line 465.0 125.0 -line 465.0 25.0 -close -move 425.0 25.0 -line 405.0 25.0 -line 405.0 125.0 -line 425.0 125.0 -line 425.0 25.0 -close -move 385.0 25.0 -line 365.0 25.0 -line 365.0 125.0 -line 385.0 125.0 -line 385.0 25.0 -close -move 345.0 25.0 -line 325.0 25.0 -line 325.0 125.0 -line 345.0 125.0 -line 345.0 25.0 -close -move 305.0 25.0 -line 285.0 25.0 -line 285.0 125.0 -line 305.0 125.0 -line 305.0 25.0 -close -move 265.0 25.0 -line 245.0 25.0 -line 245.0 125.0 -line 265.0 125.0 -line 265.0 25.0 -close -move 225.0 25.0 -line 205.0 25.0 -line 205.0 125.0 -line 225.0 125.0 -line 225.0 25.0 -close -move 185.0 25.0 -line 165.0 25.0 -line 165.0 125.0 -line 185.0 125.0 -line 185.0 25.0 -close -move 145.0 25.0 -line 125.0 25.0 -line 125.0 125.0 -cubic 131.22222900390625 125.0 137.63803100585938 125.0 144.24740600585938 125.0 -line 144.24740600585938 25.0 -cubic 137.63803100585938 25.0 131.22222900390625 25.0 125.0 25.0 -line 125.0 125.0 -line 145.0 125.0 -line 145.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB.shape (working copy) @@ -1,16 +0,0 @@ -move 325.0 25.0 -cubic 298.9521179199219 25.0 298.9521179199219 25.0 272.90423583984375 25.0 -line 272.90423583984375 125.0 -cubic 421.37188720703125 125.0 421.37188720703125 125.0 569.8395385742188 125.0 -line 569.8395385742188 25.0 -cubic 522.4197387695312 25.0 522.4197387695312 25.0 475.0 25.0 -line 325.0 25.0 -close -move 325.0 125.0 -line 475.0 125.0 -cubic 522.4197387695312 125.0 522.4197387695312 125.0 569.8395385742188 125.0 -line 569.8395385742188 25.0 -cubic 421.37188720703125 25.0 421.37188720703125 25.0 272.90423583984375 25.0 -line 272.90423583984375 125.0 -cubic 298.9521179199219 125.0 298.9521179199219 125.0 325.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4.shape (working copy) @@ -1,6 +0,0 @@ -move 225.0 225.0 -cubic 125.0 75.0 425.0 75.0 325.0 225.0 -cubic 475.0 125.0 475.0 425.0 325.0 325.0 -cubic 425.0 475.0 125.0 475.0 225.0 325.0 -cubic 75.0 425.0 75.0 125.0 225.0 225.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB.shape (working copy) @@ -1,14 +0,0 @@ -move 175.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 375.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -close -move 175.0 75.0 -line 175.0 175.0 -line 375.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 175.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8.shape (working copy) @@ -1,10 +0,0 @@ -move 375.0 375.0 -cubic 275.0 225.0 375.0 225.0 375.0 75.0 -cubic 375.0 225.0 475.0 225.0 375.0 375.0 -cubic 525.0 275.0 525.0 375.0 675.0 375.0 -cubic 525.0 375.0 525.0 475.0 375.0 375.0 -cubic 475.0 525.0 375.0 525.0 375.0 675.0 -cubic 375.0 525.0 275.0 525.0 375.0 375.0 -cubic 225.0 475.0 225.0 375.0 75.0 375.0 -cubic 225.0 375.0 225.0 275.0 375.0 375.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10.shape (working copy) @@ -1,68 +0,0 @@ -move 197.36068725585938 186.1803436279297 -quad 208.04635620117188 164.80897521972656 217.67767333984375 155.17767333984375 -quad 221.05897521972656 151.79635620117188 223.6803436279297 150.48568725585938 -quad 224.65170288085938 150.0 225.0 150.0 -quad 225.34829711914062 150.0 226.3196563720703 150.48568725585938 -quad 228.94102478027344 151.79635620117188 232.32232666015625 155.17767333984375 -quad 241.95364379882812 164.80897521972656 252.63931274414062 186.1803436279297 -line 256.3660888671875 193.63389587402344 -line 263.8196716308594 197.36068725585938 -quad 285.1910095214844 208.04635620117188 294.82232666015625 217.67767333984375 -quad 298.2036437988281 221.05897521972656 299.5143127441406 223.6803436279297 -quad 300.0 224.65170288085938 300.0 225.0 -quad 300.0 225.34829711914062 299.5143127441406 226.3196563720703 -quad 298.2036437988281 228.94102478027344 294.82232666015625 232.32232666015625 -quad 285.1910095214844 241.95364379882812 263.8196716308594 252.63931274414062 -line 256.3661193847656 256.3660888671875 -line 252.63931274414062 263.8196716308594 -quad 241.95364379882812 285.1910095214844 232.32232666015625 294.82232666015625 -quad 228.94102478027344 298.2036437988281 226.3196563720703 299.5143127441406 -quad 225.34829711914062 300.0 225.0 300.0 -quad 224.65170288085938 300.0 223.6803436279297 299.5143127441406 -quad 221.05897521972656 298.2036437988281 217.67767333984375 294.82232666015625 -quad 208.04635620117188 285.1910095214844 197.36068725585938 263.8196716308594 -line 193.6339111328125 256.3661193847656 -line 186.1803436279297 252.63931274414062 -quad 164.80897521972656 241.95364379882812 155.17767333984375 232.32232666015625 -quad 151.79635620117188 228.94102478027344 150.48568725585938 226.3196563720703 -quad 150.0 225.34829711914062 150.0 225.0 -quad 150.0 224.65170288085938 150.48568725585938 223.6803436279297 -quad 151.79635620117188 221.05897521972656 155.17767333984375 217.67767333984375 -quad 164.80897521972656 208.04635620117188 186.1803436279297 197.36068725585938 -line 193.6339111328125 193.6339111328125 -line 197.36068725585938 186.1803436279297 -close -move 152.63931274414062 163.8196563720703 -line 175.0 175.0 -line 163.8196563720703 152.63931274414062 -quad 135.19102478027344 166.95364379882812 119.82232666015625 182.32232666015625 -quad 110.7036361694336 191.44102478027344 105.76432037353516 201.3196563720703 -quad 100.0 212.84829711914062 100.0 225.0 -quad 100.0 237.15170288085938 105.76432037353516 248.6803436279297 -quad 110.7036361694336 258.5589904785156 119.82232666015625 267.67767333984375 -quad 135.19102478027344 283.0463562011719 163.8196563720703 297.3606872558594 -line 175.0 275.0 -line 152.63931274414062 286.1803283691406 -quad 166.95364379882812 314.8089904785156 182.32232666015625 330.17767333984375 -quad 191.44102478027344 339.2963562011719 201.3196563720703 344.2356872558594 -quad 212.84829711914062 350.0 225.0 350.0 -quad 237.15170288085938 350.0 248.6803436279297 344.2356872558594 -quad 258.5589904785156 339.2963562011719 267.67767333984375 330.17767333984375 -quad 283.0463562011719 314.8089904785156 297.3606872558594 286.1803283691406 -line 275.0 275.0 -line 286.1803283691406 297.3606872558594 -quad 314.8089904785156 283.0463562011719 330.17767333984375 267.67767333984375 -quad 339.2963562011719 258.5589904785156 344.2356872558594 248.6803436279297 -quad 350.0 237.15170288085938 350.0 225.0 -quad 350.0 212.84829711914062 344.2356872558594 201.3196563720703 -quad 339.2963562011719 191.44102478027344 330.17767333984375 182.32232666015625 -quad 314.8089904785156 166.95364379882812 286.1803283691406 152.63931274414062 -line 275.0 175.0 -line 297.3606872558594 163.8196563720703 -quad 283.0463562011719 135.19102478027344 267.67767333984375 119.82232666015625 -quad 258.5589904785156 110.7036361694336 248.6803436279297 105.76432037353516 -quad 237.15170288085938 100.0 225.0 100.0 -quad 212.84829711914062 100.0 201.3196563720703 105.76432037353516 -quad 191.44102478027344 110.7036361694336 182.32232666015625 119.82232666015625 -quad 166.95364379882812 135.19102478027344 152.63931274414062 163.8196563720703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100RB(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100RB(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100RB(100,100).shape (working copy) @@ -1,122 +0,0 @@ -move 416.6025085449219 347.2649841308594 -cubic 393.6332702636719 312.8111267089844 385.1694641113281 293.5702819824219 381.7149353027344 275.484130859375 -cubic 376.5341491699219 248.3602294921875 350.34600830078125 230.57183837890625 323.22210693359375 235.7526397705078 -cubic 296.09820556640625 240.9334259033203 278.3098449707031 267.1215515136719 283.4906311035156 294.2454528808594 -cubic 289.07122802734375 323.4625549316406 305.6015930175781 361.0411682128906 333.3974914550781 402.7350158691406 -cubic 348.7151184082031 425.7114562988281 379.7585754394531 431.9201354980469 402.7350158691406 416.6025085449219 -cubic 425.7114562988281 401.2848815917969 431.9201354980469 370.2414245605469 416.6025085449219 347.2649841308594 -close -move 398.080810546875 207.46630859375 -cubic 408.620849609375 181.4115753173828 421.8249816894531 144.18801879882812 424.4771423339844 94.79749298095703 -cubic 425.95782470703125 67.22297668457031 404.8045959472656 43.66908645629883 377.2300720214844 42.18840408325195 -cubic 349.65557861328125 40.70771789550781 326.1016845703125 61.86094665527344 324.6210021972656 89.43545532226562 -cubic 322.7442626953125 124.38560485839844 315.1024475097656 145.92848205566406 305.3787841796875 169.96524047851562 -cubic 295.02313232421875 195.56419372558594 307.38031005859375 224.71116638183594 332.979248046875 235.06680297851562 -cubic 358.5782165527344 245.4224395751953 387.7251892089844 233.0652618408203 398.080810546875 207.46630859375 -close -move 339.0412292480469 171.78634643554688 -cubic 352.7353820800781 216.5049591064453 366.765625 238.15203857421875 369.0575256347656 257.425048828125 -cubic 372.318359375 284.8460693359375 397.19091796875 304.4317932128906 424.6119384765625 301.17095947265625 -cubic 452.0329895019531 297.91015625 471.61871337890625 273.03759765625 468.3578796386719 245.61656188964844 -cubic 463.3216247558594 203.26565551757812 444.2575378417969 173.8519287109375 434.6583557128906 142.5055694580078 -cubic 426.57269287109375 116.10163116455078 398.61334228515625 101.25173950195312 372.20941162109375 109.33740234375 -cubic 345.80548095703125 117.42306518554688 330.95556640625 145.3824005126953 339.0412292480469 171.78634643554688 -close -move 349.3143310546875 321.5670471191406 -cubic 344.7185974121094 329.6937255859375 339.76849365234375 337.7084655761719 333.3974914550781 347.2649841308594 -line 402.7350158691406 416.6025085449219 -cubic 423.4004211425781 402.8255615234375 438.29656982421875 394.642578125 452.5959167480469 388.6507873535156 -cubic 478.0646057128906 377.9787292480469 490.05963134765625 348.6808776855469 479.3875732421875 323.21221923828125 -cubic 468.7155456542969 297.7435302734375 439.4176940917969 285.74847412109375 413.9490051269531 296.4205322265625 -cubic 394.7784729003906 304.4535217285156 371.49664306640625 317.2430419921875 347.2649841308594 333.3974914550781 -line 375.0 375.0 -line 416.6025085449219 402.7350158691406 -cubic 423.936767578125 391.7336120605469 430.8135986328125 380.5992431640625 436.3594970703125 370.7924499511719 -cubic 449.9527282714844 346.7555847167969 441.4864807128906 316.2503967285156 417.4496154785156 302.65716552734375 -cubic 393.41278076171875 289.06396484375 362.9075622558594 297.5301818847656 349.3143310546875 321.5670471191406 -close -move 513.140380859375 386.30816650390625 -cubic 535.9053344726562 394.5214538574219 566.9545288085938 411.4459228515625 616.032958984375 420.0552062988281 -cubic 643.2318725585938 424.826416015625 669.1488037109375 406.6451416015625 673.9200439453125 379.44622802734375 -cubic 678.6912231445312 352.2472839355469 660.5099487304688 326.33038330078125 633.31103515625 321.5591735839844 -cubic 600.4013671875 315.78619384765625 577.0438842773438 303.0543518066406 547.0777587890625 292.2430114746094 -cubic 521.1024169921875 282.8714599609375 492.44805908203125 296.3315124511719 483.07647705078125 322.306884765625 -cubic 473.7049255371094 348.2822570800781 487.1650085449219 376.9366149902344 513.140380859375 386.30816650390625 -close -move 617.0698852539062 329.76470947265625 -cubic 567.924560546875 338.2152404785156 536.6578369140625 355.11834716796875 513.7924194335938 363.455322265625 -cubic 487.848876953125 372.91461181640625 474.4857482910156 401.61431884765625 483.9450378417969 427.557861328125 -cubic 493.40435791015625 453.50140380859375 522.10400390625 466.8645324707031 548.0475463867188 457.4052429199219 -cubic 577.7823486328125 446.5636291503906 601.0445556640625 433.9878234863281 634.0161743164062 428.318359375 -cubic 661.2310180664062 423.6387634277344 679.4994506835938 397.7832336425781 674.8198852539062 370.5683898925781 -cubic 670.1402587890625 343.3535461425781 644.2847290039062 325.0851135253906 617.0698852539062 329.76470947265625 -close -move 453.1929016113281 361.5979919433594 -cubic 438.7645263671875 355.6190185546875 423.7151794433594 347.38427734375 402.7350158691406 333.3974914550781 -line 333.3974914550781 402.7350158691406 -cubic 339.58453369140625 412.01556396484375 344.4195861816406 419.8247375488281 348.92999267578125 427.7552490234375 -cubic 362.5818786621094 451.75885009765625 393.107666015625 460.15057373046875 417.1112365722656 446.4986877441406 -cubic 441.1148376464844 432.8468322753906 449.5065612792969 402.3210144042969 435.85467529296875 378.31744384765625 -cubic 430.423095703125 368.7672424316406 423.7221374511719 357.9444274902344 416.6025085449219 347.2649841308594 -line 375.0 375.0 -line 347.2649841308594 416.6025085449219 -cubic 371.88037109375 433.0127868652344 395.4967346191406 445.93524169921875 414.9106750488281 453.9801940917969 -cubic 440.42132568359375 464.5515441894531 469.6715393066406 452.44085693359375 480.2428894042969 426.9302062988281 -cubic 490.8142395019531 401.4195556640625 478.70355224609375 372.1693420410156 453.1929016113281 361.5979919433594 -close -move 369.1094665527344 492.12274169921875 -cubic 366.9789123535156 511.3402099609375 353.1129455566406 532.7289428710938 339.3274841308594 577.28369140625 -cubic 331.1652526855469 603.6640625 345.9339904785156 631.6663818359375 372.3143615722656 639.82861328125 -cubic 398.6947326660156 647.9908447265625 426.6970520019531 633.2221069335938 434.8592834472656 606.8417358398438 -cubic 444.5531311035156 575.5111083984375 463.7622985839844 545.8802490234375 468.5005187988281 503.14178466796875 -cubic 471.5433349609375 475.6957092285156 451.7605895996094 450.9795837402344 424.31451416015625 447.936767578125 -cubic 396.8684387207031 444.8939514160156 372.15228271484375 464.6766662597656 369.1094665527344 492.12274169921875 -close -move 424.5281066894531 656.1770629882812 -cubic 422.0138244628906 606.81005859375 408.9500427246094 569.4842529296875 398.41424560546875 543.359130859375 -cubic 388.08612060546875 517.7490234375 358.95245361328125 505.3605651855469 333.3423767089844 515.688720703125 -cubic 307.7322998046875 526.0167846679688 295.34381103515625 555.1504516601562 305.67193603515625 580.7605590820312 -cubic 315.3349304199219 604.7213745117188 322.87506103515625 626.2650756835938 324.6575622558594 661.2634887695312 -cubic 326.0621337890625 688.8419799804688 349.55755615234375 710.0601196289062 377.13604736328125 708.6555786132812 -cubic 404.71453857421875 707.2509765625 425.93267822265625 683.7555541992188 424.5281066894531 656.1770629882812 -close -move 381.6192321777344 475.02655029296875 -cubic 384.9316101074219 457.0035095214844 393.2373046875 437.9017639160156 416.1368713378906 403.4346618652344 -cubic 431.418212890625 380.43408203125 425.1605224609375 349.40045166015625 402.159912109375 334.1191101074219 -cubic 379.1593322753906 318.8377990722656 348.125732421875 325.095458984375 332.8443908691406 348.0960388183594 -cubic 305.05487060546875 389.9232177734375 288.652099609375 427.64691162109375 283.2664794921875 456.9506530761719 -cubic 278.27496337890625 484.1100158691406 296.24554443359375 510.1734619140625 323.4049072265625 515.1649780273438 -cubic 350.56427001953125 520.156494140625 376.6277160644531 502.1859130859375 381.6192321777344 475.02655029296875 -close -move 276.00128173828125 368.1844177246094 -cubic 264.04541015625 370.5541076660156 259.4473571777344 370.1716613769531 248.3259735107422 367.30706787109375 -cubic 237.16110229492188 364.4312744140625 225.57237243652344 359.2641906738281 208.2852783203125 352.2509460449219 -cubic 182.69662475585938 341.8698425292969 153.53738403320312 354.1980285644531 143.1562957763672 379.78668212890625 -cubic 132.7751922607422 405.3753356933594 145.10336303710938 434.5345458984375 170.6920166015625 444.9156494140625 -cubic 186.40301513671875 451.2894592285156 204.09718322753906 459.1788330078125 223.38267517089844 464.1462707519531 -cubic 242.7116241455078 469.1249084472656 269.73138427734375 471.3724365234375 295.443359375 466.2762451171875 -cubic 322.5306701660156 460.907470703125 340.13702392578125 434.59661865234375 334.76824951171875 407.5093078613281 -cubic 329.39947509765625 380.4219970703125 303.0885925292969 362.8156433105469 276.00128173828125 368.1844177246094 -close -move 95.76884460449219 325.57635498046875 -cubic 89.34386444091797 325.21356201171875 81.95802307128906 325.0 75.0 325.0 -line 75.0 425.0 -cubic 113.22175598144531 425.0 146.46783447265625 418.63238525390625 170.85108947753906 411.2436828613281 -cubic 197.2786407470703 403.2355041503906 212.2104949951172 375.31982421875 204.20233154296875 348.89227294921875 -cubic 196.19415283203125 322.4647216796875 168.2784881591797 307.5328674316406 141.85093688964844 315.5410461425781 -cubic 122.49620819091797 321.4059753417969 103.73149108886719 325.0 75.0 325.0 -line 75.0 425.0 -cubic 80.51260375976562 425.0 85.0790023803711 425.1320495605469 90.13096618652344 425.41729736328125 -cubic 117.7012710571289 426.9741516113281 141.31350708007812 405.8860778808594 142.870361328125 378.3157653808594 -cubic 144.42721557617188 350.7454833984375 123.33916473388672 327.1332092285156 95.76884460449219 325.57635498046875 -close -move 256.9715270996094 380.99822998046875 -cubic 265.36279296875 379.93328857421875 269.4437561035156 380.0921325683594 279.8514709472656 382.6771545410156 -cubic 291.7265319824219 385.62664794921875 302.9297790527344 390.2053527832031 320.8934631347656 400.3058166503906 -cubic 344.9637145996094 413.8398132324219 375.4479675292969 405.2984924316406 388.9819641113281 381.2282409667969 -cubic 402.5159606933594 357.1579895019531 393.9746398925781 326.6737365722656 369.9043884277344 313.1397399902344 -cubic 346.5192565917969 299.990966796875 322.85748291015625 290.3204345703125 303.9566650390625 285.6259460449219 -cubic 283.5884704589844 280.56695556640625 260.982666015625 279.68707275390625 244.38150024414062 281.7939453125 -cubic 216.98699951171875 285.2705993652344 197.59774780273438 310.2966003417969 201.0743865966797 337.69110107421875 -cubic 204.55104064941406 365.0856018066406 229.57701110839844 384.474853515625 256.9715270996094 380.99822998046875 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(100,100).shape (working copy) @@ -1,148 +0,0 @@ -move 416.6025085449219 347.2649841308594 -cubic 393.6332702636719 312.8111267089844 385.1694641113281 293.5702819824219 381.7149353027344 275.484130859375 -line 372.3342590332031 226.37196350097656 -line 274.1099853515625 245.13331604003906 -line 283.4906311035156 294.2454528808594 -cubic 289.07122802734375 323.4625549316406 305.6015930175781 361.0411682128906 333.3974914550781 402.7350158691406 -line 361.13250732421875 444.3375244140625 -line 444.3375244140625 388.86749267578125 -line 416.6025085449219 347.2649841308594 -close -move 398.080810546875 207.46630859375 -cubic 408.620849609375 181.4115753173828 421.8249816894531 144.18801879882812 424.4771423339844 94.79749298095703 -line 427.1581726074219 44.86941909790039 -line 327.3020324707031 39.507389068603516 -line 324.6210021972656 89.43545532226562 -cubic 322.7442626953125 124.38560485839844 315.1024475097656 145.92848205566406 305.3787841796875 169.96524047851562 -line 286.62823486328125 216.31625366210938 -line 379.3302917480469 253.81732177734375 -line 398.080810546875 207.46630859375 -close -move 339.0412292480469 171.78634643554688 -cubic 352.7353820800781 216.5049591064453 366.765625 238.15203857421875 369.0575256347656 257.425048828125 -line 374.9617614746094 307.0752258300781 -line 474.2621154785156 295.2667541503906 -line 468.3578796386719 245.61656188964844 -cubic 463.3216247558594 203.26565551757812 444.2575378417969 173.8519287109375 434.6583557128906 142.5055694580078 -line 420.0179748535156 94.69701385498047 -line 324.4008483886719 123.97777557373047 -line 339.0412292480469 171.78634643554688 -close -move 349.3143310546875 321.5670471191406 -cubic 344.7185974121094 329.6937255859375 339.76849365234375 337.7084655761719 333.3974914550781 347.2649841308594 -line 402.7350158691406 416.6025085449219 -cubic 423.4004211425781 402.8255615234375 438.29656982421875 394.642578125 452.5959167480469 388.6507873535156 -line 498.7110290527344 369.32733154296875 -line 460.06414794921875 277.0970764160156 -line 413.9490051269531 296.4205322265625 -cubic 394.7784729003906 304.4535217285156 371.49664306640625 317.2430419921875 347.2649841308594 333.3974914550781 -line 375.0 375.0 -line 416.6025085449219 402.7350158691406 -cubic 423.936767578125 391.7336120605469 430.8135986328125 380.5992431640625 436.3594970703125 370.7924499511719 -line 460.9721984863281 327.2698669433594 -line 373.9270324707031 278.0444641113281 -line 349.3143310546875 321.5670471191406 -close -move 513.140380859375 386.30816650390625 -cubic 535.9053344726562 394.5214538574219 566.9545288085938 411.4459228515625 616.032958984375 420.0552062988281 -line 665.281005859375 428.6942443847656 -line 682.5590209960938 330.1982116699219 -line 633.31103515625 321.5591735839844 -cubic 600.4013671875 315.78619384765625 577.0438842773438 303.0543518066406 547.0777587890625 292.2430114746094 -line 500.0451965332031 275.2743225097656 -line 466.1077880859375 369.3394775390625 -line 513.140380859375 386.30816650390625 -close -move 617.0698852539062 329.76470947265625 -cubic 567.924560546875 338.2152404785156 536.6578369140625 355.11834716796875 513.7924194335938 363.455322265625 -line 466.8174743652344 380.5829162597656 -line 501.07257080078125 474.53277587890625 -line 548.0475463867188 457.4052429199219 -cubic 577.7823486328125 446.5636291503906 601.0445556640625 433.9878234863281 634.0161743164062 428.318359375 -line 683.2930297851562 419.84521484375 -line 666.3466796875 321.29156494140625 -line 617.0698852539062 329.76470947265625 -close -move 453.1929016113281 361.5979919433594 -cubic 438.7645263671875 355.6190185546875 423.7151794433594 347.38427734375 402.7350158691406 333.3974914550781 -line 333.3974914550781 402.7350158691406 -cubic 339.58453369140625 412.01556396484375 344.4195861816406 419.8247375488281 348.92999267578125 427.7552490234375 -line 373.6488952636719 471.21759033203125 -line 460.5735778808594 421.77978515625 -line 435.85467529296875 378.31744384765625 -cubic 430.423095703125 368.7672424316406 423.7221374511719 357.9444274902344 416.6025085449219 347.2649841308594 -line 375.0 375.0 -line 347.2649841308594 416.6025085449219 -cubic 371.88037109375 433.0127868652344 395.4967346191406 445.93524169921875 414.9106750488281 453.9801940917969 -line 461.1017761230469 473.1213073730469 -line 499.3840026855469 380.7391052246094 -line 453.1929016113281 361.5979919433594 -close -move 369.1094665527344 492.12274169921875 -cubic 366.9789123535156 511.3402099609375 353.1129455566406 532.7289428710938 339.3274841308594 577.28369140625 -line 324.5484619140625 625.0496215820312 -line 420.08026123046875 654.6076049804688 -line 434.8592834472656 606.8417358398438 -cubic 444.5531311035156 575.5111083984375 463.7622985839844 545.8802490234375 468.5005187988281 503.14178466796875 -line 474.0100402832031 453.4462585449219 -line 374.6189880371094 442.4272155761719 -line 369.1094665527344 492.12274169921875 -close -move 424.5281066894531 656.1770629882812 -cubic 422.0138244628906 606.81005859375 408.9500427246094 569.4842529296875 398.41424560546875 543.359130859375 -line 379.7135314941406 496.98797607421875 -line 286.9712219238281 534.389404296875 -line 305.67193603515625 580.7605590820312 -cubic 315.3349304199219 604.7213745117188 322.87506103515625 626.2650756835938 324.6575622558594 661.2634887695312 -line 327.2007751464844 711.1987915039062 -line 427.0713195800781 706.1123046875 -line 424.5281066894531 656.1770629882812 -close -move 381.6192321777344 475.02655029296875 -cubic 384.9316101074219 457.0035095214844 393.2373046875 437.9017639160156 416.1368713378906 403.4346618652344 -line 443.8061828613281 361.7884216308594 -line 360.5137023925781 306.4497985839844 -line 332.8443908691406 348.0960388183594 -cubic 305.05487060546875 389.9232177734375 288.652099609375 427.64691162109375 283.2664794921875 456.9506530761719 -line 274.2285461425781 506.12701416015625 -line 372.5812683105469 524.2029418945312 -line 381.6192321777344 475.02655029296875 -close -move 276.00128173828125 368.1844177246094 -cubic 264.04541015625 370.5541076660156 259.4473571777344 370.1716613769531 248.3259735107422 367.30706787109375 -cubic 237.16110229492188 364.4312744140625 225.57237243652344 359.2641906738281 208.2852783203125 352.2509460449219 -line 161.9529266357422 333.4543151855469 -line 124.35967254638672 426.1190185546875 -line 170.6920166015625 444.9156494140625 -cubic 186.40301513671875 451.2894592285156 204.09718322753906 459.1788330078125 223.38267517089844 464.1462707519531 -cubic 242.7116241455078 469.1249084472656 269.73138427734375 471.3724365234375 295.443359375 466.2762451171875 -line 344.4892578125 456.5552062988281 -line 325.0472106933594 358.46337890625 -line 276.00128173828125 368.1844177246094 -close -move 95.76884460449219 325.57635498046875 -cubic 89.34386444091797 325.21356201171875 81.95802307128906 325.0 75.0 325.0 -line 75.0 425.0 -cubic 113.22175598144531 425.0 146.46783447265625 418.63238525390625 170.85108947753906 411.2436828613281 -line 218.70240783691406 396.74359130859375 -line 189.70225524902344 301.0409851074219 -line 141.85093688964844 315.5410461425781 -cubic 122.49620819091797 321.4059753417969 103.73149108886719 325.0 75.0 325.0 -line 75.0 425.0 -cubic 80.51260375976562 425.0 85.0790023803711 425.1320495605469 90.13096618652344 425.41729736328125 -line 140.05142211914062 428.2362365722656 -line 145.6893310546875 328.3952941894531 -line 95.76884460449219 325.57635498046875 -close -move 256.9715270996094 380.99822998046875 -cubic 265.36279296875 379.93328857421875 269.4437561035156 380.0921325683594 279.8514709472656 382.6771545410156 -cubic 291.7265319824219 385.62664794921875 302.9297790527344 390.2053527832031 320.8934631347656 400.3058166503906 -line 364.47650146484375 424.811279296875 -line 413.4874267578125 337.64520263671875 -line 369.9043884277344 313.1397399902344 -cubic 346.5192565917969 299.990966796875 322.85748291015625 290.3204345703125 303.9566650390625 285.6259460449219 -cubic 283.5884704589844 280.56695556640625 260.982666015625 279.68707275390625 244.38150024414062 281.7939453125 -line 194.7793731689453 288.0889587402344 -line 207.36936950683594 387.2932434082031 -line 256.9715270996094 380.99822998046875 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100RB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100RB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1_d100RB(20,20).shape (working copy) @@ -1,184 +0,0 @@ -move 164.6562957763672 125.0 -cubic 171.0732879638672 125.0 177.65313720703125 125.0 184.39581298828125 125.0 -cubic 212.0100555419922 124.99999237060547 234.39581298828125 102.61422729492188 234.39581298828125 74.99999237060547 -cubic 234.3957977294922 47.3857536315918 212.0100555419922 25.000003814697266 184.39581298828125 25.0 -cubic 177.65313720703125 25.0 171.0732879638672 25.0 164.6562957763672 25.0 -cubic 137.04205322265625 25.0 114.65629577636719 47.38576126098633 114.65629577636719 75.0 -cubic 114.65629577636719 102.6142349243164 137.04205322265625 125.0 164.6562957763672 125.0 -close -move 204.3081512451172 125.0 -cubic 211.0233917236328 125.0 217.88612365722656 125.0 224.8963623046875 125.0 -cubic 252.51060485839844 125.0 274.8963623046875 102.6142349243164 274.8963623046875 74.99999237060547 -cubic 274.8963623046875 47.38575744628906 252.51060485839844 25.000001907348633 224.8963623046875 25.0 -cubic 217.88612365722656 25.0 211.0233917236328 25.0 204.3081512451172 25.0 -cubic 176.69390869140625 24.999998092651367 154.3081512451172 47.38575744628906 154.3081512451172 74.99999237060547 -cubic 154.3081512451172 102.6142349243164 176.69390869140625 125.0 204.3081512451172 125.0 -close -move 244.27955627441406 125.0 -cubic 250.86126708984375 125.0 257.5636291503906 125.0 264.38665771484375 125.0 -cubic 292.0008850097656 125.0 314.38665771484375 102.61424255371094 314.38665771484375 75.00000762939453 -cubic 314.38665771484375 47.385765075683594 292.0008850097656 24.999998092651367 264.38665771484375 25.0 -cubic 257.5636291503906 25.0 250.86126708984375 25.0 244.27955627441406 25.0 -cubic 216.66531372070312 24.999998092651367 194.27955627441406 47.38575744628906 194.27955627441406 74.99999237060547 -cubic 194.27955627441406 102.6142349243164 216.66531372070312 125.0 244.27955627441406 125.0 -close -move 284.82647705078125 125.0 -cubic 291.2139892578125 125.0 297.70025634765625 125.0 304.2853088378906 125.0 -cubic 331.8995361328125 124.99999237060547 354.2853088378906 102.61422729492188 354.2853088378906 74.99999237060547 -cubic 354.2852783203125 47.38574981689453 331.8995361328125 25.0000057220459 304.2853088378906 25.0 -cubic 297.70025634765625 25.0 291.2139892578125 25.0 284.82647705078125 25.0 -cubic 257.2122497558594 25.00000762939453 234.82647705078125 47.38577651977539 234.8264923095703 75.00001525878906 -cubic 234.82650756835938 102.61425018310547 257.2122497558594 124.99999237060547 284.82647705078125 125.0 -close -move 324.3367004394531 125.0 -cubic 331.1192626953125 125.0 338.0005798339844 125.0 344.9806823730469 125.0 -cubic 372.59490966796875 125.0 394.9806823730469 102.61424255371094 394.9806823730469 75.00000762939453 -cubic 394.9806823730469 47.38576889038086 372.59490966796875 24.999998092651367 344.9806823730469 25.0 -cubic 338.0005798339844 25.0 331.1192626953125 25.0 324.3367004394531 25.0 -cubic 296.72247314453125 24.999998092651367 274.3367004394531 47.38575744628906 274.3367004394531 74.99999237060547 -cubic 274.3367004394531 102.6142349243164 296.72247314453125 125.0 324.3367004394531 125.0 -close -move 364.3852233886719 125.0 -cubic 370.92333984375 125.0 377.5437927246094 125.0 384.24658203125 125.0 -cubic 411.8608093261719 125.0 434.24658203125 102.6142349243164 434.24658203125 75.0 -cubic 434.24658203125 47.38576126098633 411.8608093261719 25.0 384.24658203125 25.0 -cubic 377.5437927246094 25.0 370.92333984375 25.0 364.3852233886719 25.0 -cubic 336.77099609375 24.99999237060547 314.3852233886719 47.38574981689453 314.3852233886719 74.99998474121094 -cubic 314.38519287109375 102.61421966552734 336.77099609375 125.00000762939453 364.3852233886719 125.0 -close -move 404.6019592285156 125.0 -cubic 411.2171630859375 125.0 417.90875244140625 125.0 424.6767272949219 125.0 -cubic 452.29095458984375 125.00000762939453 474.6767272949219 102.61424255371094 474.6767272949219 75.00000762939453 -cubic 474.6767272949219 47.38576889038086 452.29095458984375 24.999996185302734 424.6767272949219 25.0 -cubic 417.90875244140625 25.0 411.2171630859375 25.0 404.6019592285156 25.0 -cubic 376.98773193359375 25.0000057220459 354.6019592285156 47.385772705078125 354.6019592285156 75.00000762939453 -cubic 354.60198974609375 102.61425018310547 376.98773193359375 124.99999237060547 404.6019592285156 125.0 -close -move 444.2778015136719 125.0 -cubic 450.88116455078125 125.0 457.55426025390625 125.0 464.2969970703125 125.0 -cubic 491.9112243652344 125.0 514.2969970703125 102.61424255371094 514.2969970703125 75.00000762939453 -cubic 514.2969970703125 47.385765075683594 491.9112243652344 24.999998092651367 464.2969970703125 25.0 -cubic 457.55426025390625 25.0 450.88116455078125 25.0 444.2778015136719 25.0 -cubic 416.66357421875 25.0 394.2778015136719 47.38576126098633 394.2778015136719 75.0 -cubic 394.2778015136719 102.6142349243164 416.66357421875 125.0 444.2778015136719 125.0 -close -move 484.7343444824219 125.0 -cubic 491.2939453125 125.0 497.9168701171875 125.0 504.6031188964844 125.0 -cubic 532.2173461914062 124.99999237060547 554.6030883789062 102.61422729492188 554.6030883789062 74.99999237060547 -cubic 554.6030883789062 47.3857536315918 532.2173461914062 25.0000057220459 504.6031188964844 25.0 -cubic 497.9168701171875 25.0 491.2939453125 25.0 484.7343444824219 25.0 -cubic 457.1201171875 24.9999942779541 434.7343444824219 47.3857536315918 434.7343444824219 74.99999237060547 -cubic 434.7343444824219 102.61422729492188 457.1201171875 125.00000762939453 484.7343444824219 125.0 -close -move 524.2684326171875 125.0 -cubic 530.8832397460938 125.0 537.557861328125 125.0 544.2921752929688 125.0 -cubic 571.9064331054688 125.0 594.2921752929688 102.61424255371094 594.2921752929688 75.00000762939453 -cubic 594.2921752929688 47.38576889038086 571.9064331054688 24.999996185302734 544.2921752929688 25.0 -cubic 537.557861328125 25.0 530.8832397460938 25.0 524.2684326171875 25.0 -cubic 496.6542053222656 24.999984741210938 474.2684326171875 47.38573455810547 474.2684020996094 74.99996948242188 -cubic 474.2684020996094 102.61421203613281 496.6542053222656 125.00001525878906 524.2684326171875 125.0 -close -move 564.6744384765625 125.0 -cubic 568.1013793945312 125.0 571.543212890625 125.0 575.0 125.0 -line 575.0 25.0 -line 565.0 25.0 -cubic 537.3857421875 25.0 515.0 47.38576126098633 515.0 75.0 -cubic 515.0 102.6142349243164 537.3857421875 125.0 565.0 125.0 -line 575.0 125.0 -line 575.0 25.0 -cubic 571.543212890625 25.0 568.1013793945312 25.0 564.6744384765625 25.0 -cubic 537.0601806640625 25.0 514.6744384765625 47.385765075683594 514.6744384765625 75.0 -cubic 514.6744384765625 102.61424255371094 537.0601806640625 125.0 564.6744384765625 125.0 -close -move 545.0 25.0 -line 525.0 25.0 -cubic 497.3857727050781 25.0 475.0 47.38576126098633 475.0 75.0 -cubic 475.0 102.6142349243164 497.3857727050781 125.0 525.0 125.0 -line 545.0 125.0 -cubic 572.6142578125 125.0 595.0 102.6142349243164 595.0 75.0 -cubic 595.0 47.38576126098633 572.6142578125 25.0 545.0 25.0 -close -move 505.0 25.0 -line 485.0 25.0 -cubic 457.3857727050781 25.0 435.0 47.38576126098633 435.0 75.0 -cubic 435.0 102.6142349243164 457.3857727050781 125.0 485.0 125.0 -line 505.0 125.0 -cubic 532.6142578125 125.0 555.0 102.6142349243164 555.0 75.0 -cubic 555.0 47.38576126098633 532.6142578125 25.0 505.0 25.0 -close -move 465.0 25.0 -line 445.0 25.0 -cubic 417.3857727050781 25.0 395.0 47.38576126098633 395.0 75.0 -cubic 395.0 102.6142349243164 417.3857727050781 125.0 445.0 125.0 -line 465.0 125.0 -cubic 492.6142272949219 125.0 515.0 102.6142349243164 515.0 75.0 -cubic 515.0 47.38576126098633 492.6142272949219 25.0 465.0 25.0 -close -move 425.0 25.0 -line 405.0 25.0 -cubic 377.3857727050781 25.0 355.0 47.38576126098633 355.0 75.0 -cubic 355.0 102.6142349243164 377.3857727050781 125.0 405.0 125.0 -line 425.0 125.0 -cubic 452.6142272949219 125.0 475.0 102.6142349243164 475.0 75.0 -cubic 475.0 47.38576126098633 452.6142272949219 25.0 425.0 25.0 -close -move 385.0 25.0 -line 365.0 25.0 -cubic 337.3857727050781 25.0 315.0 47.38576126098633 315.0 75.0 -cubic 315.0 102.6142349243164 337.3857727050781 125.0 365.0 125.0 -line 385.0 125.0 -cubic 412.6142272949219 125.0 435.0 102.6142349243164 435.0 75.0 -cubic 435.0 47.38576126098633 412.6142272949219 25.0 385.0 25.0 -close -move 345.0 25.0 -line 325.0 25.0 -cubic 297.3857727050781 25.0 275.0 47.38576126098633 275.0 75.0 -cubic 275.0 102.6142349243164 297.3857727050781 125.0 325.0 125.0 -line 345.0 125.0 -cubic 372.6142272949219 125.0 395.0 102.6142349243164 395.0 75.0 -cubic 395.0 47.38576126098633 372.6142272949219 25.0 345.0 25.0 -close -move 305.0 25.0 -line 285.0 25.0 -cubic 257.3857727050781 25.0 235.0 47.38576126098633 235.0 75.0 -cubic 235.0 102.6142349243164 257.3857727050781 125.0 285.0 125.0 -line 305.0 125.0 -cubic 332.6142272949219 125.0 355.0 102.6142349243164 355.0 75.0 -cubic 355.0 47.38576126098633 332.6142272949219 25.0 305.0 25.0 -close -move 265.0 25.0 -line 245.0 25.0 -cubic 217.38575744628906 25.0 195.0 47.38576126098633 195.0 75.0 -cubic 195.0 102.6142349243164 217.38575744628906 125.0 245.0 125.0 -line 265.0 125.0 -cubic 292.6142272949219 125.0 315.0 102.6142349243164 315.0 75.0 -cubic 315.0 47.38576126098633 292.6142272949219 25.0 265.0 25.0 -close -move 225.0 25.0 -line 205.0 25.0 -cubic 177.38575744628906 25.0 155.0 47.38576126098633 155.0 75.0 -cubic 155.0 102.6142349243164 177.38575744628906 125.0 205.0 125.0 -line 225.0 125.0 -cubic 252.61424255371094 125.0 275.0 102.6142349243164 275.0 75.0 -cubic 275.0 47.38576126098633 252.61424255371094 25.0 225.0 25.0 -close -move 185.0 25.0 -line 165.0 25.0 -cubic 137.38575744628906 25.0 115.0 47.38576126098633 115.0 75.0 -cubic 115.0 102.6142349243164 137.38575744628906 125.0 165.0 125.0 -line 185.0 125.0 -cubic 212.61424255371094 125.0 235.0 102.6142349243164 235.0 75.0 -cubic 235.0 47.38576126098633 212.61424255371094 25.0 185.0 25.0 -close -move 145.0 25.0 -line 125.0 25.0 -line 125.0 125.0 -cubic 131.22222900390625 125.0 137.63803100585938 125.0 144.24740600585938 125.0 -cubic 171.8616485595703 125.0 194.24740600585938 102.61424255371094 194.24740600585938 75.0 -cubic 194.24740600585938 47.385765075683594 171.8616485595703 25.0 144.24740600585938 25.0 -cubic 137.63803100585938 25.0 131.22222900390625 25.0 125.0 25.0 -line 125.0 125.0 -line 145.0 125.0 -cubic 172.61424255371094 125.0 195.0 102.6142349243164 195.0 75.0 -cubic 195.0 47.38576126098633 172.61424255371094 25.0 145.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100RB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100RB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100RB(50,50).shape (working copy) @@ -1,128 +0,0 @@ -move 39.64466094970703 110.35533905029297 -cubic 53.46352005004883 124.17420196533203 69.93992614746094 137.81761169433594 85.29571533203125 148.3174285888672 -cubic 108.09063720703125 163.90390014648438 139.20489501953125 158.06028747558594 154.79136657714844 135.26536560058594 -cubic 170.37783813476562 112.47045135498047 164.5342254638672 81.35619354248047 141.7393035888672 65.76972961425781 -cubic 130.17787170410156 57.864376068115234 120.8560791015625 50.1453971862793 110.35533905029297 39.64466094970703 -cubic 90.8291244506836 20.118446350097656 59.170875549316406 20.118446350097656 39.64466094970703 39.64466094970703 -cubic 20.118446350097656 59.170875549316406 20.118446350097656 90.8291244506836 39.64466094970703 110.35533905029297 -close -move 137.77206420898438 177.0624237060547 -cubic 155.7324676513672 184.6744384765625 176.6923828125 191.06687927246094 195.41416931152344 194.71888732910156 -cubic 222.51756286621094 200.00587463378906 248.77516174316406 182.3201904296875 254.06214904785156 155.21681213378906 -cubic 259.3491516113281 128.11341857910156 241.6634521484375 101.8558120727539 214.56005859375 96.5688247680664 -cubic 200.9158935546875 93.90728759765625 189.92333984375 90.55474090576172 176.7942352294922 84.99034118652344 -cubic 151.36923217773438 74.21466827392578 122.02278137207031 86.09029388427734 111.24710845947266 111.51529693603516 -cubic 100.471435546875 136.9403076171875 112.34706115722656 166.2867431640625 137.77206420898438 177.0624237060547 -close -move 255.73570251464844 199.94215393066406 -cubic 274.9934387207031 199.5536651611328 296.85308837890625 196.7846221923828 315.7778625488281 192.30291748046875 -cubic 342.6488952636719 185.93942260742188 359.2735290527344 158.9975128173828 352.9100341796875 132.12649536132812 -cubic 346.5465393066406 105.2554702758789 319.6046142578125 88.63082122802734 292.73358154296875 94.99433135986328 -cubic 278.9968566894531 98.2474136352539 267.6810607910156 99.68083190917969 253.71881103515625 99.96249389648438 -cubic 226.1101837158203 100.51943969726562 204.18048095703125 123.35214233398438 204.7374267578125 150.9607696533203 -cubic 205.29437255859375 178.5693817138672 228.1270751953125 200.4990997314453 255.73570251464844 199.94215393066406 -close -move 372.5917053222656 172.43312072753906 -cubic 389.6183776855469 164.43264770507812 408.2336730957031 153.35556030273438 423.97467041015625 141.7264404296875 -cubic 446.18511962890625 125.31781768798828 450.8883972167969 94.01087951660156 434.4797668457031 71.80044555664062 -cubic 418.0711669921875 49.59001159667969 386.76422119140625 44.8867301940918 364.5538024902344 61.295345306396484 -cubic 352.8178405761719 69.96562957763672 342.67498779296875 76.00115966796875 330.0645751953125 81.92652130126953 -cubic 305.0718688964844 93.6700668334961 294.331298828125 123.45068359375 306.0748596191406 148.44338989257812 -cubic 317.8183898925781 173.43609619140625 347.5989990234375 184.17666625976562 372.5917053222656 172.43312072753906 -close -move 381.7781677246094 47.784828186035156 -cubic 368.4676818847656 62.04071807861328 355.4085998535156 79.00323486328125 345.4768981933594 94.7381820678711 -cubic 330.73760986328125 118.08982849121094 337.71929931640625 148.9686279296875 361.0709533691406 163.70791625976562 -cubic 384.4225769042969 178.4472198486328 415.3013916015625 171.46551513671875 430.0406799316406 148.11387634277344 -cubic 437.4869079589844 136.3167266845703 444.8050231933594 126.81119537353516 454.87091064453125 116.03035736083984 -cubic 473.7164001464844 95.84635162353516 472.6313171386719 64.20670318603516 452.4472961425781 45.36122131347656 -cubic 432.2633056640625 26.515737533569336 400.6236572265625 27.60082244873047 381.7781677246094 47.784828186035156 -close -move 318.7287292480469 148.25949096679688 -cubic 311.804931640625 166.52224731445312 306.2207336425781 187.78759765625 303.310302734375 206.71853637695312 -cubic 299.11419677734375 234.01210021972656 317.83837890625 259.5395202636719 345.1319274902344 263.7356262207031 -cubic 372.42547607421875 267.9317626953125 397.95294189453125 249.20758056640625 402.1490478515625 221.91400146484375 -cubic 404.26666259765625 208.13986206054688 407.1837158203125 197.03140258789062 412.234375 183.7093505859375 -cubic 422.0235900878906 157.8884735107422 409.02734375 129.0207977294922 383.20648193359375 119.23159790039062 -cubic 357.3855895996094 109.44239044189453 328.5179443359375 122.4386215209961 318.7287292480469 148.25949096679688 -close -move 300.5205993652344 267.200439453125 -cubic 301.6821594238281 286.3743896484375 305.31378173828125 308.0723876953125 310.5413818359375 326.81060791015625 -cubic 317.96185302734375 353.4091491699219 345.53973388671875 368.9560546875 372.1382751464844 361.53558349609375 -cubic 398.73681640625 354.1150817871094 414.2837219238281 326.5372314453125 406.8632507324219 299.9386901855469 -cubic 403.06427001953125 286.32135009765625 401.180419921875 275.0658264160156 400.33758544921875 261.1534423828125 -cubic 398.6677551269531 233.58975219726562 374.96929931640625 212.59861755371094 347.4056091308594 214.26846313476562 -cubic 319.8418884277344 215.93829345703125 298.85076904296875 239.63673400878906 300.5205993652344 267.200439453125 -close -move 332.6149597167969 382.8210754394531 -cubic 341.2191467285156 399.4482116699219 352.91571044921875 417.5521240234375 365.0641784667969 432.8330993652344 -cubic 382.248779296875 454.4487609863281 413.70257568359375 458.04083251953125 435.3182067871094 440.85626220703125 -cubic 456.9338684082031 423.6716613769531 460.5259704589844 392.2178649902344 443.34136962890625 370.6022033691406 -cubic 434.2469787597656 359.162841796875 427.82269287109375 349.2193298339844 421.4281005859375 336.86212158203125 -cubic 408.73687744140625 312.3370361328125 378.567138671875 302.7438049316406 354.04205322265625 315.4350280761719 -cubic 329.5169677734375 328.126220703125 319.9237365722656 358.2960205078125 332.6149597167969 382.8210754394531 -close -move 443.8773498535156 374.2577819824219 -cubic 429.1944580078125 361.4681396484375 411.7587890625 349.0103454589844 395.657470703125 339.65911865234375 -cubic 371.7782897949219 325.790771484375 341.1778564453125 333.9061279296875 327.30950927734375 357.7853088378906 -cubic 313.4411315917969 381.66448974609375 321.5565185546875 412.2649230957031 345.4356994628906 426.1332702636719 -cubic 357.45977783203125 433.11651611328125 367.1423034667969 440.0346984863281 378.19537353515625 449.6625671386719 -cubic 399.017822265625 467.8001403808594 430.6011962890625 465.6236267089844 448.73876953125 444.8011474609375 -cubic 466.8763427734375 423.97869873046875 464.6997985839844 392.3953552246094 443.8773498535156 374.2577819824219 -close -move 340.9254455566406 314.8699951171875 -cubic 322.4440612792969 308.68365478515625 300.9758605957031 303.9474792480469 281.9271545410156 301.7971496582031 -cubic 254.48719787597656 298.6995544433594 229.73162841796875 318.4329528808594 226.63404846191406 345.8728942871094 -cubic 223.5364532470703 373.3128356933594 243.2698211669922 398.06842041015625 270.70977783203125 401.166015625 -cubic 284.5505065917969 402.7284240722656 295.72650146484375 405.1940002441406 309.18328857421875 409.69842529296875 -cubic 335.36944580078125 418.4637756347656 363.7032165527344 404.3414611816406 372.4685974121094 378.1553039550781 -cubic 381.23394775390625 351.9691467285156 367.1116027832031 323.6353454589844 340.9254455566406 314.8699951171875 -close -move 221.38644409179688 301.44268798828125 -cubic 202.30743408203125 303.370849609375 180.7848663330078 307.8587951660156 162.2435760498047 313.82940673828125 -cubic 135.9585418701172 322.2936096191406 121.51190948486328 350.46343994140625 129.97610473632812 376.74847412109375 -cubic 138.4403076171875 403.03350830078125 166.61013793945312 417.4801330566406 192.89517211914062 409.01593017578125 -cubic 206.38909912109375 404.6706848144531 217.58346557617188 402.3363952636719 231.44134521484375 400.9359130859375 -cubic 258.9156494140625 398.1593322753906 278.9371032714844 373.6361389160156 276.1605224609375 346.1618347167969 -cubic 273.3839111328125 318.6875305175781 248.86073303222656 298.6661071777344 221.38644409179688 301.44268798828125 -close -move 107.16806030273438 338.0384216308594 -cubic 90.96253204345703 347.21826171875 73.39164733886719 359.4978332519531 58.586387634277344 372.13348388671875 -cubic 37.58189392089844 390.0599365234375 35.08664321899414 421.61968994140625 53.01308822631836 442.6241760253906 -cubic 70.93952941894531 463.6286926269531 102.49929809570312 466.1239318847656 123.50379180908203 448.1974792480469 -cubic 134.6346435546875 438.6977844238281 144.36749267578125 431.8958740234375 156.45596313476562 425.0481872558594 -cubic 180.48304748535156 411.4377136230469 188.9273681640625 380.92645263671875 175.31689453125 356.89935302734375 -cubic 161.70640563964844 332.8722839355469 131.1951446533203 324.4279479980469 107.16806030273438 338.0384216308594 -close -move 132.9136505126953 435.3503112792969 -cubic 145.20071411132812 420.2132263183594 157.0652618408203 402.2710876464844 165.83676147460938 385.772705078125 -cubic 178.79989624023438 361.3902587890625 169.54270935058594 331.1156921386719 145.1602783203125 318.152587890625 -cubic 120.77784729003906 305.189453125 90.5032958984375 314.44659423828125 77.54015350341797 338.82904052734375 -cubic 71.01432037353516 351.103515625 64.48197937011719 360.9820251464844 55.2725944519043 372.32757568359375 -cubic 37.86935043334961 393.7675476074219 41.14177703857422 425.2562255859375 62.581764221191406 442.6594543457031 -cubic 84.0217514038086 460.0627136230469 115.5103988647461 456.790283203125 132.9136505126953 435.3503112792969 -close -move 188.5469512939453 330.0072937011719 -cubic 193.99061584472656 311.32720947265625 197.8720245361328 289.68109130859375 199.25770568847656 270.5355529785156 -cubic 201.2510986328125 242.99334716796875 180.53970336914062 219.05001831054688 152.99749755859375 217.05662536621094 -cubic 125.45530700683594 215.063232421875 101.51197814941406 235.77464294433594 99.51858520507812 263.31683349609375 -cubic 98.51288604736328 277.21240234375 96.49800872802734 288.4490966796875 92.54045867919922 302.0295715332031 -cubic 84.81462097167969 328.5410461425781 100.04338073730469 356.29583740234375 126.55484008789062 364.02166748046875 -cubic 153.06629943847656 371.7475280761719 180.8211212158203 356.5187683105469 188.5469512939453 330.0072937011719 -close -move 197.1775665283203 210.02008056640625 -cubic 194.4879608154297 191.0526885986328 189.14996337890625 169.72569274902344 182.4403533935547 151.397216796875 -cubic 172.94754028320312 125.46591186523438 144.23062133789062 112.1398696899414 118.29931640625 121.63267517089844 -cubic 92.36801147460938 131.12548828125 79.0419692993164 159.84242248535156 88.53478240966797 185.7737274169922 -cubic 93.42644500732422 199.1361541748047 96.21192169189453 210.26499938964844 98.16802978515625 224.05975341796875 -cubic 102.04497528076172 251.40048217773438 127.3519058227539 270.421630859375 154.69264221191406 266.544677734375 -cubic 182.0333709716797 262.667724609375 201.0545196533203 237.36080932617188 197.1775665283203 210.02008056640625 -close -move 156.2572479248047 97.51850128173828 -cubic 146.4932861328125 81.67552947998047 133.60755920410156 64.57386779785156 120.44743347167969 50.19258499145508 -cubic 101.80530548095703 29.820615768432617 70.17813110351562 28.418302536010742 49.80615997314453 47.060428619384766 -cubic 29.434192657470703 65.70256042480469 28.031877517700195 97.32972717285156 46.67400360107422 117.70169830322266 -cubic 56.61268997192383 128.5626220703125 63.81425476074219 138.12037658691406 71.12606811523438 149.98451232910156 -cubic 85.6141586303711 173.4928436279297 116.41634368896484 180.80519104003906 139.92466735839844 166.3170928955078 -cubic 163.43299865722656 151.82901000976562 170.74533081054688 121.02682495117188 156.2572479248047 97.51850128173828 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d1SB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d1SB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d1SB(20,20).shape (working copy) @@ -1,639 +0,0 @@ -move 354.4124755859375 340.1758728027344 -cubic 351.0624084472656 333.98138427734375 348.13299560546875 328.0929260253906 345.58148193359375 322.4598388671875 -line 345.37518310546875 322.00439453125 -line 344.46429443359375 322.4169921875 -line 344.67059326171875 322.8724365234375 -cubic 347.2295837402344 328.5220642089844 350.1746826171875 334.44207763671875 353.5328674316406 340.6515808105469 -line 353.7707214355469 341.0914001464844 -line 354.65032958984375 340.61566162109375 -line 354.4124755859375 340.1758728027344 -close -move 338.23968505859375 304.0128173828125 -cubic 335.9386901855469 297.2212219238281 334.25433349609375 290.84637451171875 333.0939025878906 284.77099609375 -line 333.0000915527344 284.2798767089844 -line 332.01788330078125 284.46746826171875 -line 332.1116638183594 284.9585876464844 -cubic 333.27862548828125 291.06817626953125 334.9805908203125 297.5097351074219 337.2925720214844 304.33367919921875 -line 337.4530029296875 304.8072204589844 -line 338.4001159667969 304.48638916015625 -line 338.23968505859375 304.0128173828125 -close -move 331.0619812011719 265.0423583984375 -cubic 330.9857482910156 258.1825866699219 331.5894470214844 251.6902313232422 332.7119140625 245.35226440429688 -line 332.7991027832031 244.85992431640625 -line 331.8144226074219 244.68553161621094 -line 331.72723388671875 245.17787170410156 -cubic 330.5975646972656 251.5565185546875 329.9852294921875 258.1417541503906 330.0620422363281 265.053466796875 -line 330.0675964355469 265.5534362792969 -line 331.0675354003906 265.5423278808594 -line 331.0619812011719 265.0423583984375 -close -move 337.662841796875 226.10064697265625 -cubic 339.6898498535156 219.91395568847656 342.06488037109375 213.73944091796875 344.62518310546875 207.39236450195312 -line 344.8122253417969 206.92868041992188 -line 343.8848571777344 206.55459594726562 -line 343.69781494140625 207.01828002929688 -cubic 341.13446044921875 213.37286376953125 338.7474060058594 219.5785675048828 336.7125244140625 225.78929138183594 -line 336.5568542480469 226.2644500732422 -line 337.5071716308594 226.5758056640625 -line 337.662841796875 226.10064697265625 -close -move 352.19329833984375 188.90328979492188 -cubic 354.5895690917969 182.97975158691406 357.00494384765625 176.80645751953125 359.3236999511719 170.28172302246094 -line 359.4911193847656 169.81057739257812 -line 358.54888916015625 169.47573852539062 -line 358.3814392089844 169.9468536376953 -cubic 356.0679626464844 176.45677185058594 353.660400390625 182.61004638671875 351.26629638671875 188.5282745361328 -line 351.07879638671875 188.9917755126953 -line 352.00579833984375 189.36679077148438 -line 352.19329833984375 188.90328979492188 -close -move 365.40576171875 151.2457275390625 -cubic 367.1311340332031 145.1184539794922 368.71807861328125 138.6566619873047 370.0952453613281 131.81204223632812 -line 370.1938781738281 131.3218536376953 -line 369.2135009765625 131.12460327148438 -line 369.1148681640625 131.6147918701172 -cubic 367.7419128417969 138.43869018554688 366.16400146484375 144.86361694335938 364.4432067871094 150.9746856689453 -line 364.30767822265625 151.45594787597656 -line 365.2702331542969 151.72702026367188 -line 365.40576171875 151.2457275390625 -close -move 373.2911071777344 112.08507537841797 -cubic 374.0744323730469 105.76521301269531 374.6734619140625 99.1249008178711 375.04833984375 92.1432876586914 -line 375.0751647949219 91.64401245117188 -line 374.0765686035156 91.59037780761719 -line 374.0497741699219 92.08966827392578 -cubic 373.6758728027344 99.05313873291016 373.0799865722656 105.65876007080078 372.2987060546875 111.96206665039062 -line 372.2372131347656 112.4582748413086 -line 373.2296142578125 112.58126831054688 -line 373.2911071777344 112.08507537841797 -close -move 374.5168151855469 78.35945129394531 -cubic 374.5868225097656 85.32308959960938 374.8739929199219 91.96715545654297 375.3463439941406 98.30685424804688 -line 375.38348388671875 98.80545806884766 -line 376.3807067871094 98.73117065429688 -line 376.34356689453125 98.23255157470703 -cubic 375.87237548828125 91.90840148925781 375.58660888671875 85.29646301269531 375.51678466796875 78.34939575195312 -line 375.5117492675781 77.84940338134766 -line 374.51177978515625 77.8594741821289 -line 374.5168151855469 78.35945129394531 -close -move 377.55291748046875 118.3056869506836 -cubic 378.5744323730469 125.22879028320312 379.8184509277344 131.77793884277344 381.2259216308594 137.98973083496094 -line 381.33642578125 138.4773712158203 -line 382.3116760253906 138.2563934326172 -line 382.2012023925781 137.7687530517578 -cubic 380.797607421875 131.57406616210938 379.5606994628906 125.06243133544922 378.5422058105469 118.15971374511719 -line 378.4692077636719 117.66506958007812 -line 377.47991943359375 117.81104278564453 -line 377.55291748046875 118.3056869506836 -close -move 386.3717041015625 157.2923583984375 -cubic 388.40325927734375 163.9264373779297 390.58575439453125 170.18646240234375 392.81988525390625 176.15203857421875 -line 392.9952392578125 176.6202850341797 -line 393.9317321777344 176.2695770263672 -line 393.7563781738281 175.80133056640625 -cubic 391.5262451171875 169.84645080566406 389.35382080078125 163.61532592773438 387.327880859375 156.9995574951172 -line 387.1814880371094 156.521484375 -line 386.2253112792969 156.8142547607422 -line 386.3717041015625 157.2923583984375 -close -move 400.22509765625 194.82730102539062 -cubic 402.8457946777344 201.2035369873047 405.398193359375 207.32412719726562 407.7337951660156 213.3441619873047 -line 407.9146423339844 213.810302734375 -line 408.846923828125 213.44859313964844 -line 408.66607666015625 212.98245239257812 -cubic 406.32598876953125 206.95077514648438 403.7697448730469 200.82101440429688 401.1500244140625 194.4471435546875 -line 400.9599609375 193.9846954345703 -line 400.0350036621094 194.3648223876953 -line 400.22509765625 194.82730102539062 -close -move 414.19842529296875 232.14666748046875 -cubic 416.02313232421875 238.50738525390625 417.4181823730469 244.9113006591797 418.211181640625 251.57984924316406 -line 418.2702331542969 252.0763702392578 -line 419.26324462890625 251.958251953125 -line 419.2041931152344 251.46176147460938 -cubic 418.405517578125 244.74545288085938 416.9933166503906 238.26283264160156 415.15966796875 231.8709259033203 -line 415.02178955078125 231.3903045654297 -line 414.060546875 231.66604614257812 -line 414.19842529296875 232.14666748046875 -close -move 418.671142578125 271.44757080078125 -cubic 418.2237243652344 277.6664123535156 417.2154541015625 284.17059326171875 415.52777099609375 291.1138000488281 -line 415.4096984863281 291.59967041015625 -line 416.3813781738281 291.8358154296875 -line 416.4994812011719 291.3499755859375 -cubic 418.1971435546875 284.3656311035156 419.21820068359375 277.779052734375 419.6685485839844 271.5193176269531 -line 419.7044372558594 271.0206298828125 -line 418.7070007324219 270.9488525390625 -line 418.671142578125 271.44757080078125 -close -move 409.5927429199219 310.0484619140625 -cubic 407.38433837890625 315.8757629394531 404.74310302734375 321.9842529296875 401.61248779296875 328.4420471191406 -line 401.3943786621094 328.8919677734375 -line 402.2942199707031 329.32818603515625 -line 402.5123291015625 328.8782653808594 -cubic 405.65240478515625 322.4009704589844 408.3113098144531 316.2515869140625 410.52783203125 310.4028625488281 -line 410.7050476074219 309.935302734375 -line 409.7699279785156 309.5809326171875 -line 409.5927429199219 310.0484619140625 -close -move 392.4017028808594 345.9336242675781 -cubic 389.345703125 351.3375549316406 385.986083984375 356.9578857421875 382.2956237792969 362.82586669921875 -line 382.0294494628906 363.2491455078125 -line 382.8759460449219 363.781494140625 -line 383.14215087890625 363.3582458496094 -cubic 386.8385925292969 357.4806823730469 390.210205078125 351.8403015136719 393.27215576171875 346.4258728027344 -line 393.5182800292969 345.9906311035156 -line 392.6478271484375 345.4984130859375 -line 392.4017028808594 345.9336242675781 -close -move 380.9338073730469 371.6935119628906 -cubic 386.768310546875 367.9048767089844 392.36505126953125 364.43182373046875 397.75213623046875 361.2496337890625 -line 398.1826171875 360.9953308105469 -line 397.6740417480469 360.13433837890625 -line 397.2435302734375 360.3886413574219 -cubic 391.8470458984375 363.5763854980469 386.2322998046875 367.06060791015625 380.3891906738281 370.8548278808594 -line 379.9698486328125 371.12713623046875 -line 380.51446533203125 371.9658203125 -line 380.9338073730469 371.6935119628906 -close -move 415.4146728515625 351.46002197265625 -cubic 421.7389221191406 348.2022705078125 427.7364807128906 345.39752197265625 433.4656982421875 342.996826171875 -line 433.9268493652344 342.8035888671875 -line 433.5403747558594 341.88128662109375 -line 433.0792236328125 342.07452392578125 -cubic 427.3312683105469 344.4830627441406 421.2979736328125 347.3045349121094 414.95672607421875 350.571044921875 -line 414.5122375488281 350.8000183105469 -line 414.9701843261719 351.6889953613281 -line 415.4146728515625 351.46002197265625 -close -move 452.1537780761719 336.2846984863281 -cubic 458.9790344238281 334.27301025390625 465.3799743652344 332.90142822265625 471.4884033203125 332.0671691894531 -line 471.9837951660156 331.99951171875 -line 471.8485107421875 331.0086975097656 -line 471.35308837890625 331.07635498046875 -cubic 465.2073059082031 331.91571044921875 458.7325744628906 333.3031311035156 451.8710632324219 335.32550048828125 -line 451.3914794921875 335.46685791015625 -line 451.6741638183594 336.4260559082031 -line 452.1537780761719 336.2846984863281 -close -move 491.1812744140625 331.179931640625 -cubic 498.0011901855469 331.5148010253906 504.49273681640625 332.5077209472656 510.8785095214844 333.9881591796875 -line 511.3655700683594 334.10107421875 -line 511.5914306640625 333.1269226074219 -line 511.1043395996094 333.0140075683594 -cubic 504.6815185546875 331.52496337890625 498.1015930175781 330.5185241699219 491.2303161621094 330.1811218261719 -line 490.7309265136719 330.1565856933594 -line 490.6818542480469 331.1554260253906 -line 491.1812744140625 331.179931640625 -close -move 529.9393920898438 339.74591064453125 -cubic 536.020751953125 341.94000244140625 542.1456909179688 344.4168701171875 548.4838256835938 347.0212707519531 -line 548.9462890625 347.2113037109375 -line 549.3263549804688 346.286376953125 -line 548.8638916015625 346.0963439941406 -cubic 542.523193359375 343.4908447265625 536.3780517578125 341.00579833984375 530.2787475585938 338.8052673339844 -line 529.8084106445312 338.6355895996094 -line 529.4690551757812 339.57623291015625 -line 529.9393920898438 339.74591064453125 -close -move 566.9730224609375 354.5389404296875 -cubic 572.9382934570312 356.883544921875 579.1788940429688 359.2118835449219 585.7872314453125 361.4144592285156 -line 586.2615966796875 361.57257080078125 -line 586.5778198242188 360.6238708496094 -line 586.1034545898438 360.46575927734375 -cubic 579.5119018554688 358.2687683105469 573.2959594726562 355.94964599609375 567.3388671875 353.6082458496094 -line 566.87353515625 353.4253234863281 -line 566.5076904296875 354.35601806640625 -line 566.9730224609375 354.5389404296875 -close -move 605.0194702148438 367.0887145996094 -cubic 611.1900634765625 368.6659851074219 617.6979370117188 370.0914306640625 624.5856323242188 371.2996520996094 -line 625.078125 371.3860168457031 -line 625.2508544921875 370.40106201171875 -line 624.7583618164062 370.314697265625 -cubic 617.8914184570312 369.110107421875 611.4209594726562 367.6928405761719 605.26708984375 366.119873046875 -line 604.7826538085938 365.9960632324219 -line 604.5350341796875 366.96490478515625 -line 605.0194702148438 367.0887145996094 -close -move 644.3432006835938 374.01165771484375 -cubic 650.6480102539062 374.6445617675781 657.263427734375 375.0936584472656 664.2072143554688 375.3235168457031 -line 664.7069702148438 375.3400573730469 -line 664.7400512695312 374.340576171875 -line 664.2402954101562 374.32403564453125 -cubic 657.3138427734375 374.09478759765625 650.7318115234375 373.64794921875 644.4430541992188 373.01666259765625 -line 643.945556640625 372.96673583984375 -line 643.845703125 373.96173095703125 -line 644.3432006835938 374.01165771484375 -close -move 665.07080078125 374.64910888671875 -cubic 658.1327514648438 374.8597717285156 651.5211791992188 375.28900146484375 645.2188720703125 375.90179443359375 -line 644.72119140625 375.9502258300781 -line 644.8180541992188 376.9454650878906 -line 645.315673828125 376.8970947265625 -cubic 651.6019897460938 376.2858581542969 658.1802978515625 375.8587646484375 665.1011352539062 375.64862060546875 -line 665.6008911132812 375.6334533691406 -line 665.570556640625 374.6339416503906 -line 665.07080078125 374.64910888671875 -close -move 625.4583129882812 378.54876708984375 -cubic 618.5650634765625 379.73406982421875 612.051025390625 381.1374206542969 605.87451171875 382.6942443847656 -line 605.3896484375 382.81646728515625 -line 605.6341552734375 383.7861328125 -line 606.1189575195312 383.6639099121094 -cubic 612.2786254882812 382.111328125 618.7551879882812 380.7160339355469 625.6277465820312 379.5343017578125 -line 626.1205444335938 379.4495849609375 -line 625.9510498046875 378.46405029296875 -line 625.4583129882812 378.54876708984375 -close -move 586.61474609375 388.31103515625 -cubic 579.9944458007812 390.49676513671875 573.743896484375 392.8119201660156 567.7718505859375 395.1478271484375 -line 567.3062133789062 395.3299865722656 -line 567.6704711914062 396.26123046875 -line 568.1361083984375 396.0791320800781 -cubic 574.0996704101562 393.74652099609375 580.324951171875 391.44073486328125 586.9282836914062 389.2606201171875 -line 587.403076171875 389.1038818359375 -line 587.0895385742188 388.15423583984375 -line 586.61474609375 388.31103515625 -close -move 549.2640380859375 402.6579284667969 -cubic 542.9301147460938 405.2635192871094 536.8141479492188 407.7490234375 530.7487182617188 409.9605407714844 -line 530.2789916992188 410.1318359375 -line 530.6215209960938 411.0712585449219 -line 531.0912475585938 410.9000244140625 -cubic 537.1737670898438 408.6822814941406 543.30859375 406.1891174316406 549.6444702148438 403.5827331542969 -line 550.1068725585938 403.39251708984375 -line 549.7264404296875 402.46771240234375 -line 549.2640380859375 402.6579284667969 -close -move 511.7053527832031 415.8172607421875 -cubic 505.3249816894531 417.3405456542969 498.8462219238281 418.38299560546875 492.04644775390625 418.7739562988281 -line 491.5472717285156 418.8026428222656 -line 491.60467529296875 419.801025390625 -line 492.1038513183594 419.7723083496094 -cubic 498.9546203613281 419.37841796875 505.52081298828125 418.3218994140625 511.93756103515625 416.7899475097656 -line 512.4238891601562 416.673828125 -line 512.1917114257812 415.701171875 -line 511.7053527832031 415.8172607421875 -close -move 472.3088073730469 418.0418701171875 -cubic 466.1956787109375 417.2518615722656 459.7912292480469 415.9229431152344 452.9617004394531 413.9510192871094 -line 452.4813232421875 413.81231689453125 -line 452.20391845703125 414.7730712890625 -line 452.6842956542969 414.9117736816406 -cubic 459.55059814453125 416.8943176269531 466.0297546386719 418.2387390136719 472.1806335449219 419.03363037109375 -line 472.676513671875 419.09771728515625 -line 472.8046875 418.10595703125 -line 472.3088073730469 418.0418701171875 -close -move 434.2431945800781 407.3271789550781 -cubic 428.5018310546875 404.9480285644531 422.49053955078125 402.1613464355469 416.1498107910156 398.9173583984375 -line 415.7046813964844 398.68963623046875 -line 415.24920654296875 399.5798645019531 -line 415.6943359375 399.8076171875 -cubic 422.0523681640625 403.0604553222656 428.0999755859375 405.86395263671875 433.8603820800781 408.2510070800781 -line 434.3222961425781 408.4424133300781 -line 434.7051086425781 407.5185852050781 -line 434.2431945800781 407.3271789550781 -close -move 398.4402770996094 389.15594482421875 -cubic 393.0714416503906 385.998779296875 387.49383544921875 382.5516052246094 381.67919921875 378.7896423339844 -line 381.2593994140625 378.51806640625 -line 380.7162170410156 379.3576354980469 -line 381.1360168457031 379.6292419433594 -cubic 386.95928955078125 383.3968200683594 392.5550842285156 386.855224609375 397.933349609375 390.0179443359375 -line 398.3643493652344 390.2713928222656 -line 398.87127685546875 389.409423828125 -line 398.4402770996094 389.15594482421875 -close -move 381.8377685546875 386.4475402832031 -cubic 385.5292663574219 392.2943420410156 388.8936767578125 397.8961486816406 391.9577331542969 403.2835388183594 -line 392.2049255371094 403.7181396484375 -line 393.07415771484375 403.2237854003906 -line 392.82696533203125 402.7891540527344 -cubic 389.7570495605469 397.3914489746094 386.38079833984375 391.7699279785156 382.683349609375 385.9136657714844 -line 382.4164123535156 385.4908752441406 -line 381.5708312988281 386.0247497558594 -line 381.8377685546875 386.4475402832031 -close -move 401.2650451660156 420.84393310546875 -cubic 404.411865234375 427.28668212890625 407.07354736328125 433.38275146484375 409.30572509765625 439.1990051269531 -line 409.48486328125 439.66583251953125 -line 410.41851806640625 439.3074951171875 -line 410.2393493652344 438.8406982421875 -cubic 407.9990539550781 433.0033264160156 405.31976318359375 426.86700439453125 402.16357421875 420.4050598144531 -line 401.94415283203125 419.9557800292969 -line 401.04559326171875 420.3946838378906 -line 401.2650451660156 420.84393310546875 -close -move 415.3356628417969 458.1058349609375 -cubic 417.05792236328125 465.0155334472656 418.10906982421875 471.49017333984375 418.60479736328125 477.67962646484375 -line 418.64471435546875 478.1780090332031 -line 419.6415100097656 478.09820556640625 -line 419.6015930175781 477.59979248046875 -cubic 419.1026306152344 471.36993408203125 418.0382995605469 464.81414794921875 416.3059997558594 457.8639831542969 -line 416.18505859375 457.3788146972656 -line 415.2147521972656 457.62066650390625 -line 415.3356628417969 458.1058349609375 -close -move 418.30804443359375 497.5771789550781 -cubic 417.5670166015625 504.2612609863281 416.21728515625 510.6730651855469 414.430908203125 517.0343017578125 -line 414.2957458496094 517.5156860351562 -line 415.2585144042969 517.7860107421875 -line 415.3936767578125 517.3046264648438 -cubic 417.1889953613281 510.9115295410156 418.5555725097656 504.41973876953125 419.3019714355469 497.6873779296875 -line 419.3570861816406 497.1903991699219 -line 418.3631286621094 497.0802307128906 -line 418.30804443359375 497.5771789550781 -close -move 408.03924560546875 535.8658447265625 -cubic 405.7183837890625 541.88916015625 403.17333984375 548.006591796875 400.55328369140625 554.3746337890625 -line 400.363037109375 554.8370361328125 -line 401.287841796875 555.217529296875 -line 401.47808837890625 554.755126953125 -cubic 404.0973815917969 548.3888549804688 406.6467590332031 542.2610473632812 408.9723815917969 536.2254028320312 -line 409.1521911621094 535.7588500976562 -line 408.218994140625 535.3992919921875 -line 408.03924560546875 535.8658447265625 -close -move 393.1275634765625 573.029052734375 -cubic 390.8753662109375 579.0037841796875 388.6711120605469 585.2719116210938 386.61572265625 591.9149169921875 -line 386.4679260253906 592.392578125 -line 387.4232482910156 592.6881713867188 -line 387.571044921875 592.2105102539062 -cubic 389.62078857421875 585.585693359375 391.8150329589844 579.3460693359375 394.06329345703125 573.3817749023438 -line 394.2396240234375 572.9139404296875 -line 393.303955078125 572.5611572265625 -line 393.1275634765625 573.029052734375 -close -move 381.4107971191406 611.2003173828125 -cubic 379.9831237792969 617.409423828125 378.7178039550781 623.9561767578125 377.6746826171875 630.8778686523438 -line 377.6001892089844 631.3722534179688 -line 378.5890197753906 631.5213012695312 -line 378.66351318359375 631.02685546875 -cubic 379.70355224609375 624.1256103515625 380.96160888671875 617.6163940429688 382.3853759765625 611.4244384765625 -line 382.4974365234375 610.9371337890625 -line 381.5228576660156 610.7130126953125 -line 381.4107971191406 611.2003173828125 -close -move 375.4078369140625 650.8828735351562 -cubic 374.9197082519531 657.1973876953125 374.6153869628906 663.81494140625 374.5269775390625 670.7506713867188 -line 374.5205993652344 671.2506103515625 -line 375.5205078125 671.2633666992188 -line 375.5268859863281 670.763427734375 -cubic 375.6151123046875 663.84423828125 375.9179382324219 657.2589111328125 376.40484619140625 650.9599609375 -line 376.4433898925781 650.4614868164062 -line 375.4463806152344 650.3843383789062 -line 375.4078369140625 650.8828735351562 -close -move 375.0921936035156 658.6948852539062 -cubic 374.7368469238281 651.7178344726562 374.1579895019531 645.0804443359375 373.3948059082031 638.76220703125 -line 373.3348388671875 638.2658081054688 -line 372.342041015625 638.3857421875 -line 372.4020080566406 638.8821411132812 -cubic 373.1632080078125 645.183837890625 373.73907470703125 651.7867431640625 374.0934753417969 658.7457275390625 -line 374.1189270019531 659.2451171875 -line 375.1175842285156 659.1942138671875 -line 375.0921936035156 658.6948852539062 -close -move 370.2632751464844 619.0303955078125 -cubic 368.908447265625 612.179931640625 367.3426818847656 605.7119140625 365.6365966796875 599.5789794921875 -line 365.5025939941406 599.0972900390625 -line 364.5391540527344 599.365234375 -line 364.67315673828125 599.8469848632812 -cubic 366.3747253417969 605.9636840820312 367.9315490722656 612.3946533203125 369.28228759765625 619.224365234375 -line 369.3792724609375 619.71484375 -line 370.3602600097656 619.5208740234375 -line 370.2632751464844 619.0303955078125 -close -move 359.6067199707031 580.517822265625 -cubic 357.302490234375 573.9825439453125 354.89752197265625 567.801025390625 352.5068054199219 561.8728637695312 -line 352.31982421875 561.4091186523438 -line 351.39239501953125 561.7831420898438 -line 351.5793762207031 562.246826171875 -cubic 353.9678039550781 568.1693115234375 356.3647155761719 574.3302001953125 358.66363525390625 580.850341796875 -line 358.82989501953125 581.3218994140625 -line 359.7729797363281 580.9893798828125 -line 359.6067199707031 580.517822265625 -close -move 344.9495544433594 543.4102172851562 -cubic 342.3777770996094 537.057861328125 339.9835510253906 530.88427734375 337.92919921875 524.706298828125 -line 337.7714538574219 524.2318115234375 -line 336.8225402832031 524.54736328125 -line 336.98028564453125 525.0217895507812 -cubic 339.0423583984375 531.2230834960938 341.4480895996094 537.42626953125 344.0226135253906 543.7854614257812 -line 344.210205078125 544.2489013671875 -line 345.13720703125 543.8737182617188 -line 344.9495544433594 543.4102172851562 -close -move 332.8630676269531 505.4832458496094 -cubic 331.6918029785156 499.14129638671875 331.0353698730469 492.6511535644531 331.0560302734375 485.7986145019531 -line 331.05755615234375 485.2986145019531 -line 330.0575256347656 485.29559326171875 -line 330.0560302734375 485.79559326171875 -cubic 330.03521728515625 492.7001037597656 330.70098876953125 499.28265380859375 331.87969970703125 505.66485595703125 -line 331.9704895019531 506.1565246582031 -line 332.9538879394531 505.9749450683594 -line 332.8630676269531 505.4832458496094 -close -move 332.9346008300781 466.0789794921875 -cubic 334.0519714355469 459.9993591308594 335.6951904296875 453.6209716796875 337.9583740234375 446.8246765136719 -line 338.1163635253906 446.35028076171875 -line 337.16754150390625 446.0343322753906 -line 337.00958251953125 446.50872802734375 -cubic 334.7354736328125 453.3379211425781 333.0747985839844 459.7839660644531 331.9510803222656 465.8982238769531 -line 331.8607177734375 466.3899841308594 -line 332.8442077636719 466.57073974609375 -line 332.9346008300781 466.0789794921875 -close -move 345.2192077636719 428.34393310546875 -cubic 347.75164794921875 422.6973876953125 350.6654968261719 416.793701171875 354.00433349609375 410.5811767578125 -line 354.24102783203125 410.1407470703125 -line 353.3601989746094 409.6673889160156 -line 353.1235046386719 410.1077880859375 -cubic 349.77642822265625 416.3355712890625 346.84674072265625 422.2713317871094 344.3067932128906 427.9346923828125 -line 344.1021728515625 428.3908996582031 -line 345.01458740234375 428.8001403808594 -line 345.2192077636719 428.34393310546875 -close -move 363.95556640625 393.2364196777344 -cubic 367.3016357421875 387.7293395996094 370.9439697265625 382.0071105957031 374.9071044921875 376.04205322265625 -line 375.1838073730469 375.6255798339844 -line 374.350830078125 375.07220458984375 -line 374.07415771484375 375.4886779785156 -cubic 370.1056213378906 381.4618835449219 366.45245361328125 387.201171875 363.1009521484375 392.7171630859375 -line 362.84130859375 393.14447021484375 -line 363.6959533691406 393.6637268066406 -line 363.95556640625 393.2364196777344 -close -move 358.1777648925781 385.1815490722656 -cubic 352.177734375 388.8577880859375 346.4422302246094 392.17877197265625 340.9359130859375 395.1752014160156 -line 340.4967346191406 395.4141845703125 -line 340.9747314453125 396.2925720214844 -line 341.4139099121094 396.0535583496094 -cubic 346.9318542480469 393.0508117675781 352.6895751953125 389.7169494628906 358.7001953125 386.03424072265625 -line 359.1265563964844 385.77301025390625 -line 358.6040954589844 384.92034912109375 -line 358.1777648925781 385.1815490722656 -close -move 323.2672119140625 404.051025390625 -cubic 316.7966613769531 407.0105285644531 310.6839599609375 409.4640197753906 304.8543701171875 411.4727478027344 -line 304.38165283203125 411.6356506347656 -line 304.7073974609375 412.5810852050781 -line 305.1801452636719 412.418212890625 -cubic 311.0333251953125 410.4013366699219 317.1910705566406 407.9297790527344 323.6831359863281 404.9604187011719 -line 324.1378479003906 404.75244140625 -line 323.7218933105469 403.84307861328125 -line 323.2672119140625 404.051025390625 -close -move 285.6251220703125 416.7398681640625 -cubic 278.6644287109375 418.1195068359375 272.14117431640625 418.8050231933594 265.8868103027344 418.92523193359375 -line 265.38690185546875 418.9348449707031 -line 265.4061279296875 419.9346618652344 -line 265.9060363769531 419.925048828125 -cubic 272.2031555175781 419.80401611328125 278.814208984375 419.1092834472656 285.8195495605469 417.7207946777344 -line 286.30999755859375 417.6235656738281 -line 286.1156005859375 416.6426696777344 -line 285.6251220703125 416.7398681640625 -close -move 246.177734375 417.43115234375 -cubic 239.61375427246094 416.3182067871094 233.26312255859375 414.6499328613281 226.90760803222656 412.59954833984375 -line 226.4317626953125 412.446044921875 -line 226.12472534179688 413.397705078125 -line 226.60057067871094 413.5512390136719 -cubic 232.9823455810547 415.610107421875 239.40272521972656 417.2967224121094 246.01055908203125 418.4170837402344 -line 246.50350952148438 418.50067138671875 -line 246.67071533203125 417.5147399902344 -line 246.177734375 417.43115234375 -close -move 208.1931915283203 405.69720458984375 -cubic 202.2088623046875 403.2928466796875 196.08453369140625 400.7196044921875 189.67662048339844 398.1199951171875 -line 189.21331787109375 397.9320373535156 -line 188.83734130859375 398.858642578125 -line 189.30067443847656 399.046630859375 -cubic 195.70286560058594 401.6439514160156 201.82875061035156 404.21783447265625 207.8203887939453 406.6251220703125 -line 208.2843475341797 406.8115234375 -line 208.6571502685547 405.88360595703125 -line 208.1931915283203 405.69720458984375 -close -move 171.0777130126953 390.96026611328125 -cubic 165.0730743408203 388.8099365234375 158.76019287109375 386.7342224121094 152.06654357910156 384.8267517089844 -line 151.58567810058594 384.6897277832031 -line 151.31161499023438 385.6514587402344 -line 151.79248046875 385.7884826660156 -cubic 158.4668731689453 387.6904602050781 164.74827575683594 389.75579833984375 170.74057006835938 391.9017333984375 -line 171.2113037109375 392.0703125 -line 171.54844665527344 391.12884521484375 -line 171.0777130126953 390.96026611328125 -close -move 132.65054321289062 380.07489013671875 -cubic 126.42193603515625 378.8003845214844 119.8587875366211 377.6955871582031 112.92865753173828 376.81475830078125 -line 112.4326400756836 376.751708984375 -line 112.30654907226562 377.7437438964844 -line 112.80256652832031 377.8067932128906 -cubic 119.71268463134766 378.68505859375 126.2386474609375 379.7835998535156 132.4500732421875 381.0545959472656 -line 132.93991088867188 381.1548156738281 -line 133.14041137695312 380.1751403808594 -line 132.65054321289062 380.07489013671875 -close -move 92.97809600830078 374.99761962890625 -cubic 87.23275756835938 374.6732177734375 81.24253845214844 374.5 75.0 374.5 -line 75.0 375.5 -cubic 75.82622528076172 375.5 76.6488265991211 375.4969787597656 77.46601104736328 375.490966796875 -line 77.96601104736328 375.4872741699219 -line 77.95865631103516 374.4873046875 -line 77.45865631103516 374.490966796875 -cubic 76.64330291748047 374.4969787597656 75.82437896728516 374.5 75.0 374.5 -line 75.0 375.5 -cubic 81.22808837890625 375.5 87.19010925292969 375.6723937988281 92.92171478271484 375.99603271484375 -line 93.42090606689453 376.02423095703125 -line 93.4773178100586 375.02581787109375 -line 92.97809600830078 374.99761962890625 -close -move 97.49335479736328 374.713134765625 -cubic 104.5014877319336 374.2105712890625 111.15763092041016 373.48052978515625 117.48567199707031 372.5667724609375 -line 117.98052978515625 372.49530029296875 -line 117.83761596679688 371.505615234375 -line 117.34275817871094 371.5770568847656 -cubic 111.03162384033203 372.48834228515625 104.41117858886719 373.2144775390625 97.42182159423828 373.7156982421875 -line 96.923095703125 373.75146484375 -line 96.99464416503906 374.7489013671875 -line 97.49335479736328 374.713134765625 -close -move 137.17605590820312 368.9570617675781 -cubic 143.98231506347656 367.4377746582031 150.40435791015625 365.716796875 156.49600219726562 363.8708801269531 -line 156.97451782226562 363.72589111328125 -line 156.6845245361328 362.76885986328125 -line 156.2060089111328 362.9138488769531 -cubic 150.12986755371094 364.75506591796875 143.74386596679688 366.4664001464844 136.9582061767578 367.9810791015625 -line 136.47019958496094 368.0899963378906 -line 136.68807983398438 369.06597900390625 -line 137.17605590820312 368.9570617675781 -close -move 175.37796020507812 357.4690856933594 -cubic 181.8979034423828 355.04278564453125 188.07626342773438 352.54620361328125 194.02658081054688 350.1037902832031 -line 194.4891357421875 349.9139099121094 -line 194.10940551757812 348.98883056640625 -line 193.6468505859375 349.1786804199219 -cubic 187.69906616210938 351.62005615234375 181.53611755371094 354.11041259765625 175.02920532226562 356.5318908691406 -line 174.56060791015625 356.7062683105469 -line 174.90936279296875 357.6434631347656 -line 175.37796020507812 357.4690856933594 -close -move 212.55294799804688 342.5741882324219 -cubic 218.8793487548828 340.10382080078125 225.0746612548828 337.8695983886719 231.33319091796875 336.0373229980469 -line 231.8130340576172 335.8968505859375 -line 231.53208923339844 334.9371032714844 -line 231.05221557617188 335.0776062011719 -cubic 224.76426696777344 336.91851806640625 218.52780151367188 339.1675720214844 212.189208984375 341.6426696777344 -line 211.72344970703125 341.8245544433594 -line 212.08718872070312 342.75604248046875 -line 212.55294799804688 342.5741882324219 -close -move 250.73947143554688 331.89208984375 -cubic 257.0895080566406 331.0862121582031 263.6338195800781 330.8268127441406 270.5787658691406 331.2698974609375 -line 271.0777587890625 331.3017272949219 -line 271.14141845703125 330.3037414550781 -line 270.6424255371094 330.27191162109375 -cubic 263.6458740234375 329.8255310058594 257.006591796875 330.0887145996094 250.6135711669922 330.9000549316406 -line 250.1175537109375 330.9630126953125 -line 250.2434539794922 331.9550476074219 -line 250.73947143554688 331.89208984375 -close -move 290.3369445800781 334.2857971191406 -cubic 296.3270568847656 335.70465087890625 302.61346435546875 337.6236877441406 309.2991943359375 340.1251220703125 -line 309.7674865722656 340.3003234863281 -line 310.117919921875 339.36370849609375 -line 309.64959716796875 339.1885070800781 -cubic 302.9349365234375 336.67626953125 296.5885314941406 334.7389221191406 290.56744384765625 333.312744140625 -line 290.0809326171875 333.197509765625 -line 289.85040283203125 334.1705322265625 -line 290.3369445800781 334.2857971191406 -close -move 327.73077392578125 348.04400634765625 -cubic 333.2797546386719 350.7137145996094 339.0725402832031 353.7392578125 345.15386962890625 357.1585998535156 -line 345.5896911621094 357.4036560058594 -line 346.0798034667969 356.5320129394531 -line 345.64398193359375 356.2869567871094 -cubic 339.5491943359375 352.8600158691406 333.7281188964844 349.8197326660156 328.1643371582031 347.14288330078125 -line 327.7137756347656 346.9261169433594 -line 327.28021240234375 347.82720947265625 -line 327.73077392578125 348.04400634765625 -close -move 362.1017150878906 367.2498474121094 -cubic 366.189208984375 369.8104248046875 370.39178466796875 372.5287780761719 374.72265625 375.416015625 -line 375.416015625 374.72265625 -cubic 371.42572021484375 368.7371826171875 367.75701904296875 362.99530029296875 364.3853759765625 357.4694519042969 -line 364.12493896484375 357.0426330566406 -line 363.27130126953125 357.5635070800781 -line 363.53173828125 357.9903259277344 -cubic 366.90875244140625 363.5250244140625 370.5882873535156 369.2838134765625 374.583984375 375.27734375 -line 375.0 375.0 -line 375.27734375 374.583984375 -cubic 370.94073486328125 371.6929016113281 366.7262268066406 368.9668273925781 362.6325988769531 366.40240478515625 -line 362.2088928222656 366.136962890625 -line 361.677978515625 366.9844055175781 -line 362.1017150878906 367.2498474121094 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4.shape (working copy) @@ -1,6 +0,0 @@ -move 125.0 125.0 -quad 275.0 275.0 425.0 125.0 -quad 275.0 275.0 425.0 425.0 -quad 275.0 275.0 125.0 425.0 -quad 275.0 275.0 125.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4.shape (working copy) @@ -1,6 +0,0 @@ -move 175.0 175.0 -quad 225.0 75.0 275.0 175.0 -quad 375.0 225.0 275.0 275.0 -quad 225.0 375.0 175.0 275.0 -quad 75.0 225.0 175.0 175.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100RB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100RB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100RB.shape (working copy) @@ -1,24 +0,0 @@ -move 175.0 175.0 -line 525.0 175.0 -line 725.0 175.0 -line 725.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 325.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -close -move 175.0 75.0 -line 175.0 175.0 -line 325.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -line 725.0 175.0 -line 725.0 75.0 -line 525.0 75.0 -line 175.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100RB(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100RB(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100RB(100,100).shape (working copy) @@ -1,68 +0,0 @@ -move 89.64466094970703 160.3553466796875 -quad 136.1019744873047 206.81265258789062 184.3314208984375 229.19720458984375 -cubic 209.37930297851562 240.8225860595703 239.10885620117188 229.94149780273438 250.73423767089844 204.89361572265625 -cubic 262.359619140625 179.84573364257812 251.47854614257812 150.11618041992188 226.4306640625 138.4907989501953 -quad 194.27906799316406 123.56838989257812 160.3553466796875 89.64466094970703 -cubic 140.82913208007812 70.11843872070312 109.17088317871094 70.11843872070312 89.64466094970703 89.6446533203125 -cubic 70.11843872070312 109.17086791992188 70.11843872070312 140.82913208007812 89.64466094970703 160.3553466796875 -close -move 311.7895202636719 246.60923767089844 -quad 368.3970031738281 236.15293884277344 422.6269836425781 193.8922576904297 -cubic 444.4084167480469 176.9182891845703 448.3056335449219 145.50083923339844 431.3316650390625 123.71941375732422 -cubic 414.3576965332031 101.93798828125 382.94024658203125 98.04076385498047 361.1588134765625 115.01473236083984 -quad 326.2032775878906 142.25509643554688 293.6252136230469 148.2727813720703 -cubic 266.4703674316406 153.28871154785156 248.52320861816406 179.36830139160156 253.5391387939453 206.5231475830078 -cubic 258.5550537109375 233.67800903320312 284.6346435546875 251.6251678466797 311.7895202636719 246.60923767089844 -close -move 347.9688720703125 138.2500762939453 -quad 307.544189453125 194.6014862060547 301.1736755371094 253.34075927734375 -cubic 298.1962585449219 280.79400634765625 318.0378112792969 305.46295166015625 345.4910583496094 308.44036865234375 -cubic 372.9443054199219 311.41778564453125 397.61328125 291.5762023925781 400.5906982421875 264.1229553222656 -quad 404.12603759765625 231.5252227783203 429.2236022949219 196.5395965576172 -cubic 445.3197937011719 174.10171508789062 440.1788635253906 142.86367797851562 417.7409973144531 126.76747131347656 -cubic 395.3031311035156 110.6712646484375 364.0650939941406 115.81220245361328 347.9688720703125 138.2500762939453 -close -move 327.2099304199219 378.51861572265625 -quad 349.37841796875 420.089111328125 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 455.6109313964844 384.9002380371094 450.8518371582031 380.40966796875 -cubic 430.76727294921875 361.458251953125 399.12237548828125 362.3768310546875 380.1709289550781 382.4613952636719 -cubic 361.2195129394531 402.54595947265625 362.1380920410156 434.1908874511719 382.22265625 453.1423034667969 -quad 385.92633056640625 456.6369934082031 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 430.61279296875 359.9021301269531 415.4473876953125 331.4638366699219 -cubic 402.4535827636719 307.0977478027344 372.1673583984375 297.878662109375 347.80126953125 310.87249755859375 -cubic 323.4351501464844 323.8663024902344 314.21612548828125 354.15252685546875 327.2099304199219 378.51861572265625 -close -move 352.2908935546875 315.0690002441406 -quad 320.54583740234375 302.5844421386719 288.2787170410156 300.44091796875 -quad 255.68614196777344 298.27581787109375 223.33709716796875 306.70001220703125 -cubic 196.6141357421875 313.6590881347656 180.5923309326172 340.96380615234375 187.55142211914062 367.686767578125 -cubic 194.510498046875 394.40972900390625 221.81521606445312 410.4315185546875 248.53817749023438 403.4724426269531 -quad 265.21600341796875 399.1292724609375 281.6502990722656 400.22100830078125 -quad 298.4100646972656 401.3343505859375 315.69189453125 408.1308898925781 -cubic 341.3902282714844 418.2374267578125 370.4158020019531 405.5977783203125 380.5223388671875 379.8994445800781 -cubic 390.62884521484375 354.20111083984375 377.9892272949219 325.175537109375 352.2908935546875 315.0690002441406 -close -move 116.96002197265625 364.5343017578125 -quad 103.2381820678711 376.0511474609375 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 189.9951629638672 430.71551513671875 209.80892944335938 400.402587890625 -cubic 224.91748046875 377.28814697265625 218.4274139404297 346.3022766113281 195.31295776367188 331.1937255859375 -cubic 172.19850158691406 316.0851745605469 141.212646484375 322.57525634765625 126.1041030883789 345.689697265625 -quad 111.95870208740234 367.33062744140625 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 170.86585998535156 449.8448181152344 181.24807739257812 441.1309509277344 -cubic 202.399658203125 423.3782958984375 205.15501403808594 391.8401794433594 187.40235900878906 370.6885986328125 -cubic 169.6497039794922 349.5370178222656 138.11160278320312 346.7816467285156 116.96002197265625 364.5343017578125 -close -move 249.90223693847656 281.2533264160156 -quad 250.88636779785156 249.78160095214844 242.00979614257812 218.6033477783203 -quad 233.4481964111328 188.53135681152344 215.80081176757812 159.15220642089844 -cubic 201.58160400390625 135.4802703857422 170.86476135253906 127.81731414794922 147.1928253173828 142.03651428222656 -cubic 123.5208969116211 156.25572204589844 115.85794067382812 186.97256469726562 130.0771484375 210.64450073242188 -quad 140.8995361328125 228.6614532470703 145.83177185058594 245.98558044433594 -quad 150.4490509033203 262.20343017578125 149.9510955810547 278.1278076171875 -cubic 149.0880126953125 305.7285461425781 170.76316833496094 328.80303955078125 198.36390686035156 329.6661376953125 -cubic 225.9646453857422 330.5292053222656 249.0391387939453 308.85406494140625 249.90223693847656 281.2533264160156 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR(50,50).shape (working copy) @@ -1,150 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 235.6808319091797 195.9518585205078 231.49803161621094 185.65118408203125 229.82583618164062 175.1674041748047 -line 225.8880615234375 150.47947692871094 -line 176.51220703125 158.3550262451172 -line 180.44998168945312 183.04295349121094 -cubic 183.02212524414062 199.1690673828125 191.26368713378906 219.46493530273438 204.19874572753906 238.8675079345703 -line 218.06625366210938 259.66876220703125 -line 259.66876220703125 231.93374633789062 -line 245.80125427246094 211.1324920654297 -close -move 236.41973876953125 150.68350219726562 -cubic 243.9170379638672 143.07679748535156 252.40365600585938 139.63368225097656 266.398193359375 137.99794006347656 -line 291.2291564941406 135.0955810546875 -line 285.4244384765625 85.43367767333984 -line 260.5934753417969 88.3360366821289 -cubic 239.8772735595703 90.75743103027344 215.55335998535156 100.62589263916016 200.80923461914062 115.58518981933594 -line 183.2600860595703 133.39044189453125 -line 218.87057495117188 168.48875427246094 -line 236.41973876953125 150.68350219726562 -close -move 302.142578125 142.9752960205078 -cubic 307.965087890625 145.62843322753906 310.7580261230469 147.55442810058594 314.3344421386719 151.47901916503906 -cubic 317.8778076171875 155.36732482910156 318.8053283691406 157.03692626953125 319.9929504394531 162.13912963867188 -line 325.66064453125 186.4882049560547 -line 374.3587951660156 175.15280151367188 -line 368.69110107421875 150.80372619628906 -cubic 365.9154357910156 138.8791961669922 358.7576904296875 125.9944839477539 351.2909851074219 117.80091857910156 -cubic 343.8573303222656 109.64361572265625 332.71533203125 101.96015167236328 322.8751220703125 97.47626495361328 -line 300.1256103515625 87.1099853515625 -line 279.39306640625 132.60903930664062 -line 302.142578125 142.9752960205078 -close -move 313.86309814453125 194.30194091796875 -cubic 311.2595520019531 199.79598999023438 308.3677978515625 204.87892150878906 304.19873046875 211.1324920654297 -cubic 297.5883483886719 221.04806518554688 298.8957214355469 234.2510223388672 307.3222961425781 242.67764282226562 -cubic 315.7489013671875 251.10427856445312 328.9519348144531 252.41163635253906 338.86749267578125 245.80125427246094 -cubic 346.38519287109375 240.7894744873047 352.36309814453125 237.51544189453125 358.7745666503906 234.7418670654297 -line 381.7196350097656 224.81591796875 -line 361.8677062988281 178.92581176757812 -line 338.92266845703125 188.8517608642578 -cubic 330.3808898925781 192.54690551757812 320.459716796875 197.9805908203125 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 350.951904296875 231.1415557861328 355.6426696777344 222.89639282226562 359.04644775390625 215.71376037597656 -line 369.7523498535156 193.12208557128906 -line 324.5690002441406 171.71026611328125 -line 313.86309814453125 194.30194091796875 -close -move 389.7815246582031 230.53724670410156 -cubic 394.6072692871094 232.08767700195312 396.26654052734375 233.19004821777344 399.9819030761719 237.0973358154297 -cubic 403.7608337402344 241.07147216796875 405.68133544921875 244.25106811523438 408.091064453125 250.3731689453125 -line 417.24755859375 273.635986328125 -line 463.773193359375 255.322998046875 -line 454.61669921875 232.06019592285156 -cubic 450.66156005859375 222.0117950439453 443.74542236328125 210.56153869628906 436.2159423828125 202.64309692382812 -cubic 428.6228332519531 194.65777587890625 416.50189208984375 186.6048126220703 405.0756530761719 182.93377685546875 -line 381.27392578125 175.28671264648438 -line 365.97979736328125 222.8901824951172 -line 389.7815246582031 230.53724670410156 -close -move 411.5956115722656 286.547607421875 -cubic 409.3852844238281 300.414306640625 405.7242431640625 308.2731628417969 397.76617431640625 314.99700927734375 -line 378.6697998046875 331.1316833496094 -line 410.93914794921875 369.3244934082031 -line 430.0355529785156 353.1897888183594 -cubic 446.4002685546875 339.36309814453125 457.6612854003906 315.18988037109375 460.9722595214844 294.4181823730469 -line 464.9075622558594 269.7298583984375 -line 415.5308837890625 261.8592834472656 -line 411.5956115722656 286.547607421875 -close -move 372.09783935546875 319.6598815917969 -cubic 362.1972961425781 317.5246887207031 352.57244873046875 313.3353576660156 338.86749267578125 304.19873046875 -cubic 328.9519348144531 297.5883483886719 315.7489318847656 298.8957214355469 307.32232666015625 307.32232666015625 -cubic 298.8957214355469 315.7489318847656 297.58837890625 328.9519348144531 304.19873046875 338.86749267578125 -cubic 304.9316711425781 339.9668884277344 305.56097412109375 340.93463134765625 306.24359130859375 342.01129150390625 -line 319.6299743652344 363.1253662109375 -line 361.858154296875 336.3526306152344 -line 348.4717712402344 315.238525390625 -cubic 347.634765625 313.9183654785156 346.6925964355469 312.4695129394531 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 328.538818359375 357.4054870605469 346.7988586425781 365.3533630371094 361.556884765625 368.5361633300781 -line 385.9950256347656 373.806640625 -line 396.5359802246094 324.93035888671875 -line 372.09783935546875 319.6598815917969 -close -move 320.5072937011719 377.37286376953125 -cubic 321.1820983886719 384.0038757324219 320.8011474609375 386.5968322753906 318.91082763671875 391.3132019042969 -cubic 317.13421630859375 395.7459411621094 315.9393310546875 397.34881591796875 311.99737548828125 400.8086853027344 -line 293.2081298828125 417.300048828125 -line 326.1908874511719 454.8785095214844 -line 344.9801025390625 438.38714599609375 -cubic 352.87957763671875 431.4537353515625 361.119140625 420.400634765625 365.3218994140625 409.91461181640625 -cubic 369.4109802246094 399.7122802734375 371.5543212890625 385.123779296875 370.2503662109375 372.31060791015625 -line 367.71923828125 347.4390563964844 -line 317.9761657714844 352.5013427734375 -line 320.5072937011719 377.37286376953125 -close -move 280.6116638183594 412.2892150878906 -cubic 266.7866516113281 413.3319091796875 256.18310546875 411.4734191894531 245.48252868652344 405.86334228515625 -line 223.34097290039062 394.25506591796875 -line 200.12442016601562 438.5381164550781 -line 222.2659454345703 450.14642333984375 -cubic 239.87161254882812 459.3766784667969 264.312744140625 463.6605224609375 284.3720397949219 462.1476135253906 -line 309.3012390136719 460.2674255371094 -line 305.5408630371094 410.4090270996094 -line 280.6116638183594 412.2892150878906 -close -move 229.63160705566406 385.910400390625 -cubic 228.2103271484375 376.67535400390625 229.63514709472656 368.3929138183594 237.4724578857422 352.979736328125 -line 248.80372619628906 330.6951599121094 -line 204.234619140625 308.0325927734375 -line 192.9033203125 330.3171691894531 -cubic 181.64035034179688 352.4674072265625 177.55282592773438 376.2280578613281 180.2134246826172 393.5158386230469 -line 184.01614379882812 418.22491455078125 -line 233.434326171875 410.6195068359375 -line 229.63160705566406 385.910400390625 -close -move 188.2191619873047 316.4948425292969 -cubic 173.20083618164062 322.34747314453125 166.7279510498047 322.2638854980469 158.39903259277344 318.793212890625 -line 135.3223876953125 309.1771545410156 -line 116.09027862548828 355.3304443359375 -line 139.1669158935547 364.9465026855469 -cubic 156.41775512695312 372.13494873046875 182.287353515625 372.46893310546875 206.37423706054688 363.08233642578125 -line 229.66798400878906 354.0047912597656 -line 211.51290893554688 307.41729736328125 -line 188.2191619873047 316.4948425292969 -close -move 140.9654541015625 297.0434875488281 -cubic 136.85035705566406 284.8676452636719 136.25331115722656 273.71368408203125 138.92724609375 260.5662841796875 -line 143.90975952148438 236.0678253173828 -line 94.91285705566406 226.102783203125 -line 89.93032836914062 250.6012420654297 -cubic 85.98338317871094 270.0079345703125 87.28816986083984 294.3839111328125 93.59761810302734 313.052490234375 -line 101.60211181640625 336.7364196777344 -line 148.96995544433594 320.7273864746094 -line 140.9654541015625 297.0434875488281 -close -move 153.8240966796875 233.76339721679688 -cubic 157.5792999267578 231.07276916503906 159.162353515625 230.39691162109375 164.05201721191406 229.63742065429688 -cubic 169.4383087158203 228.80078125 173.2158966064453 229.01116943359375 180.70755004882812 231.01979064941406 -line 204.8546905517578 237.4940185546875 -line 217.8031463623047 189.19973754882812 -line 193.656005859375 182.7255096435547 -cubic 181.16458129882812 179.37635803222656 166.96420288085938 178.58551025390625 156.377685546875 180.22987365722656 -cubic 145.2945098876953 181.95140075683594 132.9098663330078 187.23880004882812 124.70249938964844 193.11941528320312 -line 104.38050842285156 207.68020629882812 -line 133.50210571289062 248.32420349121094 -line 153.8240966796875 233.76339721679688 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100SB.shape (working copy) @@ -1,44 +0,0 @@ -move 89.64466094970703 160.3553466796875 -quad 132.88204956054688 203.5927276611328 177.63931274414062 225.9713592529297 -quad 225.69659423828125 250.0 275.0 250.0 -quad 324.30340576171875 250.0 372.3606872558594 225.9713592529297 -quad 417.1179504394531 203.5927276611328 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 346.40728759765625 132.88204956054688 324.02862548828125 177.63931274414062 -quad 300.0 225.69659423828125 300.0 275.0 -quad 300.0 324.30340576171875 324.02862548828125 372.3606872558594 -quad 346.40728759765625 417.1179504394531 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 417.1179504394531 346.40728759765625 372.3606872558594 324.02862548828125 -quad 324.30340576171875 300.0 275.0 300.0 -quad 225.69659423828125 300.0 177.63931274414062 324.02862548828125 -quad 132.88204956054688 346.40728759765625 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 203.5927276611328 417.1179504394531 225.9713592529297 372.3606872558594 -quad 250.0 324.30340576171875 250.0 275.0 -quad 250.0 225.69659423828125 225.9713592529297 177.63931274414062 -quad 203.5927276611328 132.88204956054688 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -close -move 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -quad 121.40727996826172 192.11795043945312 136.5286407470703 222.36068725585938 -quad 150.0 249.30340576171875 150.0 275.0 -quad 150.0 300.69659423828125 136.5286407470703 327.6393127441406 -quad 121.40727996826172 357.8820495605469 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 192.11795043945312 428.59271240234375 222.36068725585938 413.47137451171875 -quad 249.30340576171875 400.0 275.0 400.0 -quad 300.69659423828125 400.0 327.6393127441406 413.47137451171875 -quad 357.8820495605469 428.59271240234375 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 428.59271240234375 357.8820495605469 413.47137451171875 327.6393127441406 -quad 400.0 300.69659423828125 400.0 275.0 -quad 400.0 249.30340576171875 413.47137451171875 222.36068725585938 -quad 428.59271240234375 192.11795043945312 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 357.8820495605469 121.40727996826172 327.6393127441406 136.5286407470703 -quad 300.69659423828125 150.0 275.0 150.0 -quad 249.30340576171875 150.0 222.36068725585938 136.5286407470703 -quad 192.11795043945312 121.40727996826172 160.3553466796875 89.64466094970703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB.shape (working copy) @@ -1,14 +0,0 @@ -move 275.0 25.0 -cubic 245.14112854003906 25.0 245.14112854003906 25.0 215.2822723388672 25.0 -line 215.2822723388672 125.0 -cubic 420.1411437988281 125.0 420.1411437988281 125.0 625.0 125.0 -line 625.0 25.0 -line 275.0 25.0 -close -move 275.0 125.0 -line 625.0 125.0 -line 625.0 25.0 -cubic 420.1411437988281 25.0 420.1411437988281 25.0 215.2822723388672 25.0 -line 215.2822723388672 125.0 -cubic 245.14112854003906 125.0 245.14112854003906 125.0 275.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB(50,50).shape (working copy) @@ -1,48 +0,0 @@ -move 175.0 125.0 -cubic 189.9157257080078 125.0 206.8090362548828 125.0 224.8933563232422 125.0 -line 224.8933563232422 25.0 -cubic 206.8090362548828 25.0 189.9157257080078 25.0 175.0 25.0 -line 175.0 125.0 -close -move 274.9737854003906 125.0 -cubic 291.45355224609375 125.0 308.2859191894531 125.0 325.0013732910156 125.0 -line 325.0013732910156 25.0 -cubic 308.2859191894531 25.0 291.45355224609375 25.0 274.9737854003906 25.0 -line 274.9737854003906 125.0 -close -move 375.0674133300781 125.0 -cubic 392.67816162109375 125.0 409.5691833496094 125.0 425.11376953125 125.0 -line 425.11376953125 25.0 -cubic 409.5691833496094 25.0 392.67816162109375 25.0 375.0674133300781 25.0 -line 375.0674133300781 125.0 -close -move 475.3617858886719 125.0 -cubic 493.930908203125 125.0 493.930908203125 125.0 512.5 125.0 -line 512.5 25.0 -cubic 505.9314270019531 25.0 505.9314270019531 25.0 499.36285400390625 25.0 -line 499.36285400390625 125.0 -cubic 505.9314270019531 125.0 505.9314270019531 125.0 512.5 125.0 -line 512.5 25.0 -cubic 493.930908203125 25.0 493.930908203125 25.0 475.3617858886719 25.0 -line 475.3617858886719 125.0 -close -move 449.392333984375 25.0 -cubic 441.99383544921875 25.0 433.875 25.0 425.0 25.0 -line 398.77911376953125 25.0 -line 398.77911376953125 125.0 -line 425.0 125.0 -cubic 433.875 125.0 441.99383544921875 125.0 449.392333984375 125.0 -line 449.392333984375 25.0 -close -move 348.77911376953125 25.0 -line 298.77911376953125 25.0 -line 298.77911376953125 125.0 -line 348.77911376953125 125.0 -line 348.77911376953125 25.0 -close -move 248.77911376953125 25.0 -line 198.77911376953125 25.0 -line 198.77911376953125 125.0 -line 248.77911376953125 125.0 -line 248.77911376953125 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1.shape (working copy) @@ -1,3 +0,0 @@ -move 175.0 75.0 -cubic 325.0 75.0 675.0 75.0 425.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1_d100BB(50,50).shape (working copy) @@ -1,42 +0,0 @@ -move 325.0 25.0 -cubic 294.5003662109375 25.0 278.8843688964844 25.0 274.3388671875 25.0 -line 274.3388671875 125.0 -cubic 278.8843688964844 125.0 294.5003662109375 125.0 325.0 125.0 -line 325.0 25.0 -close -move 321.08477783203125 125.0 -cubic 335.7394104003906 125.0 352.8420104980469 125.0 371.09417724609375 125.0 -line 371.09417724609375 25.0 -cubic 352.8420104980469 25.0 335.7394104003906 25.0 321.08477783203125 25.0 -line 321.08477783203125 125.0 -close -move 421.223388671875 125.0 -cubic 438.1890869140625 125.0 455.1573486328125 125.0 471.2420349121094 125.0 -line 471.2420349121094 25.0 -cubic 455.1573486328125 25.0 438.1890869140625 25.0 421.223388671875 25.0 -line 421.223388671875 125.0 -close -move 521.5320434570312 125.0 -cubic 545.685791015625 125.0 545.685791015625 125.0 569.8395385742188 125.0 -line 569.8395385742188 25.0 -cubic 569.0333862304688 25.0 569.0333862304688 25.0 568.227294921875 25.0 -line 568.227294921875 125.0 -cubic 569.0333862304688 125.0 569.0333862304688 125.0 569.8395385742188 125.0 -line 569.8395385742188 25.0 -cubic 545.685791015625 25.0 545.685791015625 25.0 521.5320434570312 25.0 -line 521.5320434570312 125.0 -close -move 518.7911987304688 25.0 -cubic 506.6728210449219 25.0 492.1582336425781 25.0 475.0 25.0 -line 467.9271545410156 25.0 -line 467.9271545410156 125.0 -line 475.0 125.0 -cubic 492.1582336425781 125.0 506.6728210449219 125.0 518.7911987304688 125.0 -line 518.7911987304688 25.0 -close -move 417.9271545410156 25.0 -line 367.9271545410156 25.0 -line 367.9271545410156 125.0 -line 417.9271545410156 125.0 -line 417.9271545410156 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5_d100BB(20,20).shape (working copy) @@ -1,272 +0,0 @@ -move 175.0 175.0 -line 195.0 175.0 -line 195.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -close -move 215.0 175.0 -line 235.0 175.0 -line 235.0 75.0 -line 215.0 75.0 -line 215.0 175.0 -close -move 255.0 175.0 -line 275.0 175.0 -line 275.0 75.0 -line 255.0 75.0 -line 255.0 175.0 -close -move 295.0 175.0 -line 315.0 175.0 -line 315.0 75.0 -line 295.0 75.0 -line 295.0 175.0 -close -move 335.0 175.0 -line 355.0 175.0 -line 355.0 75.0 -line 335.0 75.0 -line 335.0 175.0 -close -move 375.0 175.0 -line 395.0 175.0 -line 395.0 75.0 -line 375.0 75.0 -line 375.0 175.0 -close -move 415.0 175.0 -line 435.0 175.0 -line 435.0 75.0 -line 415.0 75.0 -line 415.0 175.0 -close -move 455.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -line 455.0 75.0 -line 455.0 175.0 -close -move 495.0 175.0 -line 515.0 175.0 -line 515.0 75.0 -line 495.0 75.0 -line 495.0 175.0 -close -move 535.0 175.0 -line 555.0 175.0 -line 555.0 75.0 -line 535.0 75.0 -line 535.0 175.0 -close -move 575.0 175.0 -line 595.0 175.0 -line 595.0 75.0 -line 575.0 75.0 -line 575.0 175.0 -close -move 615.0 175.0 -line 635.0 175.0 -line 635.0 75.0 -line 615.0 75.0 -line 615.0 175.0 -close -move 655.0 175.0 -line 675.0 175.0 -line 675.0 75.0 -line 655.0 75.0 -line 655.0 175.0 -close -move 695.0 175.0 -line 715.0 175.0 -line 715.0 75.0 -line 695.0 75.0 -line 695.0 175.0 -close -move 715.0 75.0 -line 695.0 75.0 -line 695.0 175.0 -line 715.0 175.0 -line 715.0 75.0 -close -move 675.0 75.0 -line 655.0 75.0 -line 655.0 175.0 -line 675.0 175.0 -line 675.0 75.0 -close -move 635.0 75.0 -line 615.0 75.0 -line 615.0 175.0 -line 635.0 175.0 -line 635.0 75.0 -close -move 595.0 75.0 -line 575.0 75.0 -line 575.0 175.0 -line 595.0 175.0 -line 595.0 75.0 -close -move 555.0 75.0 -line 535.0 75.0 -line 535.0 175.0 -line 555.0 175.0 -line 555.0 75.0 -close -move 515.0 75.0 -line 495.0 75.0 -line 495.0 175.0 -line 515.0 175.0 -line 515.0 75.0 -close -move 475.0 75.0 -line 455.0 75.0 -line 455.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -close -move 435.0 75.0 -line 415.0 75.0 -line 415.0 175.0 -line 435.0 175.0 -line 435.0 75.0 -close -move 395.0 75.0 -line 375.0 75.0 -line 375.0 175.0 -line 395.0 175.0 -line 395.0 75.0 -close -move 355.0 75.0 -line 335.0 75.0 -line 335.0 175.0 -line 355.0 175.0 -line 355.0 75.0 -close -move 315.0 75.0 -line 295.0 75.0 -line 295.0 175.0 -line 315.0 175.0 -line 315.0 75.0 -close -move 275.0 175.0 -line 295.0 175.0 -line 295.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -close -move 315.0 175.0 -line 335.0 175.0 -line 335.0 75.0 -line 315.0 75.0 -line 315.0 175.0 -close -move 355.0 175.0 -line 375.0 175.0 -line 375.0 75.0 -line 355.0 75.0 -line 355.0 175.0 -close -move 395.0 175.0 -line 415.0 175.0 -line 415.0 75.0 -line 395.0 75.0 -line 395.0 175.0 -close -move 435.0 175.0 -line 455.0 175.0 -line 455.0 75.0 -line 435.0 75.0 -line 435.0 175.0 -close -move 475.0 175.0 -line 495.0 175.0 -line 495.0 75.0 -line 475.0 75.0 -line 475.0 175.0 -close -move 515.0 175.0 -line 535.0 175.0 -line 535.0 75.0 -line 515.0 75.0 -line 515.0 175.0 -close -move 555.0 175.0 -line 575.0 175.0 -line 575.0 75.0 -line 555.0 75.0 -line 555.0 175.0 -close -move 595.0 175.0 -line 615.0 175.0 -line 615.0 75.0 -line 595.0 75.0 -line 595.0 175.0 -close -move 615.0 75.0 -line 595.0 75.0 -line 595.0 175.0 -line 615.0 175.0 -line 615.0 75.0 -close -move 575.0 75.0 -line 555.0 75.0 -line 555.0 175.0 -line 575.0 175.0 -line 575.0 75.0 -close -move 535.0 75.0 -line 515.0 75.0 -line 515.0 175.0 -line 535.0 175.0 -line 535.0 75.0 -close -move 495.0 75.0 -line 475.0 75.0 -line 475.0 175.0 -line 495.0 175.0 -line 495.0 75.0 -close -move 455.0 75.0 -line 435.0 75.0 -line 435.0 175.0 -line 455.0 175.0 -line 455.0 75.0 -close -move 415.0 75.0 -line 395.0 75.0 -line 395.0 175.0 -line 415.0 175.0 -line 415.0 75.0 -close -move 375.0 75.0 -line 355.0 75.0 -line 355.0 175.0 -line 375.0 175.0 -line 375.0 75.0 -close -move 335.0 75.0 -line 325.0 75.0 -line 315.0 75.0 -line 315.0 175.0 -line 325.0 175.0 -line 335.0 175.0 -line 335.0 75.0 -close -move 295.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -line 295.0 175.0 -line 295.0 75.0 -close -move 255.0 75.0 -line 235.0 75.0 -line 235.0 175.0 -line 255.0 175.0 -line 255.0 75.0 -close -move 215.0 75.0 -line 195.0 75.0 -line 195.0 175.0 -line 215.0 175.0 -line 215.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB.shape (working copy) @@ -1,44 +0,0 @@ -move 89.64466094970703 160.3553466796875 -quad 132.88204956054688 203.5927276611328 177.63931274414062 225.9713592529297 -quad 225.69659423828125 250.0 275.0 250.0 -quad 324.30340576171875 250.0 372.3606872558594 225.9713592529297 -quad 417.1179504394531 203.5927276611328 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 346.40728759765625 132.88204956054688 324.02862548828125 177.63931274414062 -quad 300.0 225.69659423828125 300.0 275.0 -quad 300.0 324.30340576171875 324.02862548828125 372.3606872558594 -quad 346.40728759765625 417.1179504394531 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 417.1179504394531 346.40728759765625 372.3606872558594 324.02862548828125 -quad 324.30340576171875 300.0 275.0 300.0 -quad 225.69659423828125 300.0 177.63931274414062 324.02862548828125 -quad 132.88204956054688 346.40728759765625 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 203.5927276611328 417.1179504394531 225.9713592529297 372.3606872558594 -quad 250.0 324.30340576171875 250.0 275.0 -quad 250.0 225.69659423828125 225.9713592529297 177.63931274414062 -quad 203.5927276611328 132.88204956054688 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -close -move 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -quad 121.40727996826172 192.11795043945312 136.5286407470703 222.36068725585938 -quad 150.0 249.30340576171875 150.0 275.0 -quad 150.0 300.69659423828125 136.5286407470703 327.6393127441406 -quad 121.40727996826172 357.8820495605469 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 192.11795043945312 428.59271240234375 222.36068725585938 413.47137451171875 -quad 249.30340576171875 400.0 275.0 400.0 -quad 300.69659423828125 400.0 327.6393127441406 413.47137451171875 -quad 357.8820495605469 428.59271240234375 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -quad 428.59271240234375 357.8820495605469 413.47137451171875 327.6393127441406 -quad 400.0 300.69659423828125 400.0 275.0 -quad 400.0 249.30340576171875 413.47137451171875 222.36068725585938 -quad 428.59271240234375 192.11795043945312 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 357.8820495605469 121.40727996826172 327.6393127441406 136.5286407470703 -quad 300.69659423828125 150.0 275.0 150.0 -quad 249.30340576171875 150.0 222.36068725585938 136.5286407470703 -quad 192.11795043945312 121.40727996826172 160.3553466796875 89.64466094970703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1_d100BB(50,50).shape (working copy) @@ -1,50 +0,0 @@ -move 256.0279541015625 125.0 -cubic 269.9937438964844 125.0 287.0125732421875 125.0 306.2270812988281 125.0 -line 306.2270812988281 25.0 -cubic 287.0125732421875 25.0 269.9937438964844 25.0 256.0279541015625 25.0 -line 256.0279541015625 125.0 -close -move 356.2577209472656 125.0 -cubic 372.29608154296875 125.0 389.12255859375 125.0 406.41326904296875 125.0 -line 406.41326904296875 25.0 -cubic 389.12255859375 25.0 372.29608154296875 25.0 356.2577209472656 25.0 -line 356.2577209472656 125.0 -close -move 456.4378967285156 125.0 -cubic 473.0811767578125 125.0 489.8612365722656 125.0 506.5168151855469 125.0 -line 506.5168151855469 25.0 -cubic 489.8612365722656 25.0 473.0811767578125 25.0 456.4378967285156 25.0 -line 456.4378967285156 125.0 -close -move 556.5689697265625 125.0 -cubic 573.8290405273438 125.0 590.6431274414062 125.0 606.6912841796875 125.0 -line 606.6912841796875 25.0 -cubic 590.6431274414062 25.0 573.8290405273438 25.0 556.5689697265625 25.0 -line 556.5689697265625 125.0 -close -move 593.5184936523438 25.0 -line 543.5184936523438 25.0 -line 543.5184936523438 125.0 -line 593.5184936523438 125.0 -line 593.5184936523438 25.0 -close -move 493.5185241699219 25.0 -line 443.5185241699219 25.0 -line 443.5185241699219 125.0 -line 493.5185241699219 125.0 -line 493.5185241699219 25.0 -close -move 393.5185241699219 25.0 -line 343.5185241699219 25.0 -line 343.5185241699219 125.0 -line 393.5185241699219 125.0 -line 393.5185241699219 25.0 -close -move 293.5185241699219 25.0 -line 275.0 25.0 -cubic 249.8686065673828 25.0 233.42153930664062 25.0 224.26992797851562 25.0 -line 224.26992797851562 125.0 -cubic 233.42153930664062 125.0 249.8686065673828 125.0 275.0 125.0 -line 293.5185241699219 125.0 -line 293.5185241699219 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(100,100).shape (working copy) @@ -1,22 +0,0 @@ -move 225.0 125.0 -quad 289.5643310546875 125.0 325.20404052734375 125.0 -line 325.20404052734375 25.0 -quad 289.5643310546875 25.0 225.0 25.0 -line 225.0 125.0 -close -move 313.3101806640625 25.0 -quad 275.8320617675781 25.0 213.18505859375 25.0 -line 213.18505859375 125.0 -quad 275.8320617675781 125.0 313.3101806640625 125.0 -line 313.3101806640625 25.0 -close -move 113.04655456542969 25.0 -quad 94.68180847167969 25.0 75.0 25.0 -line 75.0 125.0 -line 136.9822540283203 125.0 -line 136.9822540283203 25.0 -line 75.0 25.0 -line 75.0 125.0 -quad 94.68180847167969 125.0 113.04655456542969 125.0 -line 113.04655456542969 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/58_sc1.shape (working copy) @@ -1,3 +0,0 @@ -move 275.0 75.0 -cubic 75.0 75.0 425.0 75.0 625.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SM10.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SM10.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SM10.shape (working copy) @@ -1,84 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 234.86111450195312 194.72227478027344 230.7455291748047 183.9188690185547 229.5345916748047 173.0204620361328 -cubic 228.49053955078125 163.62403869628906 229.3418731689453 160.4315948486328 233.30125427246094 154.4925079345703 -cubic 237.1758575439453 148.68060302734375 240.72752380371094 146.01686096191406 248.9104766845703 142.50987243652344 -cubic 257.3153991699219 138.90777587890625 264.8235168457031 137.5 275.0 137.5 -cubic 285.1764831542969 137.5 292.6846008300781 138.90777587890625 301.0895080566406 142.50987243652344 -cubic 309.2724914550781 146.01686096191406 312.82415771484375 148.68060302734375 316.69873046875 154.4925079345703 -cubic 320.65814208984375 160.4315948486328 321.50946044921875 163.62403869628906 320.46539306640625 173.0204620361328 -cubic 319.2544860839844 183.9188690185547 315.1388854980469 194.72227478027344 304.19873046875 211.1324920654297 -line 234.86123657226562 315.1387634277344 -line 338.86749267578125 245.80125427246094 -cubic 355.2777099609375 234.86111450195312 366.0811462402344 230.7455291748047 376.97955322265625 229.5345916748047 -cubic 386.3759460449219 228.49053955078125 389.56842041015625 229.3418731689453 395.50750732421875 233.30125427246094 -cubic 401.31939697265625 237.1758575439453 403.983154296875 240.72752380371094 407.4901123046875 248.9104766845703 -cubic 411.09222412109375 257.3153991699219 412.5 264.8235168457031 412.5 275.0 -cubic 412.5 285.1764831542969 411.09222412109375 292.6846008300781 407.4901123046875 301.0895080566406 -cubic 403.983154296875 309.2724914550781 401.31939697265625 312.82415771484375 395.50750732421875 316.69873046875 -cubic 389.56842041015625 320.65814208984375 386.3759460449219 321.50946044921875 376.97955322265625 320.46539306640625 -cubic 366.0811462402344 319.2544860839844 355.2777099609375 315.1388854980469 338.86749267578125 304.19873046875 -line 234.861328125 234.86138916015625 -line 304.19873046875 338.86749267578125 -cubic 315.1388854980469 355.2777099609375 319.2544860839844 366.0811462402344 320.46539306640625 376.97955322265625 -cubic 321.50946044921875 386.3759460449219 320.65814208984375 389.56842041015625 316.69873046875 395.50750732421875 -cubic 312.82415771484375 401.31939697265625 309.2724914550781 403.983154296875 301.0895080566406 407.4901123046875 -cubic 292.6846008300781 411.09222412109375 285.1764831542969 412.5 275.0 412.5 -cubic 264.8235168457031 412.5 257.3153991699219 411.09222412109375 248.9104766845703 407.4901123046875 -cubic 240.72752380371094 403.983154296875 237.1758575439453 401.31939697265625 233.30125427246094 395.50750732421875 -cubic 229.3418731689453 389.56842041015625 228.49053955078125 386.3759460449219 229.5345916748047 376.97955322265625 -cubic 230.7455291748047 366.0811462402344 234.86111450195312 355.2777099609375 245.80125427246094 338.86749267578125 -line 315.138671875 234.86129760742188 -line 211.1324920654297 304.19873046875 -cubic 194.72227478027344 315.1388854980469 183.9188690185547 319.2544860839844 173.0204620361328 320.46539306640625 -cubic 163.62403869628906 321.50946044921875 160.4315948486328 320.65814208984375 154.4925079345703 316.69873046875 -cubic 148.68060302734375 312.82415771484375 146.01686096191406 309.2724914550781 142.50987243652344 301.0895080566406 -cubic 138.90777587890625 292.6846008300781 137.5 285.1764831542969 137.5 275.0 -cubic 137.5 264.8235168457031 138.90777587890625 257.3153991699219 142.50987243652344 248.9104766845703 -cubic 146.01686096191406 240.72752380371094 148.68060302734375 237.1758575439453 154.4925079345703 233.30125427246094 -cubic 160.4315948486328 229.3418731689453 163.62403869628906 228.49053955078125 173.0204620361328 229.5345916748047 -cubic 183.9188690185547 230.7455291748047 194.72227478027344 234.86111450195312 211.1324920654297 245.80125427246094 -line 315.13885498046875 315.13885498046875 -line 245.80125427246094 211.1324920654297 -close -move 204.19874572753906 238.8675079345703 -line 225.0 225.0 -line 238.8675079345703 204.19874572753906 -cubic 217.77772521972656 190.13888549804688 195.7686309814453 181.7544708251953 178.5420379638672 179.8404083251953 -cubic 159.81346130371094 177.75946044921875 139.5684051513672 183.1581268310547 126.75749206542969 191.69874572753906 -cubic 113.81938934326172 200.3241424560547 102.42063903808594 215.52247619628906 96.55262756347656 229.2145233154297 -cubic 90.77973175048828 242.68460083007812 87.5 260.1764831542969 87.5 275.0 -cubic 87.5 289.8235168457031 90.77973175048828 307.3153991699219 96.55262756347656 320.7854919433594 -cubic 102.42063903808594 334.4775085449219 113.81938934326172 349.67584228515625 126.75749206542969 358.30126953125 -cubic 139.5684051513672 366.84185791015625 159.81346130371094 372.24053955078125 178.5420379638672 370.15960693359375 -cubic 195.7686309814453 368.2455139160156 217.77772521972656 359.8611145019531 238.8675079345703 345.80126953125 -line 225.0 325.0 -line 204.19874572753906 311.13250732421875 -cubic 190.13888549804688 332.2222900390625 181.7544708251953 354.2313537597656 179.8404083251953 371.45794677734375 -cubic 177.75946044921875 390.1865539550781 183.1581268310547 410.43157958984375 191.69874572753906 423.24249267578125 -cubic 200.3241424560547 436.18060302734375 215.52247619628906 447.579345703125 229.2145233154297 453.4473876953125 -cubic 242.68460083007812 459.22027587890625 260.1764831542969 462.5 275.0 462.5 -cubic 289.8235168457031 462.5 307.3153991699219 459.22027587890625 320.7854919433594 453.4473876953125 -cubic 334.4775085449219 447.579345703125 349.67584228515625 436.18060302734375 358.30126953125 423.24249267578125 -cubic 366.84185791015625 410.43157958984375 372.24053955078125 390.1865539550781 370.15960693359375 371.45794677734375 -cubic 368.2455139160156 354.2313537597656 359.8611145019531 332.2222900390625 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 332.2222900390625 359.8611145019531 354.2313537597656 368.2455139160156 371.45794677734375 370.15960693359375 -cubic 390.1865539550781 372.24053955078125 410.43157958984375 366.84185791015625 423.24249267578125 358.30126953125 -cubic 436.18060302734375 349.67584228515625 447.579345703125 334.4775085449219 453.4473876953125 320.7854919433594 -cubic 459.22027587890625 307.3153991699219 462.5 289.8235168457031 462.5 275.0 -cubic 462.5 260.1764831542969 459.22027587890625 242.68460083007812 453.4473876953125 229.2145233154297 -cubic 447.579345703125 215.52247619628906 436.18060302734375 200.3241424560547 423.24249267578125 191.69874572753906 -cubic 410.43157958984375 183.1581268310547 390.1865539550781 177.75946044921875 371.45794677734375 179.8404083251953 -cubic 354.2313537597656 181.7544708251953 332.2222900390625 190.13888549804688 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 359.8611145019531 217.77772521972656 368.2455139160156 195.7686309814453 370.15960693359375 178.5420379638672 -cubic 372.24053955078125 159.81346130371094 366.84185791015625 139.5684051513672 358.30126953125 126.75749206542969 -cubic 349.67584228515625 113.81938934326172 334.4775085449219 102.42063903808594 320.7854919433594 96.55262756347656 -cubic 307.3153991699219 90.77973175048828 289.8235168457031 87.5 275.0 87.5 -cubic 260.1764831542969 87.5 242.68460083007812 90.77973175048828 229.2145233154297 96.55262756347656 -cubic 215.52247619628906 102.42063903808594 200.3241424560547 113.81938934326172 191.69874572753906 126.75749206542969 -cubic 183.1581268310547 139.5684051513672 177.75946044921875 159.81346130371094 179.8404083251953 178.5420379638672 -cubic 181.7544708251953 195.7686309814453 190.13888549804688 217.77772521972656 204.19874572753906 238.8675079345703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d100SB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d100SB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d100SB.shape (working copy) @@ -1,112 +0,0 @@ -move 266.6025085449219 197.26498413085938 -cubic 257.22222900390625 183.19454956054688 255.24105834960938 177.99398803710938 254.38168334960938 170.25967407226562 -cubic 254.07421875 167.49240112304688 253.94955444335938 169.54922485351562 254.3561248779297 167.80679321289062 -cubic 254.646484375 166.5623779296875 253.33758544921875 169.5074005126953 254.10250854492188 168.36001586914062 -cubic 254.82229614257812 167.2803497314453 253.22097778320312 168.96173095703125 254.83885192871094 167.695556640625 -cubic 256.5550537109375 166.35243225097656 256.01324462890625 166.66502380371094 258.7584533691406 165.48849487304688 -cubic 264.63079833984375 162.97178649902344 267.1470031738281 162.5 275.0 162.5 -cubic 282.8529968261719 162.5 285.36920166015625 162.97178649902344 291.2415466308594 165.48849487304688 -cubic 293.98675537109375 166.66502380371094 293.4449462890625 166.35243225097656 295.1611633300781 167.695556640625 -cubic 296.7790222167969 168.96173095703125 295.1777038574219 167.2803497314453 295.8974914550781 168.36001586914062 -cubic 296.66241455078125 169.5074005126953 295.353515625 166.5623779296875 295.6438903808594 167.80679321289062 -cubic 296.0504455566406 169.54922485351562 295.92578125 167.49240112304688 295.6183166503906 170.25967407226562 -cubic 294.7589416503906 177.99398803710938 292.77777099609375 183.19454956054688 283.3974914550781 197.26498413085938 -line 352.7350158691406 266.6025085449219 -cubic 366.8054504394531 257.22222900390625 372.0060119628906 255.24105834960938 379.7403259277344 254.38168334960938 -cubic 382.5075988769531 254.07421875 380.4507751464844 253.94955444335938 382.1932067871094 254.3561248779297 -cubic 383.4376220703125 254.646484375 380.4925842285156 253.33758544921875 381.6399841308594 254.10250854492188 -cubic 382.71966552734375 254.82229614257812 381.03826904296875 253.22097778320312 382.304443359375 254.83885192871094 -cubic 383.6475524902344 256.5550537109375 383.3349914550781 256.01324462890625 384.5115051269531 258.7584533691406 -cubic 387.0281982421875 264.63079833984375 387.5 267.1470031738281 387.5 275.0 -cubic 387.5 282.8529968261719 387.0281982421875 285.36920166015625 384.5115051269531 291.2415466308594 -cubic 383.3349914550781 293.98675537109375 383.6475524902344 293.4449462890625 382.304443359375 295.1611633300781 -cubic 381.03826904296875 296.7790222167969 382.71966552734375 295.1777038574219 381.6399841308594 295.8974914550781 -cubic 380.4925842285156 296.66241455078125 383.4376220703125 295.353515625 382.1932067871094 295.6438903808594 -cubic 380.4507751464844 296.0504455566406 382.5075988769531 295.92578125 379.7403259277344 295.6183166503906 -cubic 372.0060119628906 294.7589416503906 366.8054504394531 292.77777099609375 352.7350158691406 283.3974914550781 -line 283.3974914550781 352.7350158691406 -cubic 292.77777099609375 366.8054504394531 294.7589416503906 372.0060119628906 295.6183166503906 379.7403259277344 -cubic 295.92578125 382.5075988769531 296.0504455566406 380.4507751464844 295.6438903808594 382.1932067871094 -cubic 295.353515625 383.4376220703125 296.66241455078125 380.4925842285156 295.8974914550781 381.6399841308594 -cubic 295.1777038574219 382.71966552734375 296.7790222167969 381.03826904296875 295.1611633300781 382.304443359375 -cubic 293.4449462890625 383.6475524902344 293.98675537109375 383.3349914550781 291.2415466308594 384.5115051269531 -cubic 285.36920166015625 387.0281982421875 282.8529968261719 387.5 275.0 387.5 -cubic 267.1470031738281 387.5 264.63079833984375 387.0281982421875 258.7584533691406 384.5115051269531 -cubic 256.01324462890625 383.3349914550781 256.5550537109375 383.6475524902344 254.83885192871094 382.304443359375 -cubic 253.22097778320312 381.03826904296875 254.82229614257812 382.71966552734375 254.10250854492188 381.6399841308594 -cubic 253.33758544921875 380.4925842285156 254.646484375 383.4376220703125 254.3561248779297 382.1932067871094 -cubic 253.94955444335938 380.4507751464844 254.07421875 382.5075988769531 254.38168334960938 379.7403259277344 -cubic 255.24105834960938 372.0060119628906 257.22222900390625 366.8054504394531 266.6025085449219 352.7350158691406 -line 197.26498413085938 283.3974914550781 -cubic 183.19454956054688 292.77777099609375 177.99398803710938 294.7589416503906 170.25967407226562 295.6183166503906 -cubic 167.49240112304688 295.92578125 169.54922485351562 296.0504455566406 167.80679321289062 295.6438903808594 -cubic 166.5623779296875 295.353515625 169.5074005126953 296.66241455078125 168.36001586914062 295.8974914550781 -cubic 167.2803497314453 295.1777038574219 168.96173095703125 296.7790222167969 167.695556640625 295.1611633300781 -cubic 166.35243225097656 293.4449462890625 166.66502380371094 293.98675537109375 165.48849487304688 291.2415466308594 -cubic 162.97178649902344 285.36920166015625 162.5 282.8529968261719 162.5 275.0 -cubic 162.5 267.1470031738281 162.97178649902344 264.63079833984375 165.48849487304688 258.7584533691406 -cubic 166.66502380371094 256.01324462890625 166.35243225097656 256.5550537109375 167.695556640625 254.83885192871094 -cubic 168.96173095703125 253.22097778320312 167.2803497314453 254.82229614257812 168.36001586914062 254.10250854492188 -cubic 169.5074005126953 253.33758544921875 166.5623779296875 254.646484375 167.80679321289062 254.3561248779297 -cubic 169.54922485351562 253.94955444335938 167.49240112304688 254.07421875 170.25967407226562 254.38168334960938 -cubic 177.99398803710938 255.24105834960938 183.19454956054688 257.22222900390625 197.26498413085938 266.6025085449219 -line 266.6025085449219 197.26498413085938 -close -move 183.39749145507812 252.73501586914062 -line 225.0 225.0 -line 252.73501586914062 183.39749145507812 -cubic 229.30545043945312 167.77777099609375 201.69351196289062 157.25894165039062 181.30282592773438 154.99331665039062 -cubic 170.00759887695312 153.73828125 155.06015014648438 154.64419555664062 145.08383178710938 156.9720001220703 -cubic 134.6094970703125 159.416015625 121.11759948730469 165.41241455078125 112.8899917602539 170.89749145507812 -cubic 104.59465789794922 176.42770385742188 94.71015167236328 185.84152221679688 88.94506072998047 193.20802307128906 -cubic 83.25694274902344 200.47618103027344 77.0849838256836 211.1742401123047 73.5739974975586 219.3665313720703 -cubic 66.71570587158203 235.3692169189453 62.5 257.8529968261719 62.5 275.0 -cubic 62.5 292.1470031738281 66.71570587158203 314.63079833984375 73.5739974975586 330.6334533691406 -cubic 77.0849838256836 338.82574462890625 83.25694274902344 349.5238037109375 88.94506072998047 356.7919616699219 -cubic 94.71015167236328 364.1584777832031 104.59465789794922 373.5722961425781 112.8899917602539 379.1025085449219 -cubic 121.11759948730469 384.58758544921875 134.6094970703125 390.583984375 145.08383178710938 393.0279846191406 -cubic 155.06015014648438 395.3558044433594 170.00759887695312 396.26171875 181.30282592773438 395.0066833496094 -cubic 201.69351196289062 392.7410583496094 229.30545043945312 382.22222900390625 252.73501586914062 366.6025085449219 -line 225.0 325.0 -line 183.39749145507812 297.2649841308594 -cubic 167.77777099609375 320.6945495605469 157.25894165039062 348.3064880371094 154.99331665039062 368.6971740722656 -cubic 153.73828125 379.9924011230469 154.64419555664062 394.9398498535156 156.9720001220703 404.9161682128906 -cubic 159.416015625 415.3905029296875 165.41241455078125 428.8824157714844 170.89749145507812 437.1100158691406 -cubic 176.42770385742188 445.40533447265625 185.84152221679688 455.28985595703125 193.20802307128906 461.054931640625 -cubic 200.47618103027344 466.7430725097656 211.1742401123047 472.9150085449219 219.3665313720703 476.4259948730469 -cubic 235.3692169189453 483.2843017578125 257.8529968261719 487.5 275.0 487.5 -cubic 292.1470031738281 487.5 314.63079833984375 483.2843017578125 330.6334533691406 476.4259948730469 -cubic 338.82574462890625 472.9150085449219 349.5238037109375 466.7430725097656 356.7919616699219 461.054931640625 -cubic 364.1584777832031 455.28985595703125 373.5722961425781 445.40533447265625 379.1025085449219 437.1100158691406 -cubic 384.58758544921875 428.8824157714844 390.583984375 415.3905029296875 393.0279846191406 404.9161682128906 -cubic 395.3558044433594 394.9398498535156 396.26171875 379.9924011230469 395.0066833496094 368.6971740722656 -cubic 392.7410583496094 348.3064880371094 382.22222900390625 320.6945495605469 366.6025085449219 297.2649841308594 -line 325.0 325.0 -line 297.2649841308594 366.6025085449219 -cubic 320.6945495605469 382.22222900390625 348.3064880371094 392.7410583496094 368.6971740722656 395.0066833496094 -cubic 379.9924011230469 396.26171875 394.9398498535156 395.3558044433594 404.9161682128906 393.0279846191406 -cubic 415.3905029296875 390.583984375 428.8824157714844 384.58758544921875 437.1100158691406 379.1025085449219 -cubic 445.40533447265625 373.5722961425781 455.28985595703125 364.1584777832031 461.054931640625 356.7919616699219 -cubic 466.7430725097656 349.5238037109375 472.9150085449219 338.82574462890625 476.4259948730469 330.6334533691406 -cubic 483.2843017578125 314.63079833984375 487.5 292.1470031738281 487.5 275.0 -cubic 487.5 257.8529968261719 483.2843017578125 235.3692169189453 476.4259948730469 219.3665313720703 -cubic 472.9150085449219 211.1742401123047 466.7430725097656 200.47618103027344 461.054931640625 193.20802307128906 -cubic 455.28985595703125 185.84152221679688 445.40533447265625 176.42770385742188 437.1100158691406 170.89749145507812 -cubic 428.8824157714844 165.41241455078125 415.3905029296875 159.416015625 404.9161682128906 156.9720001220703 -cubic 394.9398498535156 154.64419555664062 379.9924011230469 153.73828125 368.6971740722656 154.99331665039062 -cubic 348.3064880371094 157.25894165039062 320.6945495605469 167.77777099609375 297.2649841308594 183.39749145507812 -line 325.0 225.0 -line 366.6025085449219 252.73501586914062 -cubic 382.22222900390625 229.30545043945312 392.7410583496094 201.69351196289062 395.0066833496094 181.30282592773438 -cubic 396.26171875 170.00759887695312 395.3558044433594 155.06015014648438 393.0279846191406 145.08383178710938 -cubic 390.583984375 134.6094970703125 384.58758544921875 121.11759948730469 379.1025085449219 112.8899917602539 -cubic 373.5722961425781 104.59465789794922 364.1584777832031 94.71015167236328 356.7919616699219 88.94506072998047 -cubic 349.5238037109375 83.25694274902344 338.82574462890625 77.0849838256836 330.6334533691406 73.5739974975586 -cubic 314.63079833984375 66.71570587158203 292.1470031738281 62.5 275.0 62.5 -cubic 257.8529968261719 62.5 235.3692169189453 66.71570587158203 219.3665313720703 73.5739974975586 -cubic 211.1742401123047 77.0849838256836 200.47618103027344 83.25694274902344 193.20802307128906 88.94506072998047 -cubic 185.84152221679688 94.71015167236328 176.42770385742188 104.59465789794922 170.89749145507812 112.8899917602539 -cubic 165.41241455078125 121.11759948730469 159.416015625 134.6094970703125 156.9720001220703 145.08383178710938 -cubic 154.64419555664062 155.06015014648438 153.73828125 170.00759887695312 154.99331665039062 181.30282592773438 -cubic 157.25894165039062 201.69351196289062 167.77777099609375 229.30545043945312 183.39749145507812 252.73501586914062 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB(50,50).shape (working copy) @@ -1,84 +0,0 @@ -move 125.0 125.0 -line 175.0 125.0 -line 175.0 25.0 -line 125.0 25.0 -line 125.0 125.0 -close -move 225.0 125.0 -line 275.0 125.0 -line 275.0 25.0 -line 225.0 25.0 -line 225.0 125.0 -close -move 325.0 125.0 -line 375.0 125.0 -line 375.0 25.0 -line 325.0 25.0 -line 325.0 125.0 -close -move 425.0 125.0 -line 475.0 125.0 -line 475.0 25.0 -line 425.0 25.0 -line 425.0 125.0 -close -move 425.0 125.0 -line 425.0 175.0 -line 525.0 175.0 -line 525.0 125.0 -line 425.0 125.0 -close -move 425.0 225.0 -line 425.0 275.0 -line 525.0 275.0 -line 525.0 225.0 -line 425.0 225.0 -close -move 425.0 325.0 -line 425.0 375.0 -line 525.0 375.0 -line 525.0 325.0 -line 425.0 325.0 -close -move 475.0 375.0 -line 425.0 375.0 -line 425.0 475.0 -line 475.0 475.0 -line 475.0 375.0 -close -move 375.0 375.0 -line 325.0 375.0 -line 325.0 475.0 -line 375.0 475.0 -line 375.0 375.0 -close -move 275.0 375.0 -line 225.0 375.0 -line 225.0 475.0 -line 275.0 475.0 -line 275.0 375.0 -close -move 175.0 375.0 -line 125.0 375.0 -line 125.0 475.0 -line 175.0 475.0 -line 175.0 375.0 -close -move 175.0 375.0 -line 175.0 325.0 -line 75.0 325.0 -line 75.0 375.0 -line 175.0 375.0 -close -move 175.0 275.0 -line 175.0 225.0 -line 75.0 225.0 -line 75.0 275.0 -line 175.0 275.0 -close -move 175.0 175.0 -line 175.0 125.0 -line 75.0 125.0 -line 75.0 175.0 -line 175.0 175.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d100SB(20,20).shape (working copy) @@ -1,639 +0,0 @@ -move 397.95294189453125 316.62847900390625 -cubic 395.0047607421875 311.1771545410156 392.8522033691406 306.8502502441406 390.67169189453125 302.0362548828125 -line 370.04180908203125 256.4906005859375 -line 278.95050048828125 297.7503662109375 -line 299.58038330078125 343.2960205078125 -cubic 302.5103759765625 349.7647705078125 306.2323303222656 357.2463073730469 309.992431640625 364.198974609375 -line 333.7776794433594 408.1792297363281 -line 421.7381896972656 360.6087341308594 -line 397.95294189453125 316.62847900390625 -close -move 385.12200927734375 288.12896728515625 -cubic 383.3640441894531 282.940185546875 382.5521240234375 279.8672180175781 381.7149353027344 275.484130859375 -line 372.3342590332031 226.37196350097656 -line 274.1099853515625 245.13331604003906 -line 283.4906311035156 294.2454528808594 -cubic 284.9808349609375 302.0473327636719 287.55523681640625 311.790771484375 290.4102478027344 320.2175598144531 -line 306.4545593261719 367.57342529296875 -line 401.1662902832031 335.48486328125 -line 385.12200927734375 288.12896728515625 -close -move 380.55889892578125 264.4924621582031 -cubic 380.5112609863281 260.20452880859375 380.6875305175781 258.3091125488281 381.4533996582031 253.9845733642578 -line 390.17291259765625 204.75074768066406 -line 291.70526123046875 187.31173706054688 -line 282.9857482910156 236.54556274414062 -cubic 281.4994812011719 244.93763732910156 280.459716796875 256.11981201171875 280.5650939941406 265.6033935546875 -line 281.1205749511719 315.6003112792969 -line 381.1143493652344 314.4893493652344 -line 380.55889892578125 264.4924621582031 -close -move 384.702392578125 241.51268005371094 -cubic 386.3394470214844 236.51611328125 388.120849609375 231.8849639892578 390.5310363769531 225.9099884033203 -line 409.2357177734375 179.5404510498047 -line 316.49658203125 142.13108825683594 -line 297.79193115234375 188.5006561279297 -cubic 295.0785217285156 195.22735595703125 292.0978088378906 202.97640991210938 289.6729736328125 210.37725830078125 -line 274.1052551269531 257.8919677734375 -line 369.1346740722656 289.0273742675781 -line 384.702392578125 241.51268005371094 -close -move 398.080810546875 207.46630859375 -cubic 400.58343505859375 201.27992248535156 403.38616943359375 194.1165771484375 405.9659729003906 186.85726928710938 -line 422.7089538574219 139.7438507080078 -line 328.4821472167969 106.2579116821289 -line 311.7391662597656 153.37130737304688 -cubic 309.6867370605469 159.1466522216797 307.66656494140625 164.30987548828125 305.3787841796875 169.96524047851562 -line 286.62823486328125 216.31625366210938 -line 379.3302917480469 253.81732177734375 -line 398.080810546875 207.46630859375 -close -move 413.05279541015625 164.6625213623047 -cubic 415.0039367675781 157.7333984375 417.0391540527344 149.44639587402344 418.6227111816406 141.57589721679688 -line 428.4851989746094 92.55824279785156 -line 330.44989013671875 72.83329010009766 -line 320.58740234375 121.85094451904297 -cubic 319.4208068847656 127.64897155761719 318.2911682128906 132.24867248535156 316.7961730957031 137.55789184570312 -line 303.2438659667969 185.68618774414062 -line 399.50048828125 212.7908477783203 -line 413.05279541015625 164.6625213623047 -close -move 422.41522216796875 118.17378997802734 -cubic 423.3000793457031 111.03466796875 424.0540466308594 102.67680358886719 424.4771423339844 94.79749298095703 -line 427.1581726074219 44.86941909790039 -line 327.3020324707031 39.507389068603516 -line 324.6210021972656 89.43545532226562 -cubic 324.2952880859375 95.50123596191406 323.8543395996094 100.3893051147461 323.17462158203125 105.87335968017578 -line 317.0244140625 155.49365234375 -line 416.2650146484375 167.79409790039062 -line 422.41522216796875 118.17378997802734 -close -move 325.0193176269531 78.85694122314453 -cubic 325.0975646972656 86.6409683227539 325.4534912109375 94.87555694580078 325.983154296875 101.98471069335938 -line 329.6981506347656 151.8465118408203 -line 429.4217529296875 144.41650390625 -line 425.7067565917969 94.55470275878906 -cubic 425.2928771972656 89.0 425.0758361816406 83.97859191894531 425.0142822265625 77.8519058227539 -line 424.51177978515625 27.85441780090332 -line 324.51678466796875 28.859464645385742 -line 325.0193176269531 78.85694122314453 -close -move 328.5831298828125 125.5312271118164 -cubic 329.7535705566406 133.46376037597656 331.35015869140625 141.86898803710938 332.94964599609375 148.92823791503906 -line 343.9986572265625 197.69215393066406 -line 441.5264892578125 175.59414672851562 -line 430.47747802734375 126.83023834228516 -cubic 429.2658996582031 121.4830093383789 428.3815612792969 116.82746124267578 427.51202392578125 110.93417358398438 -line 420.2135009765625 61.4697151184082 -line 321.28460693359375 76.0667953491211 -line 328.5831298828125 125.5312271118164 -close -move 339.0412292480469 171.78634643554688 -cubic 341.3503723144531 179.3268585205078 344.0313415527344 187.0167236328125 346.4640808105469 193.5125732421875 -line 363.9999694824219 240.3366241455078 -line 457.6480712890625 205.2648468017578 -line 440.1121826171875 158.4407958984375 -cubic 438.0806579589844 153.01620483398438 436.40673828125 148.2148895263672 434.6583557128906 142.5055694580078 -line 420.0179748535156 94.69701385498047 -line 324.4008483886719 123.97777557373047 -line 339.0412292480469 171.78634643554688 -close -move 354.4413757324219 213.64483642578125 -cubic 357.1103515625 220.13851928710938 359.47344970703125 225.80517578125 361.585205078125 231.24830627441406 -line 379.6701965332031 277.863037109375 -line 472.899658203125 241.6930389404297 -line 454.8146667480469 195.07830810546875 -cubic 452.250732421875 188.4697265625 449.5052185058594 181.8860321044922 446.93377685546875 175.62960815429688 -line 427.9261779785156 129.38340759277344 -line 335.4337463378906 167.3986358642578 -line 354.4413757324219 213.64483642578125 -close -move 366.6175537109375 245.79624938964844 -cubic 367.9993591308594 250.61300659179688 368.5456848144531 253.12094116210938 369.0575256347656 257.425048828125 -line 374.9617614746094 307.0752258300781 -line 474.2621154785156 295.2667541503906 -line 468.3578796386719 245.61656188964844 -cubic 467.27801513671875 236.5358123779297 465.01708984375 226.15721130371094 462.74053955078125 218.22132873535156 -line 448.95306396484375 170.1598358154297 -line 352.8301086425781 197.73475646972656 -line 366.6175537109375 245.79624938964844 -close -move 369.29876708984375 267.8953552246094 -cubic 368.99700927734375 272.08953857421875 368.6208190917969 274.5162048339844 367.4283142089844 279.4223327636719 -line 355.6187744140625 328.0076599121094 -line 452.7893981933594 351.62677001953125 -line 464.5989685058594 303.04144287109375 -cubic 466.7917785644531 294.0200500488281 468.4449157714844 283.3559265136719 469.04095458984375 275.0715026855469 -line 472.6290283203125 225.2003936767578 -line 372.8868408203125 218.02427673339844 -line 369.29876708984375 267.8953552246094 -close -move 363.30523681640625 292.5066223144531 -cubic 361.4991149902344 297.2723693847656 359.73370361328125 301.3553466796875 357.0705261230469 306.8489074707031 -line 335.25927734375 351.8407897949219 -line 425.2430419921875 395.4632873535156 -line 447.0542907714844 350.4714050292969 -cubic 450.66180419921875 343.0298767089844 454.196533203125 334.8549499511719 456.8153381347656 327.9446716308594 -line 474.53436279296875 281.1896057128906 -line 381.0242614746094 245.75157165527344 -line 363.30523681640625 292.5066223144531 -close -move 349.3143310546875 321.5670471191406 -cubic 346.5519104003906 326.4518737792969 343.78570556640625 331.0794372558594 340.3935546875 336.47314453125 -line 313.774658203125 378.7984924316406 -line 398.4253234863281 432.0362548828125 -line 425.0442199707031 389.7109375 -cubic 429.0389709472656 383.359130859375 433.0039978027344 376.7259521484375 436.3594970703125 370.7924499511719 -line 460.9721984863281 327.2698669433594 -line 373.9270324707031 278.0444641113281 -line 349.3143310546875 321.5670471191406 -close -move 407.8917541503906 413.20880126953125 -cubic 413.3001708984375 409.69683837890625 418.0060729980469 406.776611328125 422.9278259277344 403.8692932128906 -line 465.97796630859375 378.4393005371094 -line 415.1180114746094 292.3389892578125 -line 372.0678405761719 317.76898193359375 -cubic 366.2060241699219 321.2315979003906 359.700439453125 325.2686462402344 353.4312438964844 329.33953857421875 -line 311.4966125488281 356.5697937011719 -line 365.9571228027344 440.4390563964844 -line 407.8917541503906 413.20880126953125 -close -move 438.0824890136719 395.4648132324219 -cubic 443.5653381347656 392.6404724121094 447.79437255859375 390.6627502441406 452.5959167480469 388.6507873535156 -line 498.7110290527344 369.32733154296875 -line 460.06414794921875 277.0970764160156 -line 413.9490051269531 296.4205322265625 -cubic 407.2733459472656 299.21783447265625 399.4715576171875 302.8663330078125 392.2889099121094 306.5662841796875 -line 347.83966064453125 329.46307373046875 -line 393.6332092285156 418.3616027832031 -line 438.0824890136719 395.4648132324219 -close -move 466.148193359375 383.7652893066406 -cubic 471.1794128417969 382.2823791503906 473.9269714355469 381.6936340332031 478.1866149902344 381.11187744140625 -line 527.7267456054688 374.34600830078125 -line 514.1949462890625 275.2657470703125 -line 464.65484619140625 282.0316467285156 -cubic 456.6603088378906 283.1235046386719 446.5322265625 285.29376220703125 437.87664794921875 287.84490966796875 -line 389.9164733886719 301.9806823730469 -line 418.18798828125 397.90106201171875 -line 466.148193359375 383.7652893066406 -close -move 488.75347900390625 380.620361328125 -cubic 493.0321044921875 380.8304443359375 495.1474304199219 381.15399169921875 499.6991271972656 382.2092590332031 -line 548.4072875976562 393.5015563964844 -line 570.9918212890625 296.085205078125 -line 522.28369140625 284.7929382324219 -cubic 514.0267944335938 282.8786926269531 503.0706787109375 281.2029113769531 493.6580810546875 280.7406921386719 -line 443.71826171875 278.28839111328125 -line 438.8136291503906 378.1680603027344 -line 488.75347900390625 380.620361328125 -close -move 513.140380859375 386.30816650390625 -cubic 518.336181640625 388.1827392578125 523.4599609375 390.2547302246094 529.6699829101562 392.8065490722656 -line 575.917724609375 411.8104248046875 -line 613.9254760742188 319.31494140625 -line 567.677734375 300.3110656738281 -cubic 561.208984375 297.6529541015625 554.0626220703125 294.7630615234375 547.0777587890625 292.2430114746094 -line 500.0451965332031 275.2743225097656 -line 466.1077880859375 369.3394775390625 -line 513.140380859375 386.30816650390625 -close -move 548.8658447265625 400.6082458496094 -cubic 555.2318115234375 403.1103210449219 562.6961669921875 405.8952331542969 570.13525390625 408.37469482421875 -line 617.56982421875 424.1847839355469 -line 649.1900634765625 329.315673828125 -line 601.7554931640625 313.5055236816406 -cubic 595.9945678710938 311.5854187011719 591.00244140625 309.7228698730469 585.446044921875 307.5389709472656 -line 538.9114379882812 289.2488708496094 -line 502.3312072753906 382.3181457519531 -line 548.8658447265625 400.6082458496094 -close -move 592.7608032226562 415.0467529296875 -cubic 599.76171875 416.8363037109375 608.1218872070312 418.6674499511719 616.032958984375 420.0552062988281 -line 665.281005859375 428.6942443847656 -line 682.5590209960938 330.1982116699219 -line 633.31103515625 321.5591735839844 -cubic 627.4674682617188 320.5340881347656 622.8492431640625 319.5225524902344 617.5257568359375 318.16180419921875 -line 569.083251953125 305.7793273925781 -line 544.318359375 402.6642761230469 -line 592.7608032226562 415.0467529296875 -close -move 639.3992309570312 423.26416015625 -cubic 646.49853515625 423.9767761230469 654.7675170898438 424.53814697265625 662.5696411132812 424.7964172363281 -line 712.5422973632812 426.4505310058594 -line 715.8504638671875 326.50518798828125 -line 665.8778076171875 324.85113525390625 -cubic 659.809814453125 324.6502990722656 654.8812866210938 324.3157043457031 649.3870239257812 323.7641906738281 -line 599.6370239257812 318.7702941894531 -line 589.6492309570312 418.270263671875 -line 639.3992309570312 423.26416015625 -close -move 663.5684814453125 325.1719055175781 -cubic 655.7774658203125 325.408447265625 647.5214233398438 325.9444580078125 640.4282836914062 326.6341552734375 -line 590.6629638671875 331.4731750488281 -line 600.341064453125 431.0037536621094 -line 650.1063232421875 426.16473388671875 -cubic 655.6017456054688 425.63037109375 660.5355834960938 425.3100891113281 666.6034545898438 425.1258239746094 -line 716.5803833007812 423.60833740234375 -line 713.5454711914062 323.6544189453125 -line 663.5684814453125 325.1719055175781 -close -move 617.0698852539062 329.76470947265625 -cubic 609.1542358398438 331.12579345703125 600.7859497070312 332.92864990234375 593.7761840820312 334.69549560546875 -line 545.2926025390625 346.9160461425781 -line 569.7337036132812 443.8832092285156 -line 618.21728515625 431.66265869140625 -cubic 623.543701171875 430.32012939453125 628.166015625 429.3243103027344 634.0161743164062 428.318359375 -line 683.2930297851562 419.84521484375 -line 666.3466796875 321.29156494140625 -line 617.0698852539062 329.76470947265625 -close -move 571.0960083007812 341.30657958984375 -cubic 563.6333618164062 343.7704162597656 556.1302490234375 346.54949951171875 549.740478515625 349.048828125 -line 503.1758117675781 367.2623596191406 -line 539.6029052734375 460.39166259765625 -line 586.1675415039062 442.1781311035156 -cubic 591.7133178710938 440.0089416503906 596.6860961914062 438.1670837402344 602.4470825195312 436.2650451660156 -line 649.9263305664062 420.5895080566406 -line 618.5752563476562 325.63104248046875 -line 571.0960083007812 341.30657958984375 -close -move 530.4323120117188 356.8800048828125 -cubic 524.196044921875 359.4454650878906 519.011962890625 361.55224609375 513.7924194335938 363.455322265625 -line 466.8174743652344 380.5829162597656 -line 501.07257080078125 474.53277587890625 -line 548.0475463867188 457.4052429199219 -cubic 554.9760131835938 454.8790588378906 562.042724609375 452.0071716308594 568.4761962890625 449.3606262207031 -line 614.7164916992188 430.33868408203125 -line 576.672607421875 337.8580627441406 -line 530.4323120117188 356.8800048828125 -close -move 500.21051025390625 367.67041015625 -cubic 495.63226318359375 368.7634582519531 493.4797668457031 369.10980224609375 489.2049865722656 369.3555908203125 -line 439.2874450683594 372.2257385253906 -line 445.0277099609375 472.06085205078125 -line 494.9452819824219 469.1907043457031 -cubic 504.3210754394531 468.651611328125 515.2135009765625 466.89898681640625 523.432373046875 464.936767578125 -line 572.0655517578125 453.3258361816406 -line 548.8436889648438 356.0594787597656 -line 500.21051025390625 367.67041015625 -close -move 478.6529541015625 368.9501037597656 -cubic 474.4081726074219 368.40155029296875 471.70294189453125 367.8402099609375 466.6932067871094 366.3937072753906 -line 418.655517578125 352.52349853515625 -line 390.9151306152344 448.5988464355469 -line 438.9527893066406 462.46905517578125 -cubic 447.6388854980469 464.97705078125 457.8172607421875 467.08905029296875 465.83648681640625 468.1253967285156 -line 515.4241333007812 474.53363037109375 -line 528.2406005859375 375.35833740234375 -line 478.6529541015625 368.9501037597656 -close -move 453.1929016113281 361.5979919433594 -cubic 448.39447021484375 359.60955810546875 444.1807556152344 357.6562194824219 438.69525146484375 354.8497619628906 -line 394.1825256347656 332.07659912109375 -line 348.63616943359375 421.1020202636719 -line 393.1488952636719 443.8752136230469 -cubic 400.3621520996094 447.5655822753906 408.2073669433594 451.202392578125 414.9106750488281 453.9801940917969 -line 461.1017761230469 473.1213073730469 -line 499.3840026855469 380.7391052246094 -line 453.1929016113281 361.5979919433594 -close -move 423.5319519042969 346.4867858886719 -cubic 418.63232421875 343.60552978515625 413.95294189453125 340.7135009765625 408.5679626464844 337.2294921875 -line 366.5880126953125 310.06915283203125 -line 312.267333984375 394.02899169921875 -line 354.24725341796875 421.1893615722656 -cubic 360.50018310546875 425.23492431640625 366.99420166015625 429.24847412109375 372.8416748046875 432.6871032714844 -line 415.94183349609375 458.0322265625 -line 466.6321105957031 371.8319396972656 -line 423.5319519042969 346.4867858886719 -close -move 339.9820861816406 412.8738708496094 -cubic 343.3788146972656 418.2538146972656 346.15643310546875 422.87860107421875 348.92999267578125 427.7552490234375 -line 373.6488952636719 471.21759033203125 -line 460.5735778808594 421.77978515625 -line 435.85467529296875 378.31744384765625 -cubic 432.4942932128906 372.40899658203125 428.53125 365.8104553222656 424.5390319824219 359.4873352050781 -line 397.84576416015625 317.2088623046875 -line 313.288818359375 370.59539794921875 -line 339.9820861816406 412.8738708496094 -close -move 356.7868957519531 442.5682373046875 -cubic 359.47015380859375 448.0619201660156 361.26123046875 452.1639709472656 363.09228515625 456.9350280761719 -line 381.0074462890625 503.61529541015625 -line 474.36798095703125 467.784912109375 -line 456.4527893066406 421.10467529296875 -cubic 453.8113708496094 414.22210693359375 450.261474609375 406.0917663574219 446.6417236328125 398.68072509765625 -line 424.6979675292969 353.7532958984375 -line 334.8431396484375 397.6408386230469 -line 356.7868957519531 442.5682373046875 -close -move 367.3051452636719 470.077392578125 -cubic 368.5283203125 474.98480224609375 368.92724609375 477.44207763671875 369.2627868652344 481.63153076171875 -line 373.2546081542969 531.471923828125 -line 472.9353942871094 523.48828125 -line 468.9435729980469 473.64788818359375 -cubic 468.2844543457031 465.41802978515625 466.5679016113281 454.8448791503906 464.3365173339844 445.8924255371094 -line 452.2440185546875 397.3767395019531 -line 355.2126770019531 421.56170654296875 -line 367.3051452636719 470.077392578125 -close -move 369.1094665527344 492.12274169921875 -cubic 368.63336181640625 496.417236328125 368.1169738769531 498.8703308105469 366.77435302734375 503.6513977050781 -line 353.25628662109375 551.7893676757812 -line 449.5322265625 578.825439453125 -line 463.0502624511719 530.6875 -cubic 465.289306640625 522.7142944335938 467.4892272949219 512.2637329101562 468.5005187988281 503.14178466796875 -line 474.0100402832031 453.4462585449219 -line 374.6189880371094 442.4272155761719 -line 369.1094665527344 492.12274169921875 -close -move 361.8493957519531 518.068359375 -cubic 359.7641296386719 523.4803466796875 357.4334411621094 529.08251953125 354.77642822265625 535.5404663085938 -line 335.75201416015625 581.7797241210938 -line 428.2304992675781 619.82861328125 -line 447.2549743652344 573.58935546875 -cubic 449.8373107910156 567.3129272460938 452.60101318359375 560.6698608398438 455.1622009277344 554.0228271484375 -line 473.1394348144531 507.3664245605469 -line 379.8266296386719 471.4119567871094 -line 361.8493957519531 518.068359375 -close -move 346.80914306640625 555.5690307617188 -cubic 344.3619689941406 562.0609130859375 341.66156005859375 569.7399291992188 339.3274841308594 577.28369140625 -line 324.5484619140625 625.0496215820312 -line 420.08026123046875 654.6076049804688 -line 434.8592834472656 606.8417358398438 -cubic 436.6303405761719 601.1176147460938 438.32843017578125 596.2888793945312 440.3817443847656 590.8418579101562 -line 458.0181579589844 544.0555419921875 -line 364.445556640625 508.7827453613281 -line 346.80914306640625 555.5690307617188 -close -move 333.16961669921875 600.1080322265625 -cubic 331.5473327636719 607.1635131835938 329.92303466796875 615.5676879882812 328.7273864746094 623.5012817382812 -line 321.27630615234375 672.9429931640625 -line 420.1596374511719 687.84521484375 -line 427.61077880859375 638.4035034179688 -cubic 428.49835205078125 632.5140991210938 429.39739990234375 627.8623046875 430.6265563964844 622.5167236328125 -line 441.8309020996094 573.7882690429688 -line 344.37396240234375 551.3795776367188 -line 333.16961669921875 600.1080322265625 -close -move 326.0550842285156 647.0678100585938 -cubic 325.5074462890625 654.1521606445312 325.1299133300781 662.3619995117188 325.0309753417969 670.1195678710938 -line 324.39349365234375 720.1155395507812 -line 424.3853759765625 721.3904418945312 -line 425.0228576660156 671.39453125 -cubic 425.1006164550781 665.2971801757812 425.3302001953125 660.3040771484375 425.75762939453125 654.7750244140625 -line 429.6112365722656 604.9237670898438 -line 329.90869140625 597.216552734375 -line 326.0550842285156 647.0678100585938 -close -move 424.5281066894531 656.1770629882812 -cubic 424.1273193359375 648.3074951171875 423.39935302734375 639.960693359375 422.53759765625 632.8262329101562 -line 416.5416564941406 583.1870727539062 -line 317.2632751464844 595.1788940429688 -line 323.25921630859375 644.818115234375 -cubic 323.92181396484375 650.3036499023438 324.3486022949219 655.1971435546875 324.6575622558594 661.2634887695312 -line 327.2007751464844 711.1987915039062 -line 427.0713195800781 706.1123046875 -line 424.5281066894531 656.1770629882812 -close -move 418.82269287109375 609.4265747070312 -cubic 417.2649230957031 601.5499877929688 415.2561340332031 593.2518920898438 413.3257141113281 586.3126220703125 -line 399.92535400390625 538.1417846679688 -line 303.58367919921875 564.9425048828125 -line 316.9840393066406 613.1133422851562 -cubic 318.4612731933594 618.4237060546875 319.5750732421875 623.0245971679688 320.7228698730469 628.8281860351562 -line 330.4236755371094 677.8781127929688 -line 428.52349853515625 658.4765014648438 -line 418.82269287109375 609.4265747070312 -close -move 406.28997802734375 564.0580444335938 -cubic 403.72186279296875 556.7743530273438 400.9188232421875 549.5696411132812 398.41424560546875 543.359130859375 -line 379.7135314941406 496.98797607421875 -line 286.9712219238281 534.389404296875 -line 305.67193603515625 580.7605590820312 -cubic 307.946533203125 586.4006958007812 309.9453430175781 591.538330078125 311.9803771972656 597.3101196289062 -line 328.6064147949219 644.4649047851562 -line 422.916015625 611.2128295898438 -line 406.28997802734375 564.0580444335938 -close -move 390.8320007324219 524.834716796875 -cubic 388.39691162109375 518.8199462890625 386.57244873046875 514.1155395507812 384.900390625 509.087158203125 -line 369.1235046386719 461.6415100097656 -line 274.2322082519531 493.1952819824219 -line 290.00909423828125 540.6409301757812 -cubic 292.45343017578125 547.9918212890625 295.428955078125 555.6641845703125 298.1401672363281 562.3610229492188 -line 316.9033203125 608.7069091796875 -line 409.59515380859375 571.1806640625 -line 390.8320007324219 524.834716796875 -close -move 381.5398864746094 496.49346923828125 -cubic 380.73663330078125 492.1441345214844 380.54290771484375 490.2286682128906 380.5558166503906 485.94775390625 -line 380.70648193359375 435.9479675292969 -line 280.7069091796875 435.6466369628906 -line 280.5562438964844 485.64642333984375 -cubic 280.5277099609375 495.1225891113281 281.6561584472656 506.2798156738281 283.2028503417969 514.6546630859375 -line 292.283447265625 563.8231811523438 -line 390.6204833984375 545.6619873046875 -line 381.5398864746094 496.49346923828125 -close -move 381.6192321777344 475.02655029296875 -cubic 382.4215393066406 470.6609802246094 383.201904296875 467.63201904296875 384.9228820800781 462.4638366699219 -line 400.72003173828125 415.0249328613281 -line 305.84222412109375 383.4306335449219 -line 290.0450744628906 430.8695373535156 -cubic 287.2287902832031 439.3268737792969 284.7052001953125 449.1223449707031 283.2664794921875 456.9506530761719 -line 274.2285461425781 506.12701416015625 -line 372.5812683105469 524.2029418945312 -line 381.6192321777344 475.02655029296875 -close -move 390.3847961425781 448.6003112792969 -cubic 392.5435791015625 443.786865234375 394.673583984375 439.4712829589844 397.60626220703125 434.0145568847656 -line 421.2763366699219 389.9721984863281 -line 333.191650390625 342.632080078125 -line 309.5215759277344 386.6744079589844 -cubic 305.7683410644531 393.657958984375 302.0548095703125 401.181884765625 299.1412048339844 407.6783142089844 -line 278.6802062988281 453.30010986328125 -line 369.9237976074219 494.22210693359375 -line 390.3847961425781 448.6003112792969 -close -move 406.259033203125 418.93988037109375 -cubic 409.33709716796875 413.8739013671875 412.4419860839844 408.9960021972656 416.1368713378906 403.4346618652344 -line 443.8061828613281 361.7884216308594 -line 360.5137023925781 306.4497985839844 -line 332.8443908691406 348.0960388183594 -cubic 328.6076354980469 354.4729919433594 324.4169921875 361.0566101074219 320.7974853515625 367.01373291015625 -line 294.83441162109375 409.7445068359375 -line 380.29595947265625 461.670654296875 -line 406.259033203125 418.93988037109375 -close -move 332.3170166015625 342.97406005859375 -cubic 326.84161376953125 346.3288879394531 322.2059631347656 349.0130310058594 317.27557373046875 351.6960144042969 -line 273.3572082519531 375.5953369140625 -line 321.1558837890625 463.4320983886719 -line 365.0742492675781 439.5327453613281 -cubic 371.16815185546875 436.2165832519531 378.0257263183594 432.2458801269531 384.5609130859375 428.2417297363281 -line 427.19476318359375 402.1197814941406 -line 374.9508361816406 316.85211181640625 -line 332.3170166015625 342.97406005859375 -close -move 302.6781311035156 359.0361328125 -cubic 297.2720947265625 361.5087585449219 293.3910827636719 363.0664978027344 288.72833251953125 364.6731872558594 -line 241.45603942871094 380.9621276855469 -line 274.0339050292969 475.5067138671875 -line 321.30621337890625 459.2177734375 -cubic 328.326171875 456.7988586425781 336.71563720703125 453.4315490722656 344.272216796875 449.97528076171875 -line 389.7417907714844 429.17822265625 -line 348.147705078125 338.2391052246094 -line 302.6781311035156 359.0361328125 -close -move 276.00128173828125 368.1844177246094 -cubic 271.25054931640625 369.12603759765625 269.07330322265625 369.3548278808594 264.93560791015625 369.4343566894531 -line 214.94482421875 370.3951721191406 -line 216.86651611328125 470.3767395019531 -line 266.8572692871094 469.4158935546875 -cubic 275.2710266113281 469.2541809082031 286.2281188964844 468.1027526855469 295.443359375 466.2762451171875 -line 344.4892578125 456.5552062988281 -line 325.0472106933594 358.46337890625 -line 276.00128173828125 368.1844177246094 -close -move 254.4525604248047 368.6277160644531 -cubic 250.0601348876953 367.8829650878906 247.1611328125 367.12139892578125 242.10585021972656 365.490478515625 -line 194.52093505859375 350.13873291015625 -line 163.8174285888672 445.3085632324219 -line 211.40234375 460.6603088378906 -cubic 219.08433532714844 463.1386413574219 228.9563446044922 465.7319641113281 237.73573303222656 467.2205505371094 -line 287.03216552734375 475.5789794921875 -line 303.74896240234375 376.9861145019531 -line 254.4525604248047 368.6277160644531 -close -move 226.64730834960938 359.76580810546875 -cubic 221.02432250976562 357.5066223144531 214.97682189941406 354.9656677246094 208.2852783203125 352.2509460449219 -line 161.9529266357422 333.4543151855469 -line 124.35967254638672 426.1190185546875 -line 170.6920166015625 444.9156494140625 -cubic 176.81057739257812 447.39788818359375 183.01329040527344 450.0040588378906 189.36627197265625 452.5565490722656 -line 235.76165771484375 471.1970520019531 -line 273.04266357421875 378.4063415527344 -line 226.64730834960938 359.76580810546875 -close -move 187.76654052734375 344.3584289550781 -cubic 181.15098571777344 341.9892883300781 173.27963256835938 339.4011535644531 165.63230895996094 337.221923828125 -line 117.54661560058594 323.5191345214844 -line 90.14102172851562 419.6905212402344 -line 138.22671508789062 433.393310546875 -cubic 143.94741821289062 435.02349853515625 148.6703643798828 436.5764465332031 154.05174255371094 438.50360107421875 -line 201.1243438720703 455.3609924316406 -line 234.839111328125 361.2158203125 -line 187.76654052734375 344.3584289550781 -close -move 142.5737762451172 331.5797424316406 -cubic 135.49476623535156 330.1312255859375 127.09080505371094 328.7165832519531 119.16996002197266 327.7098083496094 -line 69.5689926147461 321.40545654296875 -line 56.960289001464844 420.6073913574219 -line 106.5612564086914 426.9117431640625 -cubic 112.48065948486328 427.6640930175781 117.16581726074219 428.4527587890625 122.5268325805664 429.54974365234375 -line 171.51182556152344 439.5732116699219 -line 191.5587921142578 341.60321044921875 -line 142.5737762451172 331.5797424316406 -close -move 95.76884460449219 325.57635498046875 -cubic 89.34386444091797 325.21356201171875 81.95802307128906 325.0 75.0 325.0 -line 75.0 425.0 -cubic 75.91751098632812 425.0 76.92216491699219 424.9963073730469 77.83012390136719 424.9896240234375 -line 127.82878112792969 424.621826171875 -line 127.09320068359375 324.62451171875 -line 77.09454345703125 324.9923095703125 -cubic 76.36996459960938 324.9976501464844 75.73309326171875 325.0 75.0 325.0 -line 75.0 425.0 -cubic 80.51260375976562 425.0 85.0790023803711 425.1320495605469 90.13096618652344 425.41729736328125 -line 140.05142211914062 428.2362365722656 -line 145.6893310546875 328.3952941894531 -line 95.76884460449219 325.57635498046875 -close -move 101.0340576171875 424.0863342285156 -cubic 108.97181701660156 423.5171203613281 117.39495086669922 422.59326171875 124.55989837646484 421.5586853027344 -line 174.0466766357422 414.4129943847656 -line 159.7552947998047 315.439453125 -line 110.2685317993164 322.58514404296875 -cubic 104.79429626464844 323.3756103515625 99.94084930419922 323.9079284667969 93.88111114501953 324.3424987792969 -line 44.009185791015625 327.9189758300781 -line 51.162147521972656 427.6628112792969 -line 101.0340576171875 424.0863342285156 -close -move 147.9599609375 417.26812744140625 -cubic 155.78607177734375 415.52117919921875 163.99200439453125 413.3221435546875 170.85108947753906 411.2436828613281 -line 218.70240783691406 396.74359130859375 -line 189.70225524902344 301.0409851074219 -line 141.85093688964844 315.5410461425781 -cubic 136.54222106933594 317.14971923828125 131.9401092529297 318.38299560546875 126.1742935180664 319.6700439453125 -line 77.37525939941406 330.5628662109375 -line 99.1609115600586 428.16094970703125 -line 147.9599609375 417.26812744140625 -close -move 192.6420440673828 403.8609313964844 -cubic 199.80606079101562 401.1949462890625 206.74728393554688 398.39007568359375 212.822998046875 395.89617919921875 -line 259.07794189453125 376.9098815917969 -line 221.10537719726562 284.4000244140625 -line 174.85043334960938 303.38629150390625 -cubic 169.02804565429688 305.77618408203125 163.62796020507812 307.9582824707031 157.76512145996094 310.14007568359375 -line 110.90470886230469 327.57855224609375 -line 145.78160095214844 421.29937744140625 -line 192.6420440673828 403.8609313964844 -close -move 230.55789184570312 388.68353271484375 -cubic 236.28111267089844 386.4486999511719 240.43942260742188 384.9490966796875 245.24119567871094 383.5433044433594 -line 293.2270202636719 369.49481201171875 -line 265.1300354003906 273.5231628417969 -line 217.1442108154297 287.5716552734375 -cubic 209.39950561523438 289.8390197753906 201.12603759765625 292.82269287109375 194.18426513671875 295.5333251953125 -line 147.60916137695312 313.72015380859375 -line 183.9827880859375 406.8703308105469 -line 230.55789184570312 388.68353271484375 -close -move 256.9715270996094 380.99822998046875 -cubic 261.19354248046875 380.46240234375 263.03668212890625 380.38934326171875 267.42706298828125 380.6694641113281 -line 317.32562255859375 383.8529968261719 -line 323.6927185058594 284.055908203125 -line 273.7941589355469 280.8723449707031 -cubic 264.2430114746094 280.26300048828125 252.90257263183594 280.7125244140625 244.38150024414062 281.7939453125 -line 194.7793731689453 288.0889587402344 -line 207.36936950683594 387.2932434082031 -line 256.9715270996094 380.99822998046875 -close -move 278.9277648925781 382.4530029296875 -cubic 283.3831787109375 383.50836181640625 286.6992492675781 384.5206298828125 291.9533996582031 386.4864501953125 -line 338.78302001953125 404.0074462890625 -line 373.8250427246094 310.3481750488281 -line 326.9953918457031 292.8271789550781 -cubic 318.8491516113281 289.7793273925781 309.53240966796875 286.93524169921875 301.97662353515625 285.1455078125 -line 253.32286071777344 273.62109375 -line 230.27403259277344 370.9285583496094 -line 278.9277648925781 382.4530029296875 -close -move 306.2700500488281 392.64990234375 -cubic 311.0853271484375 394.9666442871094 315.4786682128906 397.26123046875 320.8934631347656 400.3058166503906 -line 364.47650146484375 424.811279296875 -line 413.4874267578125 337.64520263671875 -line 369.9043884277344 313.1397399902344 -cubic 363.1430969238281 309.3380432128906 355.92254638671875 305.5668029785156 349.62506103515625 302.5369873046875 -line 304.568603515625 280.8594970703125 -line 261.2135925292969 370.9723815917969 -line 306.2700500488281 392.64990234375 -close -move 335.8232421875 409.1985168457031 -cubic 339.6064147949219 411.5684509277344 343.2195129394531 413.905517578125 347.2649841308594 416.6025085449219 -line 416.6025085449219 347.2649841308594 -cubic 412.879150390625 341.679931640625 409.7454528808594 336.7754211425781 406.6407470703125 331.6870422363281 -line 380.597900390625 289.0048522949219 -line 295.2334899902344 341.09051513671875 -line 321.2763366699219 383.7727355957031 -cubic 324.9203186035156 389.7449035644531 329.1348571777344 396.341064453125 333.3974914550781 402.7350158691406 -line 375.0 375.0 -line 402.7350158691406 333.3974914550781 -cubic 398.1130065917969 330.316162109375 393.3090515136719 327.20880126953125 388.9111022949219 324.4537353515625 -line 346.5387268066406 297.9097900390625 -line 293.4508361816406 382.65460205078125 -line 335.8232421875 409.1985168457031 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5.shape (working copy) @@ -1,7 +0,0 @@ -move 225.0 75.0 -line 75.0 325.0 -line 375.0 175.0 -line 75.0 175.0 -line 225.0 425.0 -line 375.0 275.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1.shape (working copy) @@ -1,3 +0,0 @@ -move 225.0 75.0 -quad 575.0 75.0 75.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50RM10(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50RM10(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50RM10(100,100).shape (working copy) @@ -1,44 +0,0 @@ -move 197.36068725585938 186.1803436279297 -quad 212.08811950683594 156.72544860839844 223.38865661621094 150.63726806640625 -quad 224.6897430419922 149.93630981445312 225.0859375 150.0123291015625 -quad 227.2179412841797 150.42140197753906 231.1112060546875 154.01292419433594 -cubic 241.2596435546875 163.37484741210938 257.075927734375 162.73724365234375 266.4378356933594 152.5887908935547 -cubic 275.7997741699219 142.4403533935547 275.16217041015625 126.62409210205078 265.01373291015625 117.26216125488281 -quad 250.641357421875 104.00367736816406 234.50775146484375 100.9080581665039 -quad 216.63832092285156 97.47938537597656 199.67379760742188 106.61903381347656 -quad 174.44309997558594 120.21208953857422 152.63931274414062 163.8196563720703 -cubic 146.46458435058594 176.16912841796875 151.47018432617188 191.1859588623047 163.8196563720703 197.36068725585938 -cubic 176.16912841796875 203.53541564941406 191.1859588623047 198.52981567382812 197.36068725585938 186.1803436279297 -close -move 297.5986022949219 220.7688751220703 -quad 299.8779602050781 223.6602020263672 299.9993591308594 224.9905548095703 -quad 300.0470275878906 225.5130615234375 299.0299987792969 227.19180297851562 -quad 292.21429443359375 238.44200134277344 263.8196716308594 252.63931274414062 -line 256.3661193847656 256.3660888671875 -line 252.63931274414062 263.8196716308594 -quad 251.653076171875 265.79217529296875 250.67042541503906 267.6719970703125 -cubic 244.2742156982422 279.9082336425781 249.00848388671875 295.0127868652344 261.2447204589844 301.40899658203125 -cubic 273.4809265136719 307.8052062988281 288.5854797363281 303.0709228515625 294.981689453125 290.834716796875 -quad 296.1730041503906 288.5556945800781 297.3606872558594 286.1803283691406 -line 275.0 275.0 -line 286.1803283691406 297.3606872558594 -quad 327.4942321777344 276.7037353515625 341.7942810058594 253.0996551513672 -quad 351.3351135253906 237.3512725830078 349.7924499511719 220.44662475585938 -quad 348.3235168457031 204.349853515625 336.8643493652344 189.8140411376953 -cubic 328.31640625 178.97109985351562 312.59698486328125 177.1106414794922 301.7540588378906 185.6585693359375 -cubic 290.9111022949219 194.20651245117188 289.0506591796875 209.9259490966797 297.5986022949219 220.7688751220703 -close -move 216.7413787841797 293.85931396484375 -quad 207.49583435058594 284.0899658203125 197.36068725585938 263.8196716308594 -line 193.6339111328125 256.3661193847656 -line 186.1803436279297 252.63931274414062 -quad 158.2751922607422 238.68673706054688 151.1505126953125 227.4824676513672 -cubic 143.7417449951172 215.8314208984375 128.29071044921875 212.39239501953125 116.63967895507812 219.80116271972656 -cubic 104.98863220214844 227.20993041992188 101.54960632324219 242.6609649658203 108.9583740234375 254.31199645996094 -quad 123.51927947998047 277.2104797363281 163.8196563720703 297.3606872558594 -line 175.0 275.0 -line 152.63931274414062 286.1803283691406 -quad 166.08778381347656 313.0772705078125 180.42587280273438 328.2276916503906 -cubic 189.91644287109375 338.2559509277344 205.73956298828125 338.6918029785156 215.76780700683594 329.20123291015625 -cubic 225.7960662841797 319.7106628417969 226.23194885253906 303.8875732421875 216.7413787841797 293.85931396484375 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BB.shape (working copy) @@ -1,64 +0,0 @@ -move 197.36068725585938 186.1803436279297 -quad 208.04635620117188 164.80897521972656 217.67767333984375 155.17767333984375 -quad 221.05897521972656 151.79635620117188 223.6803436279297 150.48568725585938 -quad 224.65170288085938 150.0 225.0 150.0 -quad 225.34829711914062 150.0 226.3196563720703 150.48568725585938 -quad 228.94102478027344 151.79635620117188 232.32232666015625 155.17767333984375 -quad 241.95364379882812 164.80897521972656 252.63931274414062 186.1803436279297 -line 263.8196716308594 197.36068725585938 -quad 285.1910095214844 208.04635620117188 294.82232666015625 217.67767333984375 -quad 298.2036437988281 221.05897521972656 299.5143127441406 223.6803436279297 -quad 300.0 224.65170288085938 300.0 225.0 -quad 300.0 225.34829711914062 299.5143127441406 226.3196563720703 -quad 298.2036437988281 228.94102478027344 294.82232666015625 232.32232666015625 -quad 285.1910095214844 241.95364379882812 263.8196716308594 252.63931274414062 -line 252.63931274414062 263.8196716308594 -quad 241.95364379882812 285.1910095214844 232.32232666015625 294.82232666015625 -quad 228.94102478027344 298.2036437988281 226.3196563720703 299.5143127441406 -quad 225.34829711914062 300.0 225.0 300.0 -quad 224.65170288085938 300.0 223.6803436279297 299.5143127441406 -quad 221.05897521972656 298.2036437988281 217.67767333984375 294.82232666015625 -quad 208.04635620117188 285.1910095214844 197.36068725585938 263.8196716308594 -line 186.1803436279297 252.63931274414062 -quad 164.80897521972656 241.95364379882812 155.17767333984375 232.32232666015625 -quad 151.79635620117188 228.94102478027344 150.48568725585938 226.3196563720703 -quad 150.0 225.34829711914062 150.0 225.0 -quad 150.0 224.65170288085938 150.48568725585938 223.6803436279297 -quad 151.79635620117188 221.05897521972656 155.17767333984375 217.67767333984375 -quad 164.80897521972656 208.04635620117188 186.1803436279297 197.36068725585938 -line 197.36068725585938 186.1803436279297 -close -move 152.63931274414062 163.8196563720703 -line 175.0 175.0 -line 163.8196563720703 152.63931274414062 -quad 135.19102478027344 166.95364379882812 119.82232666015625 182.32232666015625 -quad 110.7036361694336 191.44102478027344 105.76432037353516 201.3196563720703 -quad 100.0 212.84829711914062 100.0 225.0 -quad 100.0 237.15170288085938 105.76432037353516 248.6803436279297 -quad 110.7036361694336 258.5589904785156 119.82232666015625 267.67767333984375 -quad 135.19102478027344 283.0463562011719 163.8196563720703 297.3606872558594 -line 175.0 275.0 -line 152.63931274414062 286.1803283691406 -quad 166.95364379882812 314.8089904785156 182.32232666015625 330.17767333984375 -quad 191.44102478027344 339.2963562011719 201.3196563720703 344.2356872558594 -quad 212.84829711914062 350.0 225.0 350.0 -quad 237.15170288085938 350.0 248.6803436279297 344.2356872558594 -quad 258.5589904785156 339.2963562011719 267.67767333984375 330.17767333984375 -quad 283.0463562011719 314.8089904785156 297.3606872558594 286.1803283691406 -line 275.0 275.0 -line 286.1803283691406 297.3606872558594 -quad 314.8089904785156 283.0463562011719 330.17767333984375 267.67767333984375 -quad 339.2963562011719 258.5589904785156 344.2356872558594 248.6803436279297 -quad 350.0 237.15170288085938 350.0 225.0 -quad 350.0 212.84829711914062 344.2356872558594 201.3196563720703 -quad 339.2963562011719 191.44102478027344 330.17767333984375 182.32232666015625 -quad 314.8089904785156 166.95364379882812 286.1803283691406 152.63931274414062 -line 275.0 175.0 -line 297.3606872558594 163.8196563720703 -quad 283.0463562011719 135.19102478027344 267.67767333984375 119.82232666015625 -quad 258.5589904785156 110.7036361694336 248.6803436279297 105.76432037353516 -quad 237.15170288085938 100.0 225.0 100.0 -quad 212.84829711914062 100.0 201.3196563720703 105.76432037353516 -quad 191.44102478027344 110.7036361694336 182.32232666015625 119.82232666015625 -quad 166.95364379882812 135.19102478027344 152.63931274414062 163.8196563720703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4.shape (working copy) @@ -1,6 +0,0 @@ -move 75.0 75.0 -cubic 175.0 175.0 325.0 175.0 425.0 75.0 -cubic 325.0 175.0 325.0 325.0 425.0 425.0 -cubic 325.0 325.0 175.0 325.0 75.0 425.0 -cubic 175.0 325.0 175.0 175.0 75.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(10,10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(10,10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(10,10).shape (working copy) @@ -1,270 +0,0 @@ -move 175.0 175.0 -line 185.0 175.0 -line 185.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -close -move 195.0 175.0 -line 205.0 175.0 -line 205.0 75.0 -line 195.0 75.0 -line 195.0 175.0 -close -move 215.0 175.0 -line 225.0 175.0 -line 225.0 75.0 -line 215.0 75.0 -line 215.0 175.0 -close -move 235.0 175.0 -line 245.0 175.0 -line 245.0 75.0 -line 235.0 75.0 -line 235.0 175.0 -close -move 255.0 175.0 -line 265.0 175.0 -line 265.0 75.0 -line 255.0 75.0 -line 255.0 175.0 -close -move 275.0 175.0 -line 285.0 175.0 -line 285.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -close -move 295.0 175.0 -line 305.0 175.0 -line 305.0 75.0 -line 295.0 75.0 -line 295.0 175.0 -close -move 315.0 175.0 -line 325.0 175.0 -line 325.0 75.0 -line 315.0 75.0 -line 315.0 175.0 -close -move 335.0 175.0 -line 345.0 175.0 -line 345.0 75.0 -line 335.0 75.0 -line 335.0 175.0 -close -move 355.0 175.0 -line 365.0 175.0 -line 365.0 75.0 -line 355.0 75.0 -line 355.0 175.0 -close -move 375.0 175.0 -line 385.0 175.0 -line 385.0 75.0 -line 375.0 75.0 -line 375.0 175.0 -close -move 395.0 175.0 -line 405.0 175.0 -line 405.0 75.0 -line 395.0 75.0 -line 395.0 175.0 -close -move 415.0 175.0 -line 425.0 175.0 -line 425.0 75.0 -line 415.0 75.0 -line 415.0 175.0 -close -move 435.0 175.0 -line 445.0 175.0 -line 445.0 75.0 -line 435.0 75.0 -line 435.0 175.0 -close -move 455.0 175.0 -line 465.0 175.0 -line 465.0 75.0 -line 455.0 75.0 -line 455.0 175.0 -close -move 475.0 175.0 -line 485.0 175.0 -line 485.0 75.0 -line 475.0 75.0 -line 475.0 175.0 -close -move 495.0 175.0 -line 505.0 175.0 -line 505.0 75.0 -line 495.0 75.0 -line 495.0 175.0 -close -move 515.0 175.0 -line 525.0 175.0 -line 525.0 75.0 -line 515.0 75.0 -line 515.0 175.0 -close -move 535.0 175.0 -line 545.0 175.0 -line 545.0 75.0 -line 535.0 75.0 -line 535.0 175.0 -close -move 555.0 175.0 -line 565.0 175.0 -line 565.0 75.0 -line 555.0 75.0 -line 555.0 175.0 -close -move 575.0 175.0 -line 585.0 175.0 -line 585.0 75.0 -line 575.0 75.0 -line 575.0 175.0 -close -move 595.0 175.0 -line 605.0 175.0 -line 605.0 75.0 -line 595.0 75.0 -line 595.0 175.0 -close -move 615.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 615.0 75.0 -line 615.0 175.0 -close -move 615.0 75.0 -line 605.0 75.0 -line 605.0 175.0 -line 615.0 175.0 -line 615.0 75.0 -close -move 595.0 75.0 -line 585.0 75.0 -line 585.0 175.0 -line 595.0 175.0 -line 595.0 75.0 -close -move 575.0 75.0 -line 565.0 75.0 -line 565.0 175.0 -line 575.0 175.0 -line 575.0 75.0 -close -move 555.0 75.0 -line 545.0 75.0 -line 545.0 175.0 -line 555.0 175.0 -line 555.0 75.0 -close -move 535.0 75.0 -line 525.0 75.0 -line 525.0 175.0 -line 535.0 175.0 -line 535.0 75.0 -close -move 515.0 75.0 -line 505.0 75.0 -line 505.0 175.0 -line 515.0 175.0 -line 515.0 75.0 -close -move 495.0 75.0 -line 485.0 75.0 -line 485.0 175.0 -line 495.0 175.0 -line 495.0 75.0 -close -move 475.0 75.0 -line 465.0 75.0 -line 465.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -close -move 455.0 75.0 -line 445.0 75.0 -line 445.0 175.0 -line 455.0 175.0 -line 455.0 75.0 -close -move 435.0 75.0 -line 425.0 75.0 -line 425.0 175.0 -line 435.0 175.0 -line 435.0 75.0 -close -move 415.0 75.0 -line 405.0 75.0 -line 405.0 175.0 -line 415.0 175.0 -line 415.0 75.0 -close -move 395.0 75.0 -line 385.0 75.0 -line 385.0 175.0 -line 395.0 175.0 -line 395.0 75.0 -close -move 375.0 75.0 -line 365.0 75.0 -line 365.0 175.0 -line 375.0 175.0 -line 375.0 75.0 -close -move 355.0 75.0 -line 345.0 75.0 -line 345.0 175.0 -line 355.0 175.0 -line 355.0 75.0 -close -move 335.0 75.0 -line 325.0 75.0 -line 325.0 175.0 -line 335.0 175.0 -line 335.0 75.0 -close -move 315.0 75.0 -line 305.0 75.0 -line 305.0 175.0 -line 315.0 175.0 -line 315.0 75.0 -close -move 295.0 75.0 -line 285.0 75.0 -line 285.0 175.0 -line 295.0 175.0 -line 295.0 75.0 -close -move 275.0 75.0 -line 265.0 75.0 -line 265.0 175.0 -line 275.0 175.0 -line 275.0 75.0 -close -move 255.0 75.0 -line 245.0 75.0 -line 245.0 175.0 -line 255.0 175.0 -line 255.0 75.0 -close -move 235.0 75.0 -line 225.0 75.0 -line 225.0 175.0 -line 235.0 175.0 -line 235.0 75.0 -close -move 215.0 75.0 -line 205.0 75.0 -line 205.0 175.0 -line 215.0 175.0 -line 215.0 75.0 -close -move 195.0 75.0 -line 185.0 75.0 -line 185.0 175.0 -line 195.0 175.0 -line 195.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50BR(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50BR(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50BR(50,50).shape (working copy) @@ -1,98 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 235.6808319091797 195.9518585205078 231.49803161621094 185.65118408203125 229.82583618164062 175.1674041748047 -line 180.44998168945312 183.04295349121094 -cubic 183.02212524414062 199.1690673828125 191.26368713378906 219.46493530273438 204.19874572753906 238.8675079345703 -line 245.80125427246094 211.1324920654297 -close -move 236.41973876953125 150.68350219726562 -cubic 243.9170379638672 143.07679748535156 252.40365600585938 139.63368225097656 266.398193359375 137.99794006347656 -line 260.5934753417969 88.3360366821289 -cubic 239.8772735595703 90.75743103027344 215.55335998535156 100.62589263916016 200.80923461914062 115.58518981933594 -line 236.41973876953125 150.68350219726562 -close -move 302.142578125 142.9752960205078 -cubic 307.965087890625 145.62843322753906 310.7580261230469 147.55442810058594 314.3344421386719 151.47901916503906 -cubic 317.8778076171875 155.36732482910156 318.8053283691406 157.03692626953125 319.9929504394531 162.13912963867188 -line 368.69110107421875 150.80372619628906 -cubic 365.9154357910156 138.8791961669922 358.7576904296875 125.9944839477539 351.2909851074219 117.80091857910156 -cubic 343.8573303222656 109.64361572265625 332.71533203125 101.96015167236328 322.8751220703125 97.47626495361328 -line 302.142578125 142.9752960205078 -close -move 313.86309814453125 194.30194091796875 -cubic 311.2595520019531 199.79598999023438 308.3677978515625 204.87892150878906 304.19873046875 211.1324920654297 -cubic 297.5883483886719 221.04806518554688 298.8957214355469 234.2510223388672 307.3222961425781 242.67764282226562 -cubic 315.7489013671875 251.10427856445312 328.9519348144531 252.41163635253906 338.86749267578125 245.80125427246094 -cubic 346.38519287109375 240.7894744873047 352.36309814453125 237.51544189453125 358.7745666503906 234.7418670654297 -line 338.92266845703125 188.8517608642578 -cubic 330.3808898925781 192.54690551757812 320.459716796875 197.9805908203125 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 350.951904296875 231.1415557861328 355.6426696777344 222.89639282226562 359.04644775390625 215.71376037597656 -line 313.86309814453125 194.30194091796875 -close -move 389.7815246582031 230.53724670410156 -cubic 394.6072692871094 232.08767700195312 396.26654052734375 233.19004821777344 399.9819030761719 237.0973358154297 -cubic 403.7608337402344 241.07147216796875 405.68133544921875 244.25106811523438 408.091064453125 250.3731689453125 -line 454.61669921875 232.06019592285156 -cubic 450.66156005859375 222.0117950439453 443.74542236328125 210.56153869628906 436.2159423828125 202.64309692382812 -cubic 428.6228332519531 194.65777587890625 416.50189208984375 186.6048126220703 405.0756530761719 182.93377685546875 -line 389.7815246582031 230.53724670410156 -close -move 411.5956115722656 286.547607421875 -cubic 409.3852844238281 300.414306640625 405.7242431640625 308.2731628417969 397.76617431640625 314.99700927734375 -line 430.0355529785156 353.1897888183594 -cubic 446.4002685546875 339.36309814453125 457.6612854003906 315.18988037109375 460.9722595214844 294.4181823730469 -line 411.5956115722656 286.547607421875 -close -move 372.09783935546875 319.6598815917969 -cubic 362.1972961425781 317.5246887207031 352.57244873046875 313.3353576660156 338.86749267578125 304.19873046875 -cubic 328.9519348144531 297.5883483886719 315.7489318847656 298.8957214355469 307.32232666015625 307.32232666015625 -cubic 298.8957214355469 315.7489318847656 297.58837890625 328.9519348144531 304.19873046875 338.86749267578125 -cubic 304.9316711425781 339.9668884277344 305.56097412109375 340.93463134765625 306.24359130859375 342.01129150390625 -line 348.4717712402344 315.238525390625 -cubic 347.634765625 313.9183654785156 346.6925964355469 312.4695129394531 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 328.538818359375 357.4054870605469 346.7988586425781 365.3533630371094 361.556884765625 368.5361633300781 -line 372.09783935546875 319.6598815917969 -close -move 320.5072937011719 377.37286376953125 -cubic 321.1820983886719 384.0038757324219 320.8011474609375 386.5968322753906 318.91082763671875 391.3132019042969 -cubic 317.13421630859375 395.7459411621094 315.9393310546875 397.34881591796875 311.99737548828125 400.8086853027344 -line 344.9801025390625 438.38714599609375 -cubic 352.87957763671875 431.4537353515625 361.119140625 420.400634765625 365.3218994140625 409.91461181640625 -cubic 369.4109802246094 399.7122802734375 371.5543212890625 385.123779296875 370.2503662109375 372.31060791015625 -line 320.5072937011719 377.37286376953125 -close -move 280.6116638183594 412.2892150878906 -cubic 266.7866516113281 413.3319091796875 256.18310546875 411.4734191894531 245.48252868652344 405.86334228515625 -line 222.2659454345703 450.14642333984375 -cubic 239.87161254882812 459.3766784667969 264.312744140625 463.6605224609375 284.3720397949219 462.1476135253906 -line 280.6116638183594 412.2892150878906 -close -move 229.63160705566406 385.910400390625 -cubic 228.2103271484375 376.67535400390625 229.63514709472656 368.3929138183594 237.4724578857422 352.979736328125 -line 192.9033203125 330.3171691894531 -cubic 181.64035034179688 352.4674072265625 177.55282592773438 376.2280578613281 180.2134246826172 393.5158386230469 -line 229.63160705566406 385.910400390625 -close -move 188.2191619873047 316.4948425292969 -cubic 173.20083618164062 322.34747314453125 166.7279510498047 322.2638854980469 158.39903259277344 318.793212890625 -line 139.1669158935547 364.9465026855469 -cubic 156.41775512695312 372.13494873046875 182.287353515625 372.46893310546875 206.37423706054688 363.08233642578125 -line 188.2191619873047 316.4948425292969 -close -move 140.9654541015625 297.0434875488281 -cubic 136.85035705566406 284.8676452636719 136.25331115722656 273.71368408203125 138.92724609375 260.5662841796875 -line 89.93032836914062 250.6012420654297 -cubic 85.98338317871094 270.0079345703125 87.28816986083984 294.3839111328125 93.59761810302734 313.052490234375 -line 140.9654541015625 297.0434875488281 -close -move 153.8240966796875 233.76339721679688 -cubic 157.5792999267578 231.07276916503906 159.162353515625 230.39691162109375 164.05201721191406 229.63742065429688 -cubic 169.4383087158203 228.80078125 173.2158966064453 229.01116943359375 180.70755004882812 231.01979064941406 -line 193.656005859375 182.7255096435547 -cubic 181.16458129882812 179.37635803222656 166.96420288085938 178.58551025390625 156.377685546875 180.22987365722656 -cubic 145.2945098876953 181.95140075683594 132.9098663330078 187.23880004882812 124.70249938964844 193.11941528320312 -line 153.8240966796875 233.76339721679688 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BB.shape (working copy) @@ -1,24 +0,0 @@ -move 125.0 125.0 -line 475.0 125.0 -line 475.0 75.0 -line 425.0 75.0 -line 425.0 425.0 -line 475.0 425.0 -line 475.0 375.0 -line 125.0 375.0 -line 125.0 425.0 -line 175.0 425.0 -line 175.0 75.0 -line 125.0 75.0 -line 125.0 125.0 -close -move 125.0 25.0 -line 75.0 75.0 -line 75.0 425.0 -line 125.0 475.0 -line 475.0 475.0 -line 525.0 425.0 -line 525.0 75.0 -line 475.0 25.0 -line 125.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d1BM5(20,20).shape (working copy) @@ -1,216 +0,0 @@ -move 125.0 75.5 -line 145.0 75.5 -line 145.0 74.5 -line 125.0 74.5 -line 125.0 75.5 -close -move 165.0 75.5 -line 185.0 75.5 -line 185.0 74.5 -line 165.0 74.5 -line 165.0 75.5 -close -move 205.0 75.5 -line 225.0 75.5 -line 225.0 74.5 -line 205.0 74.5 -line 205.0 75.5 -close -move 245.0 75.5 -line 265.0 75.5 -line 265.0 74.5 -line 245.0 74.5 -line 245.0 75.5 -close -move 285.0 75.5 -line 305.0 75.5 -line 305.0 74.5 -line 285.0 74.5 -line 285.0 75.5 -close -move 325.0 75.5 -line 345.0 75.5 -line 345.0 74.5 -line 325.0 74.5 -line 325.0 75.5 -close -move 365.0 75.5 -line 385.0 75.5 -line 385.0 74.5 -line 365.0 74.5 -line 365.0 75.5 -close -move 405.0 75.5 -line 425.0 75.5 -line 425.0 74.5 -line 405.0 74.5 -line 405.0 75.5 -close -move 445.0 75.5 -line 465.0 75.5 -line 465.0 74.5 -line 445.0 74.5 -line 445.0 75.5 -close -move 474.5 85.0 -line 474.5 105.0 -line 475.5 105.0 -line 475.5 85.0 -line 474.5 85.0 -close -move 474.5 125.0 -line 474.5 145.0 -line 475.5 145.0 -line 475.5 125.0 -line 474.5 125.0 -close -move 474.5 165.0 -line 474.5 185.0 -line 475.5 185.0 -line 475.5 165.0 -line 474.5 165.0 -close -move 474.5 205.0 -line 474.5 225.0 -line 475.5 225.0 -line 475.5 205.0 -line 474.5 205.0 -close -move 474.5 245.0 -line 474.5 265.0 -line 475.5 265.0 -line 475.5 245.0 -line 474.5 245.0 -close -move 474.5 285.0 -line 474.5 305.0 -line 475.5 305.0 -line 475.5 285.0 -line 474.5 285.0 -close -move 474.5 325.0 -line 474.5 345.0 -line 475.5 345.0 -line 475.5 325.0 -line 474.5 325.0 -close -move 474.5 365.0 -line 474.5 385.0 -line 475.5 385.0 -line 475.5 365.0 -line 474.5 365.0 -close -move 474.5 405.0 -line 474.5 425.0 -line 475.5 425.0 -line 475.5 405.0 -line 474.5 405.0 -close -move 455.0 424.5 -line 435.0 424.5 -line 435.0 425.5 -line 455.0 425.5 -line 455.0 424.5 -close -move 415.0 424.5 -line 395.0 424.5 -line 395.0 425.5 -line 415.0 425.5 -line 415.0 424.5 -close -move 375.0 424.5 -line 355.0 424.5 -line 355.0 425.5 -line 375.0 425.5 -line 375.0 424.5 -close -move 335.0 424.5 -line 315.0 424.5 -line 315.0 425.5 -line 335.0 425.5 -line 335.0 424.5 -close -move 295.0 424.5 -line 275.0 424.5 -line 275.0 425.5 -line 295.0 425.5 -line 295.0 424.5 -close -move 255.0 424.5 -line 235.0 424.5 -line 235.0 425.5 -line 255.0 425.5 -line 255.0 424.5 -close -move 215.0 424.5 -line 195.0 424.5 -line 195.0 425.5 -line 215.0 425.5 -line 215.0 424.5 -close -move 175.0 424.5 -line 155.0 424.5 -line 155.0 425.5 -line 175.0 425.5 -line 175.0 424.5 -close -move 135.0 424.5 -line 125.0 424.5 -line 125.0 425.0 -line 125.5 425.0 -line 125.5 415.0 -line 124.5 415.0 -line 124.5 425.0 -line 124.5 425.5 -line 125.0 425.5 -line 135.0 425.5 -line 135.0 424.5 -close -move 125.5 395.0 -line 125.5 375.0 -line 124.5 375.0 -line 124.5 395.0 -line 125.5 395.0 -close -move 125.5 355.0 -line 125.5 335.0 -line 124.5 335.0 -line 124.5 355.0 -line 125.5 355.0 -close -move 125.5 315.0 -line 125.5 295.0 -line 124.5 295.0 -line 124.5 315.0 -line 125.5 315.0 -close -move 125.5 275.0 -line 125.5 255.0 -line 124.5 255.0 -line 124.5 275.0 -line 125.5 275.0 -close -move 125.5 235.0 -line 125.5 215.0 -line 124.5 215.0 -line 124.5 235.0 -line 125.5 235.0 -close -move 125.5 195.0 -line 125.5 175.0 -line 124.5 175.0 -line 124.5 195.0 -line 125.5 195.0 -close -move 125.5 155.0 -line 125.5 135.0 -line 124.5 135.0 -line 124.5 155.0 -line 125.5 155.0 -close -move 125.5 115.0 -line 125.5 95.0 -line 124.5 95.0 -line 124.5 115.0 -line 125.5 115.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d1SB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d1SB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d1SB(20,20).shape (working copy) @@ -1,398 +0,0 @@ -move 104.98871612548828 101.57989501953125 -cubic 110.43434143066406 105.62089538574219 115.98906707763672 109.41690063476562 121.62435150146484 112.95696258544922 -line 122.04774475097656 113.22293853759766 -line 122.57968139648438 112.37615203857422 -line 122.15629577636719 112.11018371582031 -cubic 116.53734588623047 108.58038330078125 111.0146255493164 104.8062515258789 105.58463287353516 100.77684020996094 -line 105.18310546875 100.4788818359375 -line 104.58718872070312 101.28193664550781 -line 104.98871612548828 101.57989501953125 -close -move 138.94183349609375 122.90911865234375 -cubic 144.9116668701172 126.03214263916016 150.9710693359375 128.8942413330078 157.08804321289062 131.4867401123047 -line 157.54840087890625 131.68185424804688 -line 157.93861389160156 130.76112365722656 -line 157.47825622558594 130.56602478027344 -cubic 151.3798828125 127.98139953613281 145.35716247558594 125.13662719726562 139.40536499023438 122.02304077148438 -line 138.9623260498047 121.79126739501953 -line 138.49879455566406 122.67736053466797 -line 138.94183349609375 122.90911865234375 -close -move 175.8378448486328 138.53903198242188 -cubic 182.203369140625 140.6373291015625 188.63406372070312 142.46226501464844 195.09532165527344 144.0081329345703 -line 195.58160400390625 144.12448120117188 -line 195.8142852783203 143.1519012451172 -line 195.3280029296875 143.0355682373047 -cubic 188.88702392578125 141.49456787109375 182.4965362548828 139.68104553222656 176.15090942382812 137.58929443359375 -line 175.67604064941406 137.43275451660156 -line 175.36297607421875 138.38250732421875 -line 175.8378448486328 138.53903198242188 -close -move 214.78594970703125 147.84776306152344 -cubic 221.39573669433594 148.84814453125 228.0426788330078 149.5665283203125 234.69061279296875 150.0006103515625 -line 235.18954467773438 150.03318786621094 -line 235.25469970703125 149.0353240966797 -line 234.75576782226562 149.00274658203125 -cubic 228.1290283203125 148.57003784179688 221.5243377685547 147.85623168945312 214.9355926513672 146.85902404785156 -line 214.44122314453125 146.78419494628906 -line 214.2915802001953 147.77294921875 -line 214.78594970703125 147.84776306152344 -close -move 254.73733520507812 150.4522247314453 -cubic 261.40728759765625 150.3176727294922 268.08428955078125 149.89810180664062 274.7319030761719 149.1948699951172 -line 275.2291259765625 149.14227294921875 -line 275.1239318847656 148.14781188964844 -line 274.626708984375 148.20040893554688 -cubic 268.0002746582031 148.9014129638672 261.3658142089844 149.31829833984375 254.7171630859375 149.45242309570312 -line 254.21726989746094 149.46250915527344 -line 254.2374267578125 150.46231079101562 -line 254.73733520507812 150.4522247314453 -close -move 294.5653381347656 146.23992919921875 -cubic 301.09130859375 144.98272705078125 307.5943298339844 143.4447021484375 314.039306640625 141.6306915283203 -line 314.5205993652344 141.49520874023438 -line 314.2496643066406 140.5326385498047 -line 313.76837158203125 140.6680908203125 -cubic 307.3436584472656 142.4763946533203 300.88153076171875 144.00474548339844 294.37615966796875 145.2579803466797 -line 293.88519287109375 145.35256958007812 -line 294.0743713378906 146.3345184326172 -line 294.5653381347656 146.23992919921875 -close -move 333.1510925292969 135.37818908691406 -cubic 339.34210205078125 133.06344604492188 345.4828186035156 130.47886657714844 351.540771484375 127.63235473632812 -line 351.9933166503906 127.41973114013672 -line 351.56805419921875 126.5146484375 -line 351.1155090332031 126.72728729248047 -cubic 345.0760498046875 129.5651092529297 338.9728698730469 132.13388061523438 332.8009033203125 134.4415283203125 -line 332.33258056640625 134.6166229248047 -line 332.6827697753906 135.55328369140625 -line 333.1510925292969 135.37818908691406 -close -move 369.380859375 118.3529281616211 -cubic 375.1061706542969 115.07707977294922 380.7577819824219 111.54559326171875 386.3066711425781 107.76879119873047 -line 386.7200012207031 107.48745727539062 -line 386.1573181152344 106.66075897216797 -line 385.7439880371094 106.94210815429688 -cubic 380.2113037109375 110.7079086303711 374.59271240234375 114.21875 368.88421630859375 117.4849624633789 -line 368.4502258300781 117.73329162597656 -line 368.9468688964844 118.60124206542969 -line 369.380859375 118.3529281616211 -close -move 402.45477294921875 95.8492660522461 -cubic 407.6097412109375 91.73388671875 412.6724853515625 87.37998962402344 417.61785888671875 82.799560546875 -line 417.98468017578125 82.45979309082031 -line 417.3051452636719 81.72613525390625 -line 416.9383239746094 82.06590270996094 -cubic 412.0064697265625 86.63381958007812 406.9715576171875 90.96378326416016 401.83087158203125 95.06776428222656 -line 401.44012451171875 95.37970733642578 -line 402.06402587890625 96.16122436523438 -line 402.45477294921875 95.8492660522461 -close -move 417.9590759277344 81.56636047363281 -cubic 413.3530578613281 86.49952697753906 408.97357177734375 91.5506591796875 404.83258056640625 96.69468688964844 -line 404.51904296875 97.08417510986328 -line 405.2980041503906 97.71122741699219 -line 405.6115417480469 97.3217544555664 -cubic 409.7410583496094 92.19194793701172 414.0965576171875 87.16852569580078 418.69000244140625 82.24881744384766 -line 419.0312194824219 81.88335418701172 -line 418.30029296875 81.20089721679688 -line 417.9590759277344 81.56636047363281 -close -move 392.8572998046875 112.7776870727539 -cubic 389.05291748046875 118.31611633300781 385.49383544921875 123.95795440673828 382.1904296875 129.67420959472656 -line 381.94024658203125 130.1071319580078 -line 382.80609130859375 130.60748291015625 -line 383.0562744140625 130.174560546875 -cubic 386.3499755859375 124.47510528564453 389.8882751464844 118.86619567871094 393.68157958984375 113.34387969970703 -line 393.96466064453125 112.9317398071289 -line 393.1404113769531 112.36554718017578 -line 392.8572998046875 112.7776870727539 -close -move 372.8396911621094 147.46043395996094 -cubic 369.9671630859375 153.5034942626953 367.35595703125 159.62986755371094 365.0140075683594 165.8071746826172 -line 364.8367614746094 166.27471923828125 -line 365.7718200683594 166.6291961669922 -line 365.9490661621094 166.16168212890625 -cubic 368.2838439941406 160.00331115722656 370.87908935546875 153.91436767578125 373.7428283691406 147.88973999023438 -line 373.9574890136719 147.43817138671875 -line 373.0543518066406 147.0088653564453 -line 372.8396911621094 147.46043395996094 -close -move 358.6702880859375 184.9007568359375 -cubic 356.82696533203125 191.33616638183594 355.25921630859375 197.83035278320312 353.97198486328125 204.3482666015625 -line 353.8751220703125 204.83880615234375 -line 354.85614013671875 205.03253173828125 -line 354.9530334472656 204.54202270507812 -cubic 356.2362365722656 198.04466247558594 357.7940979003906 191.59129333496094 359.6316223144531 185.17611694335938 -line 359.7693176269531 184.6954345703125 -line 358.8079528808594 184.42010498046875 -line 358.6702880859375 184.9007568359375 -close -move 350.923583984375 224.1728973388672 -cubic 350.1893005371094 230.8169708251953 349.7384948730469 237.49122619628906 349.5726318359375 244.15927124023438 -line 349.5602111816406 244.65911865234375 -line 350.55987548828125 244.68399047851562 -line 350.57232666015625 244.18414306640625 -cubic 350.7376403808594 237.53736877441406 351.1855773925781 230.90562438964844 351.91754150390625 224.28274536132812 -line 351.97247314453125 223.7857666015625 -line 350.978515625 223.67591857910156 -line 350.923583984375 224.1728973388672 -close -move 349.9300231933594 264.2071838378906 -cubic 350.3329162597656 270.8578186035156 351.0201721191406 277.5082702636719 351.9896240234375 284.1224060058594 -line 352.0621337890625 284.61712646484375 -line 353.05157470703125 284.47210693359375 -line 352.97906494140625 283.9773864746094 -cubic 352.0126953125 277.3843078613281 351.3298034667969 270.776123046875 350.9281921386719 264.1466979980469 -line 350.89794921875 263.6476135253906 -line 349.8997802734375 263.7080993652344 -line 349.9300231933594 264.2071838378906 -close -move 355.7390441894531 303.8370361328125 -cubic 357.2544860839844 310.302734375 359.0489807128906 316.7386779785156 361.11688232421875 323.1102294921875 -line 361.271240234375 323.5858154296875 -line 362.222412109375 323.277099609375 -line 362.06805419921875 322.801513671875 -cubic 360.0066223144531 316.44989013671875 358.2233581542969 310.0542297363281 356.712646484375 303.6088562011719 -line 356.59857177734375 303.1220703125 -line 355.62493896484375 303.3502197265625 -line 355.7390441894531 303.8370361328125 -close -move 368.0874328613281 341.9009704589844 -cubic 370.6507568359375 348.0252380371094 373.4836120605469 354.0927429199219 376.57745361328125 360.0713806152344 -line 376.8072509765625 360.51544189453125 -line 377.69537353515625 360.05584716796875 -line 377.465576171875 359.6117858886719 -cubic 374.381103515625 353.6512451171875 371.5653991699219 347.6205139160156 369.0098876953125 341.5148620605469 -line 368.81683349609375 341.05364990234375 -line 367.8943786621094 341.4397277832031 -line 368.0874328613281 341.9009704589844 -close -move 386.4605712890625 377.44403076171875 -cubic 389.97308349609375 383.08905029296875 393.7414855957031 388.6542053222656 397.75494384765625 394.1109313964844 -line 398.05120849609375 394.5137023925781 -line 398.85675048828125 393.9212341308594 -line 398.5605163574219 393.5184326171875 -cubic 394.55859375 388.077392578125 390.81195068359375 382.5443420410156 387.30963134765625 376.9157409667969 -line 387.0455017089844 376.4912109375 -line 386.1964111328125 377.0195007324219 -line 386.4605712890625 377.44403076171875 -close -move 410.14263916015625 409.697509765625 -cubic 414.4776916503906 414.75616455078125 419.05145263671875 419.717041015625 423.8515319824219 424.55548095703125 -line 424.20367431640625 424.91046142578125 -line 424.9136047363281 424.2061462402344 -line 424.56146240234375 423.8511962890625 -cubic 419.7742614746094 419.0257263183594 415.2252197265625 414.0916748046875 410.9019775390625 409.0467834472656 -line 410.57659912109375 408.6671142578125 -line 409.8172912597656 409.3178405761719 -line 410.14263916015625 409.697509765625 -close -move 411.3647766113281 411.5831298828125 -cubic 406.3179626464844 407.18707275390625 401.1577453613281 403.0187683105469 395.9097900390625 399.0898132324219 -line 395.509521484375 398.7901611328125 -line 394.91021728515625 399.5906982421875 -line 395.31048583984375 399.8903503417969 -cubic 400.543701171875 403.8082275390625 405.6751403808594 407.95330810546875 410.70794677734375 412.3371887207031 -line 411.0849609375 412.66558837890625 -line 411.7418212890625 411.91156005859375 -line 411.3647766113281 411.5831298828125 -close -move 379.3056335449219 387.6300354003906 -cubic 373.64068603515625 384.0373840332031 367.8766784667969 380.69378662109375 362.0434875488281 377.609130859375 -line 361.6014709472656 377.3753967285156 -line 361.134033203125 378.2593994140625 -line 361.5760192871094 378.4931335449219 -cubic 367.3918762207031 381.5686340332031 373.1217956542969 384.8924560546875 378.77008056640625 388.47454833984375 -line 379.1923522949219 388.7423400878906 -line 379.7278747558594 387.8977966308594 -line 379.3056335449219 387.6300354003906 -close -move 343.9217529296875 368.9438781738281 -cubic 337.7528381347656 366.2967529296875 331.5055236816406 363.9163513183594 325.2131042480469 361.81005859375 -line 324.73895263671875 361.6513366699219 -line 324.4215087890625 362.5996398925781 -line 324.8956604003906 362.75836181640625 -cubic 331.16864013671875 364.8581237792969 337.37750244140625 367.2238464355469 343.52740478515625 369.86285400390625 -line 343.98687744140625 370.0600280761719 -line 344.3812561035156 369.14105224609375 -line 343.9217529296875 368.9438781738281 -close -move 305.9715881347656 356.2497253417969 -cubic 299.4567565917969 354.6593017578125 292.8894348144531 353.3479919433594 286.30523681640625 352.3199768066406 -line 285.81121826171875 352.2428283691406 -line 285.6569519042969 353.23089599609375 -line 286.1509704589844 353.3080139160156 -cubic 292.7143249511719 354.332763671875 299.24017333984375 355.6357727050781 305.7344055175781 357.22119140625 -line 306.2201232910156 357.33978271484375 -line 306.45733642578125 356.3683166503906 -line 305.9715881347656 356.2497253417969 -close -move 266.411376953125 350.0739440917969 -cubic 259.7405700683594 349.60687255859375 253.046630859375 349.42474365234375 246.36611938476562 349.5281066894531 -line 245.86618041992188 349.5358581542969 -line 245.88165283203125 350.53570556640625 -line 246.381591796875 350.5279846191406 -cubic 253.040771484375 350.4249572753906 259.6920166015625 350.6059265136719 266.3415222167969 351.0715026855469 -line 266.8403015136719 351.1064453125 -line 266.91015625 350.1088562011719 -line 266.411376953125 350.0739440917969 -close -move 226.36361694335938 350.69183349609375 -cubic 219.7303009033203 351.3622131347656 213.1042938232422 352.3170471191406 206.52166748046875 353.5533142089844 -line 206.0302734375 353.6455993652344 -line 206.21485900878906 354.6283874511719 -line 206.7062530517578 354.5361022949219 -cubic 213.26797485351562 353.30377197265625 219.85194396972656 352.3550109863281 226.46417236328125 351.686767578125 -line 226.96163940429688 351.636474609375 -line 226.861083984375 350.6415710449219 -line 226.36361694335938 350.69183349609375 -close -move 187.02151489257812 358.0733642578125 -cubic 180.5967254638672 359.8498229980469 174.20867919921875 361.90570068359375 167.89173889160156 364.234619140625 -line 167.422607421875 364.4075927734375 -line 167.76852416992188 365.3458251953125 -line 168.23765563964844 365.1728820800781 -cubic 174.5349578857422 362.8512268066406 180.88328552246094 360.80810546875 187.28802490234375 359.0372009277344 -line 187.7699432373047 358.9039306640625 -line 187.50343322753906 357.94012451171875 -line 187.02151489257812 358.0733642578125 -close -move 149.45933532714844 371.9004211425781 -cubic 143.42127990722656 374.7047424316406 137.4462127685547 377.777099609375 131.56556701660156 381.1082763671875 -line 131.1305389404297 381.354736328125 -line 131.62339782714844 382.22479248046875 -line 132.05845642089844 381.9783630371094 -cubic 137.92149353027344 378.65716552734375 143.8607177734375 375.6032409667969 149.88055419921875 372.8074035644531 -line 150.33404541015625 372.5968017578125 -line 149.91282653808594 371.6898193359375 -line 149.45933532714844 371.9004211425781 -close -move 114.61068725585938 391.60968017578125 -cubic 109.11312103271484 395.31732177734375 103.6995849609375 399.2755432128906 98.39759826660156 403.4731140136719 -line 98.0055923461914 403.7834777832031 -line 98.62628936767578 404.5675048828125 -line 99.018310546875 404.25714111328125 -cubic 104.3052749633789 400.07147216796875 109.6880111694336 396.1357727050781 115.16983032226562 392.4387512207031 -line 115.58436584472656 392.1591796875 -line 115.02522277832031 391.3301086425781 -line 114.61068725585938 391.60968017578125 -close -move 83.199951171875 416.446044921875 -cubic 80.31204986572266 419.099365234375 77.45760345458984 421.8352966308594 74.64644622802734 424.6464538574219 -line 75.35355377197266 425.3535461425781 -cubic 77.36802673339844 423.3390808105469 79.3446273803711 421.3016052246094 81.27806091308594 419.2474060058594 -line 81.6207504272461 418.88330078125 -line 80.892578125 418.1979064941406 -line 80.54987335205078 418.56201171875 -cubic 78.62161254882812 420.6107177734375 76.65556335449219 422.6373291015625 74.64644622802734 424.6464538574219 -line 75.35355377197266 425.3535461425781 -cubic 78.15721130371094 422.5498962402344 80.99639129638672 419.82861328125 83.87651824951172 417.1824035644531 -line 84.24469757080078 416.8441162109375 -line 83.56813049316406 416.1077575683594 -line 83.199951171875 416.446044921875 -close -move 94.48133087158203 404.154052734375 -cubic 98.73165130615234 398.9178466796875 102.74568939208984 393.5695495605469 106.5120620727539 388.13623046875 -line 106.79692077636719 387.7253112792969 -line 105.97505187988281 387.1556091308594 -line 105.6902084350586 387.5665283203125 -cubic 101.93457794189453 392.984375 97.94326782226562 398.3023681640625 93.70491790771484 403.5238342285156 -line 93.38981628417969 403.91204833984375 -line 94.16621398925781 404.5422668457031 -line 94.48133087158203 404.154052734375 -close -move 117.26164245605469 371.26922607421875 -cubic 120.66165924072266 365.4438171386719 123.8053970336914 359.5227355957031 126.68346405029297 353.5370178222656 -line 126.90013885498047 353.0863952636719 -line 125.99890899658203 352.6530456542969 -line 125.78223419189453 353.1036682128906 -cubic 122.91281127929688 359.0714111328125 119.7878646850586 364.95709228515625 116.39797973632812 370.76513671875 -line 116.14593505859375 371.19696044921875 -line 117.00959777832031 371.7010498046875 -line 117.26164245605469 371.26922607421875 -close -move 134.59646606445312 335.2133483886719 -cubic 137.01341247558594 328.9235534667969 139.15805053710938 322.56048583984375 141.02374267578125 316.1583251953125 -line 141.16363525390625 315.67828369140625 -line 140.2035675048828 315.39849853515625 -line 140.0636749267578 315.8785400390625 -cubic 138.20379638671875 322.2607727050781 136.0724639892578 328.5843811035156 133.6630096435547 334.8546447753906 -line 133.48365783691406 335.3213806152344 -line 134.4171142578125 335.6800842285156 -line 134.59646606445312 335.2133483886719 -close -move 145.81094360351562 296.73748779296875 -cubic 147.140625 290.1661376953125 148.18902587890625 283.5489501953125 148.95281982421875 276.92193603515625 -line 149.01007080078125 276.42523193359375 -line 148.0166473388672 276.31072998046875 -line 147.9593963623047 276.80743408203125 -cubic 147.19802856445312 283.41339111328125 146.15628051757812 289.9886474609375 144.830810546875 296.5391540527344 -line 144.73162841796875 297.0292053222656 -line 145.7117919921875 297.2275695800781 -line 145.81094360351562 296.73748779296875 -close -move 150.3973388671875 256.94403076171875 -cubic 150.59487915039062 250.2648468017578 150.50706481933594 243.56973266601562 150.13417053222656 236.8952178955078 -line 150.1062774658203 236.39599609375 -line 149.1078338623047 236.4517822265625 -line 149.13572692871094 236.9510040283203 -cubic 149.50743103027344 243.60418701171875 149.5946807861328 250.25662231445312 149.39776611328125 256.91448974609375 -line 149.38299560546875 257.4142761230469 -line 150.382568359375 257.4438171386719 -line 150.3973388671875 256.94403076171875 -close -move 148.1678466796875 216.9697265625 -cubic 147.2311248779297 210.3638458251953 146.01014709472656 203.77244567871094 144.50877380371094 197.2313232421875 -line 144.3969268798828 196.74398803710938 -line 143.42225646972656 196.96771240234375 -line 143.53411865234375 197.4550323486328 -cubic 145.03074645996094 203.9754638671875 146.24400329589844 210.5251922607422 147.17774963378906 217.11012268066406 -line 147.24795532226562 217.6051788330078 -line 148.238037109375 217.4647674560547 -line 148.1678466796875 216.9697265625 -close -move 139.22216796875 177.9427032470703 -cubic 137.1993865966797 171.61129760742188 134.90081787109375 165.32293701171875 132.33355712890625 159.11122131347656 -line 132.14256286621094 158.6491241455078 -line 131.21839904785156 159.03111267089844 -line 131.4093780517578 159.49319458007812 -cubic 133.96871948242188 165.68572998046875 136.2530975341797 171.9352569580078 138.2696075439453 178.2470245361328 -line 138.42176818847656 178.72329711914062 -line 139.37432861328125 178.4189910888672 -line 139.22216796875 177.9427032470703 -close -move 123.93115234375 140.91683959960938 -cubic 120.91792297363281 135.02989196777344 117.64340209960938 129.21060180664062 114.11731719970703 123.48917388916016 -line 113.85498809814453 123.06351470947266 -line 113.00367736816406 123.58818054199219 -line 113.26600646972656 124.01383209228516 -cubic 116.78165435791016 129.71832275390625 120.0367431640625 135.5030975341797 123.04098510742188 141.3724822998047 -line 123.26880645751953 141.81756591796875 -line 124.15897369384766 141.36192321777344 -line 123.93115234375 140.91683959960938 -close -move 102.90567779541016 106.79126739501953 -cubic 99.0326156616211 101.47828674316406 94.91729736328125 96.25215148925781 90.57125854492188 91.13898468017578 -line 90.24744415283203 90.75801086425781 -line 89.48548889160156 91.40564727783203 -line 89.80931091308594 91.78662109375 -cubic 94.14322662353516 96.8855209350586 98.2354736328125 102.08236694335938 102.09759521484375 107.38034057617188 -line 102.39213562011719 107.78438568115234 -line 103.20021057128906 107.19530487060547 -line 102.90567779541016 106.79126739501953 -close -move 76.93914031982422 76.24470520019531 -cubic 76.41365814208984 75.71078491210938 75.8846664428711 75.17755889892578 75.35355377197266 74.64644622802734 -line 74.64644622802734 75.35355377197266 -cubic 79.47211456298828 80.1792221069336 84.42078399658203 84.77857971191406 89.46790313720703 89.13921356201172 -line 89.84624481201172 89.46610260009766 -line 90.5000228881836 88.70940399169922 -line 90.12167358398438 88.38252258300781 -cubic 85.0882797241211 84.03374481201172 80.16629028320312 79.45918273925781 75.35355377197266 74.64644622802734 -line 74.64644622802734 75.35355377197266 -cubic 75.1761474609375 75.88325500488281 75.70233917236328 76.41365814208984 76.22642517089844 76.94615173339844 -line 76.5771484375 77.3025131225586 -line 77.28986358642578 76.60105895996094 -line 76.93914031982422 76.24470520019531 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100BB(50,50).shape (working copy) @@ -1,54 +0,0 @@ -move 175.0 175.0 -line 225.0 175.0 -line 225.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -close -move 275.0 175.0 -line 325.0 175.0 -line 325.0 75.0 -line 275.0 75.0 -line 275.0 175.0 -close -move 375.0 175.0 -line 425.0 175.0 -line 425.0 75.0 -line 375.0 75.0 -line 375.0 175.0 -close -move 475.0 175.0 -line 525.0 175.0 -line 525.0 75.0 -line 475.0 75.0 -line 475.0 175.0 -close -move 575.0 175.0 -line 625.0 175.0 -line 625.0 75.0 -line 575.0 75.0 -line 575.0 175.0 -close -move 575.0 75.0 -line 525.0 75.0 -line 525.0 175.0 -line 575.0 175.0 -line 575.0 75.0 -close -move 475.0 75.0 -line 425.0 75.0 -line 425.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -close -move 375.0 75.0 -line 325.0 75.0 -line 325.0 175.0 -line 375.0 175.0 -line 375.0 75.0 -close -move 275.0 75.0 -line 225.0 75.0 -line 225.0 175.0 -line 275.0 175.0 -line 275.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(20,20).shape (working copy) @@ -1,168 +0,0 @@ -move 175.0 175.0 -quad 184.6703338623047 175.0 194.69134521484375 175.0 -line 194.69134521484375 75.0 -quad 184.6703338623047 75.0 175.0 75.0 -line 175.0 175.0 -close -move 214.93031311035156 175.0 -quad 224.65802001953125 175.0 234.69436645507812 175.0 -line 234.69436645507812 75.0 -quad 224.65802001953125 75.0 214.93031311035156 75.0 -line 214.93031311035156 175.0 -close -move 254.93626403808594 175.0 -quad 264.6766662597656 175.0 274.6908264160156 175.0 -line 274.6908264160156 75.0 -quad 264.6766662597656 75.0 254.93626403808594 75.0 -line 254.93626403808594 175.0 -close -move 294.9928283691406 175.0 -quad 304.7214050292969 175.0 314.69476318359375 175.0 -line 314.69476318359375 75.0 -quad 304.7214050292969 75.0 294.9928283691406 75.0 -line 294.9928283691406 175.0 -close -move 334.87152099609375 175.0 -quad 344.6902770996094 175.0 354.73504638671875 175.0 -line 354.73504638671875 75.0 -quad 344.6902770996094 75.0 334.87152099609375 75.0 -line 334.87152099609375 175.0 -close -move 374.75592041015625 175.0 -quad 384.69573974609375 175.0 394.8473815917969 175.0 -line 394.8473815917969 75.0 -quad 384.69573974609375 75.0 374.75592041015625 75.0 -line 374.75592041015625 175.0 -close -move 414.6924743652344 175.0 -quad 424.71417236328125 175.0 434.9342346191406 175.0 -line 434.9342346191406 75.0 -quad 424.71417236328125 75.0 414.6924743652344 75.0 -line 414.6924743652344 175.0 -close -move 454.7269592285156 175.0 -quad 464.6454772949219 175.0 474.7440490722656 175.0 -line 474.7440490722656 75.0 -quad 464.6454772949219 75.0 454.7269592285156 75.0 -line 454.7269592285156 175.0 -close -move 494.9028625488281 175.0 -quad 504.7159423828125 175.0 514.6932373046875 175.0 -line 514.6932373046875 75.0 -quad 504.7159423828125 75.0 494.9028625488281 75.0 -line 494.9028625488281 175.0 -close -move 534.8119506835938 175.0 -quad 544.7399291992188 175.0 554.8252563476562 175.0 -line 554.8252563476562 75.0 -quad 544.7399291992188 75.0 534.8119506835938 75.0 -line 534.8119506835938 175.0 -close -move 574.6904907226562 175.0 -quad 584.6982421875 175.0 594.8563232421875 175.0 -line 594.8563232421875 75.0 -quad 584.6982421875 75.0 574.6904907226562 75.0 -line 574.6904907226562 175.0 -close -move 614.797607421875 175.0 -quad 624.6757202148438 175.0 634.6920166015625 175.0 -line 634.6920166015625 75.0 -quad 624.6757202148438 75.0 614.797607421875 75.0 -line 614.797607421875 175.0 -close -move 654.8626708984375 175.0 -quad 664.7669677734375 175.0 674.8026123046875 175.0 -line 674.8026123046875 75.0 -quad 664.7669677734375 75.0 654.8626708984375 75.0 -line 654.8626708984375 175.0 -close -move 694.6905517578125 175.0 -quad 704.6981811523438 175.0 714.8331909179688 175.0 -line 714.8331909179688 75.0 -quad 704.6981811523438 75.0 694.6905517578125 75.0 -line 694.6905517578125 175.0 -close -move 715.0 75.0 -line 695.0 75.0 -line 695.0 175.0 -line 715.0 175.0 -line 715.0 75.0 -close -move 675.0 75.0 -line 655.0 75.0 -line 655.0 175.0 -line 675.0 175.0 -line 675.0 75.0 -close -move 635.0 75.0 -line 615.0 75.0 -line 615.0 175.0 -line 635.0 175.0 -line 635.0 75.0 -close -move 595.0 75.0 -line 575.0 75.0 -line 575.0 175.0 -line 595.0 175.0 -line 595.0 75.0 -close -move 555.0 75.0 -line 535.0 75.0 -line 535.0 175.0 -line 555.0 175.0 -line 555.0 75.0 -close -move 515.0 75.0 -line 495.0 75.0 -line 495.0 175.0 -line 515.0 175.0 -line 515.0 75.0 -close -move 475.0 75.0 -line 455.0 75.0 -line 455.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -close -move 435.0 75.0 -line 415.0 75.0 -line 415.0 175.0 -line 435.0 175.0 -line 435.0 75.0 -close -move 395.0 75.0 -line 375.0 75.0 -line 375.0 175.0 -line 395.0 175.0 -line 395.0 75.0 -close -move 355.0 75.0 -line 335.0 75.0 -line 335.0 175.0 -line 355.0 175.0 -line 355.0 75.0 -close -move 315.0 75.0 -line 295.0 75.0 -line 295.0 175.0 -line 315.0 175.0 -line 315.0 75.0 -close -move 275.0 75.0 -line 255.0 75.0 -line 255.0 175.0 -line 275.0 175.0 -line 275.0 75.0 -close -move 235.0 75.0 -line 215.0 75.0 -line 215.0 175.0 -line 235.0 175.0 -line 235.0 75.0 -close -move 195.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -line 195.0 175.0 -line 195.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BM10(20,20).shape (working copy) @@ -1,102 +0,0 @@ -move 197.36068725585938 186.1803436279297 -quad 201.7377166748047 177.42628479003906 206.02114868164062 170.53680419921875 -line 163.55909729003906 144.13653564453125 -quad 158.0524139404297 152.99346923828125 152.63931274414062 163.8196563720703 -line 197.36068725585938 186.1803436279297 -close -move 215.31053161621094 157.71206665039062 -quad 219.9063262939453 152.47714233398438 223.46923828125 150.5942840576172 -line 200.10760498046875 106.38755798339844 -quad 188.4053192138672 112.57178497314453 177.7359161376953 124.72499084472656 -line 215.31053161621094 157.71206665039062 -close -move 225.16888427734375 150.03045654296875 -quad 227.37078857421875 150.56239318847656 231.1112060546875 154.01292419433594 -line 265.01373291015625 117.26216125488281 -quad 251.7312774658203 105.0091323852539 236.9103240966797 101.42861938476562 -line 225.16888427734375 150.03045654296875 -close -move 240.46881103515625 165.18429565429688 -quad 244.82925415039062 171.46400451660156 249.32351684570312 179.7917022705078 -line 293.32476806640625 156.04531860351562 -quad 287.4986267089844 145.2497100830078 281.5386962890625 136.66651916503906 -line 240.46881103515625 165.18429565429688 -close -move 273.6967468261719 202.604248046875 -quad 281.8435363769531 207.2173614501953 287.76708984375 211.6586456298828 -line 317.76116943359375 171.6542205810547 -quad 309.2714538574219 165.2888641357422 298.3336181640625 159.09535217285156 -line 273.6967468261719 202.604248046875 -close -move 297.5986022949219 220.7688751220703 -quad 299.9188232421875 223.7120361328125 299.9998474121094 224.9968719482422 -line 349.90069580078125 221.8496856689453 -quad 348.83819580078125 205.00270080566406 336.8643493652344 189.8140411376953 -line 297.5986022949219 220.7688751220703 -close -move 298.5174255371094 227.98536682128906 -quad 295.7594299316406 232.01780700683594 289.7518310546875 236.8077850341797 -line 320.9226379394531 275.90228271484375 -quad 332.7951354980469 266.43609619140625 339.7877197265625 256.2123718261719 -line 298.5174255371094 227.98536682128906 -close -move 275.9797668457031 246.08067321777344 -quad 270.427001953125 249.3356475830078 263.8196716308594 252.63931274414062 -line 256.3661193847656 256.3660888671875 -line 252.63931274414062 263.8196716308594 -quad 251.653076171875 265.79217529296875 250.67042541503906 267.6719970703125 -line 294.981689453125 290.834716796875 -quad 296.1730041503906 288.5556945800781 297.3606872558594 286.1803283691406 -line 275.0 275.0 -line 286.1803283691406 297.3606872558594 -quad 294.2764587402344 293.3126220703125 301.2652282714844 289.21588134765625 -line 275.9797668457031 246.08067321777344 -close -move 241.88336181640625 282.729736328125 -quad 237.04600524902344 290.02880859375 232.56924438476562 294.57354736328125 -line 268.1899719238281 329.6614685058594 -quad 276.0559387207031 321.6760559082031 283.5613098144531 310.35125732421875 -line 241.88336181640625 282.729736328125 -close -move 225.541015625 299.85455322265625 -quad 224.9539337158203 300.0671691894531 224.20181274414062 299.7542419433594 -line 204.993896484375 345.9176025390625 -quad 223.69752502441406 353.69989013671875 242.56617736816406 346.8667297363281 -line 225.541015625 299.85455322265625 -close -move 216.7413787841797 293.85931396484375 -quad 212.2705841064453 289.13525390625 207.47462463378906 281.7511291503906 -line 165.54281616210938 308.9857177734375 -quad 172.82174682617188 320.1927490234375 180.42587280273438 328.2276916503906 -line 216.7413787841797 293.85931396484375 -close -move 198.72328186035156 266.50396728515625 -quad 198.04283142089844 265.1839599609375 197.36068725585938 263.8196716308594 -line 193.6339111328125 256.3661193847656 -line 186.1803436279297 252.63931274414062 -quad 178.93666076660156 249.01748657226562 172.96310424804688 245.45571899414062 -line 147.35671997070312 288.40118408203125 -quad 154.92025756835938 292.9109802246094 163.8196563720703 297.3606872558594 -line 175.0 275.0 -line 152.63931274414062 286.1803283691406 -quad 153.4591064453125 287.8199157714844 154.28057861328125 289.41351318359375 -line 198.72328186035156 266.50396728515625 -close -move 159.42169189453125 236.1393585205078 -quad 153.63658142089844 231.39205932617188 151.1505126953125 227.4824676513672 -line 108.9583740234375 254.31199645996094 -quad 115.7359848022461 264.9704895019531 127.7037124633789 274.791259765625 -line 159.42169189453125 236.1393585205078 -close -move 150.00189208984375 224.97889709472656 -quad 150.18785095214844 223.42279052734375 152.84616088867188 220.2192840576172 -line 114.36854553222656 188.29010009765625 -quad 102.29134368896484 202.84423828125 100.35515594482422 219.04579162597656 -line 150.00189208984375 224.97889709472656 -close -move 163.18238830566406 210.95616149902344 -quad 169.19935607910156 206.56207275390625 177.35842895507812 202.01126098632812 -line 153.00277709960938 158.3443145751953 -quad 142.1771240234375 164.38243103027344 133.69435119628906 170.57725524902344 -line 163.18238830566406 210.95616149902344 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d1BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d1BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d1BB(20,20).shape (working copy) @@ -1,108 +0,0 @@ -move 175.4472198486328 175.22360229492188 -quad 180.33192443847656 165.45419311523438 185.21475219726562 157.60067749023438 -line 184.36550903320312 157.0726776123047 -quad 179.4582061767578 164.96554565429688 174.5527801513672 174.77639770507812 -line 175.4472198486328 175.22360229492188 -close -move 196.8989715576172 141.54840087890625 -quad 204.4708251953125 132.92352294921875 212.02203369140625 128.9329833984375 -line 211.55479431152344 128.04884338378906 -quad 203.84080505371094 132.1254119873047 196.14747619628906 140.88865661621094 -line 196.8989715576172 141.54840087890625 -close -move 230.9221954345703 126.2155532836914 -quad 235.10691833496094 127.22651672363281 239.2995147705078 129.66677856445312 -quad 243.5079345703125 132.1162567138672 247.7234344482422 136.0050506591797 -line 248.4014892578125 135.27003479003906 -quad 244.10556030273438 131.3070526123047 239.80255126953125 128.80252075195312 -quad 235.4837188720703 126.28878021240234 231.1570281982422 125.24352264404297 -line 230.9221954345703 126.2155532836914 -close -move 260.5930480957031 151.21058654785156 -quad 265.73724365234375 158.61900329589844 270.8841247558594 168.15597534179688 -line 271.76416015625 167.68104553222656 -quad 266.59063720703125 158.09471130371094 261.4144592285156 150.64022827148438 -line 260.5930480957031 151.21058654785156 -close -move 285.7688293457031 181.28488159179688 -quad 295.283203125 186.67239379882812 302.46417236328125 192.0564727783203 -line 303.0640563964844 191.2563934326172 -quad 295.831787109375 185.83383178710938 286.2615661621094 180.41470336914062 -line 285.7688293457031 181.28488159179688 -close -move 316.83880615234375 205.60101318359375 -quad 320.3710632324219 210.08160400390625 322.2746276855469 214.55322265625 -quad 324.1707763671875 219.00732421875 324.4512634277344 223.4547576904297 -line 325.44927978515625 223.39181518554688 -quad 325.15802001953125 218.77333068847656 323.1947326660156 214.16152954101562 -quad 321.2389221191406 209.56723022460938 317.6241149902344 204.98190307617188 -line 316.83880615234375 205.60101318359375 -close -move 318.7398681640625 241.8166046142578 -quad 313.90692138671875 248.8827667236328 305.0255126953125 255.96409606933594 -line 305.6489562988281 256.7459716796875 -quad 314.64764404296875 249.57113647460938 319.5652770996094 242.38113403320312 -line 318.7398681640625 241.8166046142578 -close -move 288.36962890625 267.2169189453125 -quad 282.11322021484375 270.8843688964844 274.7763977050781 274.55279541015625 -line 274.55279541015625 274.7763977050781 -quad 273.46783447265625 276.9462890625 272.3829650878906 279.021728515625 -line 273.2691650390625 279.4849853515625 -quad 274.3582458496094 277.4015808105469 275.44720458984375 275.2236022949219 -line 275.0 275.0 -line 275.2236022949219 275.44720458984375 -quad 282.5902099609375 271.763916015625 288.8753662109375 268.0796203613281 -line 288.36962890625 267.2169189453125 -close -move 262.3055725097656 296.2642822265625 -quad 256.160888671875 305.53594970703125 250.02340698242188 311.7666320800781 -line 250.73582458496094 312.4683837890625 -quad 256.9410705566406 306.1689147949219 263.1391296386719 296.81671142578125 -line 262.3055725097656 296.2642822265625 -close -move 233.8833465576172 322.8905334472656 -quad 229.10845947265625 324.6197204589844 224.33920288085938 324.4910888671875 -quad 219.568115234375 324.3623962402344 214.78993225097656 322.374267578125 -line 214.40577697753906 323.29754638671875 -quad 219.35546875 325.3570251464844 224.31224060058594 325.49072265625 -quad 229.27085876464844 325.62445068359375 234.22384643554688 323.8307800292969 -line 233.8833465576172 322.8905334472656 -close -move 198.94677734375 310.6997985839844 -quad 192.94065856933594 304.3534240722656 186.92803955078125 295.0960693359375 -line 186.0894012451172 295.6407775878906 -quad 192.15167236328125 304.9745788574219 198.220458984375 311.3871765136719 -line 198.94677734375 310.6997985839844 -close -move 176.94635009765625 277.7296447753906 -quad 176.19680786132812 276.27557373046875 175.4472198486328 274.7763977050781 -line 175.22360229492188 274.55279541015625 -quad 167.1686248779297 270.5252990722656 160.4159698486328 266.4989929199219 -line 159.90383911132812 267.35791015625 -quad 166.68829345703125 271.4031677246094 174.77639770507812 275.44720458984375 -line 175.0 275.0 -line 174.5527801513672 275.2236022949219 -quad 175.3051300048828 276.7283020019531 176.0574951171875 278.1878356933594 -line 176.94635009765625 277.7296447753906 -close -move 143.8798828125 255.0787811279297 -quad 135.06529235839844 247.84548950195312 130.4763641357422 240.62893676757812 -line 129.6325225830078 241.16552734375 -quad 134.30728149414062 248.51705932617188 143.24551391601562 255.85182189941406 -line 143.8798828125 255.0787811279297 -close -move 125.67498779296875 222.07167053222656 -quad 126.1958236694336 217.7134552001953 128.26795959472656 213.34791564941406 -quad 130.34828186035156 208.96514892578125 133.99212646484375 204.57398986816406 -line 133.2225799560547 203.93540954589844 -quad 129.4986572265625 208.42306518554688 127.36457061767578 212.9191131591797 -quad 125.22229766845703 217.43240356445312 124.68205261230469 221.95301818847656 -line 125.67498779296875 222.07167053222656 -close -move 148.73326110839844 191.1704864501953 -quad 155.95846557617188 185.89404296875 165.42416381835938 180.6144561767578 -line 164.93704223632812 179.74111938476562 -quad 155.4180145263672 185.05044555664062 148.14349365234375 190.3629150390625 -line 148.73326110839844 191.1704864501953 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2.shape (working copy) @@ -1,4 +0,0 @@ -move 175.0 125.0 -line 625.0 125.0 -line 375.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(20,20).shape (working copy) @@ -1,72 +0,0 @@ -move 215.2443389892578 125.0 -quad 225.44036865234375 125.0 235.06671142578125 125.0 -line 235.06671142578125 25.0 -quad 225.44036865234375 25.0 215.2443389892578 25.0 -line 215.2443389892578 125.0 -close -move 255.27308654785156 125.0 -quad 265.67071533203125 125.0 275.30938720703125 125.0 -line 275.30938720703125 25.0 -quad 265.67071533203125 25.0 255.27308654785156 25.0 -line 255.27308654785156 125.0 -close -move 295.26165771484375 125.0 -quad 305.7812805175781 125.0 315.2209167480469 125.0 -line 315.2209167480469 25.0 -quad 305.7812805175781 25.0 295.26165771484375 25.0 -line 295.26165771484375 125.0 -close -move 335.2547302246094 125.0 -quad 346.2502746582031 125.0 355.3105163574219 125.0 -line 355.3105163574219 25.0 -quad 346.2502746582031 25.0 335.2547302246094 25.0 -line 335.2547302246094 125.0 -close -move 375.1180725097656 125.0 -quad 390.0199279785156 125.0 395.0998840332031 125.0 -line 395.0998840332031 25.0 -quad 390.0199279785156 25.0 375.1180725097656 25.0 -line 375.1180725097656 125.0 -close -move 380.24456787109375 25.0 -quad 372.14404296875 25.0 360.29022216796875 25.0 -line 360.29022216796875 125.0 -quad 372.14404296875 125.0 380.24456787109375 125.0 -line 380.24456787109375 25.0 -close -move 340.28399658203125 25.0 -quad 333.0921936035156 25.0 325.0 25.0 -line 320.1247253417969 25.0 -line 320.1247253417969 125.0 -line 325.0 125.0 -quad 333.0921936035156 125.0 340.28399658203125 125.0 -line 340.28399658203125 25.0 -close -move 300.1247253417969 25.0 -line 280.1247253417969 25.0 -line 280.1247253417969 125.0 -line 300.1247253417969 125.0 -line 300.1247253417969 25.0 -close -move 260.1247253417969 25.0 -line 240.1247100830078 25.0 -line 240.1247100830078 125.0 -line 260.1247253417969 125.0 -line 260.1247253417969 25.0 -close -move 220.1247100830078 25.0 -line 200.1247100830078 25.0 -line 200.1247100830078 125.0 -line 220.1247100830078 125.0 -line 220.1247100830078 25.0 -close -move 180.1247100830078 25.0 -line 175.0 25.0 -line 175.0 125.0 -quad 185.38868713378906 125.0 195.29283142089844 125.0 -line 195.29283142089844 25.0 -quad 185.38868713378906 25.0 175.0 25.0 -line 175.0 125.0 -line 180.1247100830078 125.0 -line 180.1247100830078 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5(50,50).shape (working copy) @@ -1,84 +0,0 @@ -move 125.0 125.0 -line 175.0 125.0 -line 175.0 25.0 -line 125.0 25.0 -line 125.0 125.0 -close -move 225.0 125.0 -line 275.0 125.0 -line 275.0 25.0 -line 225.0 25.0 -line 225.0 125.0 -close -move 325.0 125.0 -line 375.0 125.0 -line 375.0 25.0 -line 325.0 25.0 -line 325.0 125.0 -close -move 425.0 125.0 -line 475.0 125.0 -line 475.0 25.0 -line 425.0 25.0 -line 425.0 125.0 -close -move 425.0 125.0 -line 425.0 175.0 -line 525.0 175.0 -line 525.0 125.0 -line 425.0 125.0 -close -move 425.0 225.0 -line 425.0 275.0 -line 525.0 275.0 -line 525.0 225.0 -line 425.0 225.0 -close -move 425.0 325.0 -line 425.0 375.0 -line 525.0 375.0 -line 525.0 325.0 -line 425.0 325.0 -close -move 475.0 375.0 -line 425.0 375.0 -line 425.0 475.0 -line 475.0 475.0 -line 475.0 375.0 -close -move 375.0 375.0 -line 325.0 375.0 -line 325.0 475.0 -line 375.0 475.0 -line 375.0 375.0 -close -move 275.0 375.0 -line 225.0 375.0 -line 225.0 475.0 -line 275.0 475.0 -line 275.0 375.0 -close -move 175.0 375.0 -line 125.0 375.0 -line 125.0 475.0 -line 175.0 475.0 -line 175.0 375.0 -close -move 175.0 375.0 -line 175.0 325.0 -line 75.0 325.0 -line 75.0 375.0 -line 175.0 375.0 -close -move 175.0 275.0 -line 175.0 225.0 -line 75.0 225.0 -line 75.0 275.0 -line 175.0 275.0 -close -move 175.0 175.0 -line 175.0 125.0 -line 75.0 125.0 -line 75.0 175.0 -line 175.0 175.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BR.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BR.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/05_sq4_d50BR.shape (working copy) @@ -1,64 +0,0 @@ -move 197.36068725585938 186.1803436279297 -quad 208.04635620117188 164.80897521972656 217.67767333984375 155.17767333984375 -quad 221.05897521972656 151.79635620117188 223.6803436279297 150.48568725585938 -quad 224.65170288085938 150.0 225.0 150.0 -quad 225.34829711914062 150.0 226.3196563720703 150.48568725585938 -quad 228.94102478027344 151.79635620117188 232.32232666015625 155.17767333984375 -quad 241.95364379882812 164.80897521972656 252.63931274414062 186.1803436279297 -cubic 255.05841064453125 191.01852416992188 258.9814758300781 194.94158935546875 263.8196716308594 197.36068725585938 -quad 285.1910095214844 208.04635620117188 294.82232666015625 217.67767333984375 -quad 298.2036437988281 221.05897521972656 299.5143127441406 223.6803436279297 -quad 300.0 224.65170288085938 300.0 225.0 -quad 300.0 225.34829711914062 299.5143127441406 226.3196563720703 -quad 298.2036437988281 228.94102478027344 294.82232666015625 232.32232666015625 -quad 285.1910095214844 241.95364379882812 263.8196716308594 252.63931274414062 -cubic 258.9814758300781 255.05841064453125 255.05841064453125 258.9814758300781 252.63931274414062 263.8196716308594 -quad 241.95364379882812 285.1910095214844 232.32232666015625 294.82232666015625 -quad 228.94102478027344 298.2036437988281 226.3196563720703 299.5143127441406 -quad 225.34829711914062 300.0 225.0 300.0 -quad 224.65170288085938 300.0 223.6803436279297 299.5143127441406 -quad 221.05897521972656 298.2036437988281 217.67767333984375 294.82232666015625 -quad 208.04635620117188 285.1910095214844 197.36068725585938 263.8196716308594 -cubic 194.94158935546875 258.9814758300781 191.01852416992188 255.05841064453125 186.1803436279297 252.63931274414062 -quad 164.80897521972656 241.95364379882812 155.17767333984375 232.32232666015625 -quad 151.79635620117188 228.94102478027344 150.48568725585938 226.3196563720703 -quad 150.0 225.34829711914062 150.0 225.0 -quad 150.0 224.65170288085938 150.48568725585938 223.6803436279297 -quad 151.79635620117188 221.05897521972656 155.17767333984375 217.67767333984375 -quad 164.80897521972656 208.04635620117188 186.1803436279297 197.36068725585938 -cubic 191.01852416992188 194.9416046142578 194.9416046142578 191.01852416992188 197.36068725585938 186.1803436279297 -close -move 152.63931274414062 163.8196563720703 -line 175.0 175.0 -line 163.8196563720703 152.63931274414062 -quad 135.19102478027344 166.95364379882812 119.82232666015625 182.32232666015625 -quad 110.7036361694336 191.44102478027344 105.76432037353516 201.3196563720703 -quad 100.0 212.84829711914062 100.0 225.0 -quad 100.0 237.15170288085938 105.76432037353516 248.6803436279297 -quad 110.7036361694336 258.5589904785156 119.82232666015625 267.67767333984375 -quad 135.19102478027344 283.0463562011719 163.8196563720703 297.3606872558594 -line 175.0 275.0 -line 152.63931274414062 286.1803283691406 -quad 166.95364379882812 314.8089904785156 182.32232666015625 330.17767333984375 -quad 191.44102478027344 339.2963562011719 201.3196563720703 344.2356872558594 -quad 212.84829711914062 350.0 225.0 350.0 -quad 237.15170288085938 350.0 248.6803436279297 344.2356872558594 -quad 258.5589904785156 339.2963562011719 267.67767333984375 330.17767333984375 -quad 283.0463562011719 314.8089904785156 297.3606872558594 286.1803283691406 -line 275.0 275.0 -line 286.1803283691406 297.3606872558594 -quad 314.8089904785156 283.0463562011719 330.17767333984375 267.67767333984375 -quad 339.2963562011719 258.5589904785156 344.2356872558594 248.6803436279297 -quad 350.0 237.15170288085938 350.0 225.0 -quad 350.0 212.84829711914062 344.2356872558594 201.3196563720703 -quad 339.2963562011719 191.44102478027344 330.17767333984375 182.32232666015625 -quad 314.8089904785156 166.95364379882812 286.1803283691406 152.63931274414062 -line 275.0 175.0 -line 297.3606872558594 163.8196563720703 -quad 283.0463562011719 135.19102478027344 267.67767333984375 119.82232666015625 -quad 258.5589904785156 110.7036361694336 248.6803436279297 105.76432037353516 -quad 237.15170288085938 100.0 225.0 100.0 -quad 212.84829711914062 100.0 201.3196563720703 105.76432037353516 -quad 191.44102478027344 110.7036361694336 182.32232666015625 119.82232666015625 -quad 166.95364379882812 135.19102478027344 152.63931274414062 163.8196563720703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/03_sq4_d100BB(50,50).shape (working copy) @@ -1,92 +0,0 @@ -move 89.64466094970703 160.3553466796875 -quad 110.97369384765625 181.6843719482422 132.63502502441406 197.91371154785156 -line 192.5956268310547 117.88418579101562 -quad 176.64163208007812 105.93095397949219 160.3553466796875 89.64466094970703 -line 89.64466094970703 160.3553466796875 -close -move 184.3314208984375 229.19720458984375 -quad 214.7340545654297 243.30787658691406 245.73553466796875 247.8561248779297 -line 260.251220703125 148.91526794433594 -quad 243.64036560058594 146.478271484375 226.4306640625 138.4907989501953 -line 184.3314208984375 229.19720458984375 -close -move 311.7895202636719 246.60923767089844 -quad 342.346923828125 240.9647979736328 372.2773742675781 226.0129852294922 -line 327.5881042480469 136.55422973632812 -quad 310.2931823730469 145.19393920898438 293.6252136230469 148.2727813720703 -line 311.7895202636719 246.60923767089844 -close -move 422.6269836425781 193.8922576904297 -quad 441.6173095703125 179.09336853027344 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 387.2760925292969 92.01323699951172 384.9708251953125 94.38540649414062 -line 456.685791015625 164.0773468017578 -quad 458.4925537109375 162.2181396484375 460.3553466796875 160.3553466796875 -line 389.6446533203125 89.64466094970703 -quad 375.2756042480469 104.01372528076172 361.1588134765625 115.01473236083984 -line 422.6269836425781 193.8922576904297 -close -move 347.9688720703125 138.2500762939453 -quad 329.25897216796875 164.33139038085938 317.8287658691406 190.99383544921875 -line 409.73895263671875 230.3958282470703 -quad 416.8714904785156 213.75827026367188 429.2236022949219 196.5395965576172 -line 347.9688720703125 138.2500762939453 -close -move 301.1736755371094 253.34075927734375 -quad 297.5899963378906 286.3839111328125 304.9161376953125 319.2778015136719 -line 402.5245361328125 297.53839111328125 -quad 398.7867431640625 280.75604248046875 400.5906982421875 264.1229553222656 -line 301.1736755371094 253.34075927734375 -close -move 327.2099304199219 378.51861572265625 -quad 340.4970397949219 403.4346618652344 360.2554626464844 427.8489990234375 -line 437.98858642578125 364.9398498535156 -quad 424.23956298828125 347.95098876953125 415.4473876953125 331.4638366699219 -line 327.2099304199219 378.51861572265625 -close -move 450.8518371582031 380.40966796875 -quad 428.663818359375 359.47344970703125 406.09619140625 344.00323486328125 -line 349.55511474609375 426.48419189453125 -quad 365.6990966796875 437.55096435546875 382.22265625 453.1423034667969 -line 450.8518371582031 380.40966796875 -close -move 352.2908935546875 315.0690002441406 -quad 320.8846130371094 302.7176818847656 288.9639587402344 300.4876403808594 -line 281.9947204589844 400.2444763183594 -quad 298.58612060546875 401.4035949707031 315.69189453125 408.1308898925781 -line 352.2908935546875 315.0690002441406 -close -move 223.33709716796875 306.70001220703125 -quad 193.99392700195312 314.3414306640625 165.29273986816406 330.61431884765625 -line 214.6143798828125 417.60498046875 -quad 231.8972625732422 407.8059997558594 248.53817749023438 403.4724426269531 -line 223.33709716796875 306.70001220703125 -close -move 116.96002197265625 364.5343017578125 -quad 103.2381820678711 376.0511474609375 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 167.4830780029297 453.22760009765625 174.03846740722656 446.066162109375 -line 100.2755126953125 378.54559326171875 -quad 95.21104431152344 384.0782775878906 89.64466094970703 389.6446533203125 -line 160.3553466796875 460.3553466796875 -quad 170.86585998535156 449.8448181152344 181.24807739257812 441.1309509277344 -line 116.96002197265625 364.5343017578125 -close -move 209.80892944335938 400.402587890625 -quad 227.5865936279297 373.2046813964844 237.52142333984375 345.38641357421875 -line 143.34695434570312 311.7535705566406 -quad 137.3978729248047 328.41143798828125 126.1041030883789 345.689697265625 -line 209.80892944335938 400.402587890625 -close -move 249.90223693847656 281.2533264160156 -quad 250.92527770996094 248.5371551513672 241.29641723632812 216.1519317626953 -line 145.44345092773438 244.65121459960938 -quad 150.46932983398438 261.55499267578125 149.9510955810547 278.1278076171875 -line 249.90223693847656 281.2533264160156 -close -move 215.80081176757812 159.15220642089844 -quad 201.44393920898438 135.2510986328125 181.05657958984375 111.7989273071289 -line 105.58673858642578 177.40611267089844 -quad 120.22920989990234 194.24977111816406 130.0771484375 210.64450073242188 -line 215.80081176757812 159.15220642089844 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/51_sl5.shape (working copy) @@ -1,7 +0,0 @@ -move 175.0 125.0 -line 525.0 125.0 -line 725.0 125.0 -line 275.0 125.0 -line 625.0 125.0 -line 325.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100SB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100SB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100SB(50,50).shape (working copy) @@ -1,160 +0,0 @@ -move 39.64466094970703 110.35533905029297 -cubic 53.46352005004883 124.17420196533203 69.93992614746094 137.81761169433594 85.29571533203125 148.3174285888672 -line 126.56957244873047 176.5392303466797 -line 183.01315307617188 93.99152374267578 -line 141.7393035888672 65.76972961425781 -cubic 130.17787170410156 57.864376068115234 120.8560791015625 50.1453971862793 110.35533905029297 39.64466094970703 -line 75.0 4.2893218994140625 -line 4.2893218994140625 75.0 -line 39.64466094970703 110.35533905029297 -close -move 137.77206420898438 177.0624237060547 -cubic 155.7324676513672 184.6744384765625 176.6923828125 191.06687927246094 195.41416931152344 194.71888732910156 -line 244.48919677734375 204.29183959960938 -line 263.6351013183594 106.14176177978516 -line 214.56005859375 96.5688247680664 -cubic 200.9158935546875 93.90728759765625 189.92333984375 90.55474090576172 176.7942352294922 84.99034118652344 -line 130.75819396972656 65.47925567626953 -line 91.73602294921875 157.55133056640625 -line 137.77206420898438 177.0624237060547 -close -move 255.73570251464844 199.94215393066406 -cubic 274.9934387207031 199.5536651611328 296.85308837890625 196.7846221923828 315.7778625488281 192.30291748046875 -line 364.4321594238281 180.78079223632812 -line 341.38787841796875 83.47218322753906 -line 292.73358154296875 94.99433135986328 -cubic 278.9968566894531 98.2474136352539 267.6810607910156 99.68083190917969 253.71881103515625 99.96249389648438 -line 203.72898864746094 100.97093200683594 -line 205.74586486816406 200.9506072998047 -line 255.73570251464844 199.94215393066406 -close -move 372.5917053222656 172.43312072753906 -cubic 389.6183776855469 164.43264770507812 408.2336730957031 153.35556030273438 423.97467041015625 141.7264404296875 -line 464.1902160644531 112.01599884033203 -line 404.76934814453125 31.58492088317871 -line 364.5538024902344 61.295345306396484 -cubic 352.8178405761719 69.96562957763672 342.67498779296875 76.00115966796875 330.0645751953125 81.92652130126953 -line 284.811279296875 103.19009399414062 -line 327.3384094238281 193.69668579101562 -line 372.5917053222656 172.43312072753906 -close -move 381.7781677246094 47.784828186035156 -cubic 368.4676818847656 62.04071807861328 355.4085998535156 79.00323486328125 345.4768981933594 94.7381820678711 -line 318.7890625 137.02008056640625 -line 403.35284423828125 190.39576721191406 -line 430.0406799316406 148.11387634277344 -cubic 437.4869079589844 136.3167266845703 444.8050231933594 126.81119537353516 454.87091064453125 116.03035736083984 -line 488.9936828613281 79.4839859008789 -line 415.90093994140625 11.238454818725586 -line 381.7781677246094 47.784828186035156 -close -move 318.7287292480469 148.25949096679688 -cubic 311.804931640625 166.52224731445312 306.2207336425781 187.78759765625 303.310302734375 206.71853637695312 -line 295.7125549316406 256.1379089355469 -line 394.55133056640625 271.3333740234375 -line 402.1490478515625 221.91400146484375 -cubic 404.26666259765625 208.13986206054688 407.1837158203125 197.03140258789062 412.234375 183.7093505859375 -line 429.95928955078125 136.95652770996094 -line 336.45367431640625 101.50667572021484 -line 318.7287292480469 148.25949096679688 -close -move 300.5205993652344 267.200439453125 -cubic 301.6821594238281 286.3743896484375 305.31378173828125 308.0723876953125 310.5413818359375 326.81060791015625 -line 323.97735595703125 374.9715270996094 -line 420.2991943359375 348.0996398925781 -line 406.8632507324219 299.9386901855469 -cubic 403.06427001953125 286.32135009765625 401.180419921875 275.0658264160156 400.33758544921875 261.1534423828125 -line 397.3140869140625 211.2449493408203 -line 297.4971008300781 217.2919464111328 -line 300.5205993652344 267.200439453125 -close -move 332.6149597167969 382.8210754394531 -cubic 341.2191467285156 399.4482116699219 352.91571044921875 417.5521240234375 365.0641784667969 432.8330993652344 -line 396.17962646484375 471.9717102050781 -line 474.4568176269531 409.74078369140625 -line 443.34136962890625 370.6022033691406 -cubic 434.2469787597656 359.162841796875 427.82269287109375 349.2193298339844 421.4281005859375 336.86212158203125 -line 398.4486389160156 292.4555358886719 -line 309.6354675292969 338.4145202636719 -line 332.6149597167969 382.8210754394531 -close -move 443.8773498535156 374.2577819824219 -cubic 429.1944580078125 361.4681396484375 411.7587890625 349.0103454589844 395.657470703125 339.65911865234375 -line 352.4203796386719 314.5482177734375 -line 302.1986389160156 401.02239990234375 -line 345.4356994628906 426.1332702636719 -cubic 357.45977783203125 433.11651611328125 367.1423034667969 440.0346984863281 378.19537353515625 449.6625671386719 -line 415.89776611328125 482.5035400390625 -line 481.5797424316406 407.0987854003906 -line 443.8773498535156 374.2577819824219 -close -move 340.9254455566406 314.8699951171875 -cubic 322.4440612792969 308.68365478515625 300.9758605957031 303.9474792480469 281.9271545410156 301.7971496582031 -line 232.2427215576172 296.1884765625 -line 221.0253448486328 395.55731201171875 -line 270.70977783203125 401.166015625 -cubic 284.5505065917969 402.7284240722656 295.72650146484375 405.1940002441406 309.18328857421875 409.69842529296875 -line 356.5975036621094 425.56951904296875 -line 388.33966064453125 330.7410583496094 -line 340.9254455566406 314.8699951171875 -close -move 221.38644409179688 301.44268798828125 -cubic 202.30743408203125 303.370849609375 180.7848663330078 307.8587951660156 162.2435760498047 313.82940673828125 -line 114.65031433105469 329.15521240234375 -line 145.30191040039062 424.34173583984375 -line 192.89517211914062 409.01593017578125 -cubic 206.38909912109375 404.6706848144531 217.58346557617188 402.3363952636719 231.44134521484375 400.9359130859375 -line 281.1879577636719 395.908447265625 -line 271.133056640625 296.4152526855469 -line 221.38644409179688 301.44268798828125 -close -move 107.16806030273438 338.0384216308594 -cubic 90.96253204345703 347.21826171875 73.39164733886719 359.4978332519531 58.586387634277344 372.13348388671875 -line 20.554386138916016 404.5921936035156 -line 85.4718017578125 480.65618896484375 -line 123.50379180908203 448.1974792480469 -cubic 134.6346435546875 438.6977844238281 144.36749267578125 431.8958740234375 156.45596313476562 425.0481872558594 -line 199.96084594726562 400.40423583984375 -line 150.67294311523438 313.39447021484375 -line 107.16806030273438 338.0384216308594 -close -move 132.9136505126953 435.3503112792969 -cubic 145.20071411132812 420.2132263183594 157.0652618408203 402.2710876464844 165.83676147460938 385.772705078125 -line 189.30857849121094 341.6243896484375 -line 101.01199340820312 294.68072509765625 -line 77.54015350341797 338.82904052734375 -cubic 71.01432037353516 351.103515625 64.48197937011719 360.9820251464844 55.2725944519043 372.32757568359375 -line 23.761234283447266 411.1481018066406 -line 101.40227508544922 474.17083740234375 -line 132.9136505126953 435.3503112792969 -close -move 188.5469512939453 330.0072937011719 -cubic 193.99061584472656 311.32720947265625 197.8720245361328 289.68109130859375 199.25770568847656 270.5355529785156 -line 202.8670654296875 220.66598510742188 -line 103.12794494628906 213.44728088378906 -line 99.51858520507812 263.31683349609375 -cubic 98.51288604736328 277.21240234375 96.49800872802734 288.4490966796875 92.54045867919922 302.0295715332031 -line 78.55159759521484 350.0328063964844 -line 174.55809020996094 378.0105285644531 -line 188.5469512939453 330.0072937011719 -close -move 197.1775665283203 210.02008056640625 -cubic 194.4879608154297 191.0526885986328 189.14996337890625 169.72569274902344 182.4403533935547 151.397216796875 -line 165.25210571289062 104.44442749023438 -line 71.34651947021484 138.82093811035156 -line 88.53478240966797 185.7737274169922 -cubic 93.42644500732422 199.1361541748047 96.21192169189453 210.26499938964844 98.16802978515625 224.05975341796875 -line 105.1878662109375 273.56451416015625 -line 204.19740295410156 259.52484130859375 -line 197.1775665283203 210.02008056640625 -close -move 156.2572479248047 97.51850128173828 -cubic 146.4932861328125 81.67552947998047 133.60755920410156 64.57386779785156 120.44743347167969 50.19258499145508 -line 86.69287872314453 13.30587100982666 -line 12.919448852539062 80.81497955322266 -line 46.67400360107422 117.70169830322266 -cubic 56.61268997192383 128.5626220703125 63.81425476074219 138.12037658691406 71.12606811523438 149.98451232910156 -line 97.35907745361328 192.55010986328125 -line 182.49024963378906 140.08409118652344 -line 156.2572479248047 97.51850128173828 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50RR(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50RR(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50RR(50,50).shape (working copy) @@ -1,124 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 235.6808319091797 195.9518585205078 231.49803161621094 185.65118408203125 229.82583618164062 175.1674041748047 -cubic 227.65106201171875 161.5326385498047 214.83489990234375 152.2424774169922 201.20013427734375 154.41725158691406 -cubic 187.56536865234375 156.59202575683594 178.27520751953125 169.40818786621094 180.44998168945312 183.04295349121094 -cubic 183.02212524414062 199.1690673828125 191.26368713378906 219.46493530273438 204.19874572753906 238.8675079345703 -cubic 211.85755920410156 250.35572814941406 227.37928771972656 253.46006774902344 238.8675079345703 245.80125427246094 -cubic 250.35572814941406 238.14244079589844 253.46006774902344 222.62071228027344 245.80125427246094 211.1324920654297 -close -move 236.41973876953125 150.68350219726562 -cubic 243.9170379638672 143.07679748535156 252.40365600585938 139.63368225097656 266.398193359375 137.99794006347656 -cubic 280.1119384765625 136.39500427246094 289.9297180175781 123.97838592529297 288.3267822265625 110.26463317871094 -cubic 286.7238464355469 96.5508804321289 274.3072204589844 86.73310852050781 260.5934753417969 88.3360366821289 -cubic 239.8772735595703 90.75743103027344 215.55335998535156 100.62589263916016 200.80923461914062 115.58518981933594 -cubic 191.11709594726562 125.41876220703125 191.2317657470703 141.24746704101562 201.06533813476562 150.93960571289062 -cubic 210.89889526367188 160.63172912597656 226.72760009765625 160.51707458496094 236.41973876953125 150.68350219726562 -close -move 302.142578125 142.9752960205078 -cubic 307.965087890625 145.62843322753906 310.7580261230469 147.55442810058594 314.3344421386719 151.47901916503906 -cubic 317.8778076171875 155.36732482910156 318.8053283691406 157.03692626953125 319.9929504394531 162.13912963867188 -cubic 323.1231384277344 175.5867462158203 336.5621032714844 183.95068359375 350.0097351074219 180.82049560546875 -cubic 363.45733642578125 177.69032287597656 371.8212890625 164.2513427734375 368.69110107421875 150.80372619628906 -cubic 365.9154357910156 138.8791961669922 358.7576904296875 125.9944839477539 351.2909851074219 117.80091857910156 -cubic 343.8573303222656 109.64361572265625 332.71533203125 101.96015167236328 322.8751220703125 97.47626495361328 -cubic 310.3109130859375 91.75112915039062 295.4844665527344 97.2952880859375 289.75933837890625 109.8594970703125 -cubic 284.0341796875 122.42371368408203 289.578369140625 137.2501678466797 302.142578125 142.9752960205078 -close -move 313.86309814453125 194.30194091796875 -cubic 311.2595520019531 199.79598999023438 308.3677978515625 204.87892150878906 304.19873046875 211.1324920654297 -cubic 297.5883483886719 221.04806518554688 298.8957214355469 234.2510223388672 307.3222961425781 242.67764282226562 -cubic 315.7489013671875 251.10427856445312 328.9519348144531 252.41163635253906 338.86749267578125 245.80125427246094 -cubic 346.38519287109375 240.7894744873047 352.36309814453125 237.51544189453125 358.7745666503906 234.7418670654297 -cubic 371.44677734375 229.25991821289062 377.275634765625 214.54306030273438 371.7936706542969 201.87086486816406 -cubic 366.31170654296875 189.1986541748047 351.5948791503906 183.36981201171875 338.92266845703125 188.8517608642578 -cubic 330.3808898925781 192.54690551757812 320.459716796875 197.9805908203125 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 350.951904296875 231.1415557861328 355.6426696777344 222.89639282226562 359.04644775390625 215.71376037597656 -cubic 364.95916748046875 203.23672485351562 359.6377258300781 188.32888793945312 347.1606750488281 182.4161834716797 -cubic 334.68365478515625 176.50347900390625 319.77581787109375 181.8249053955078 313.86309814453125 194.30194091796875 -close -move 389.7815246582031 230.53724670410156 -cubic 394.6072692871094 232.08767700195312 396.26654052734375 233.19004821777344 399.9819030761719 237.0973358154297 -cubic 403.7608337402344 241.07147216796875 405.68133544921875 244.25106811523438 408.091064453125 250.3731689453125 -cubic 413.1480407714844 263.22088623046875 427.6626892089844 269.5364990234375 440.5103759765625 264.4794921875 -cubic 453.35809326171875 259.4225158691406 459.6736755371094 244.90789794921875 454.61669921875 232.06019592285156 -cubic 450.66156005859375 222.0117950439453 443.74542236328125 210.56153869628906 436.2159423828125 202.64309692382812 -cubic 428.6228332519531 194.65777587890625 416.50189208984375 186.6048126220703 405.0756530761719 182.93377685546875 -cubic 391.9303283691406 178.71041870117188 377.8502197265625 185.94309997558594 373.6268615722656 199.08843994140625 -cubic 369.4034729003906 212.23377990722656 376.6361999511719 226.3138885498047 389.7815246582031 230.53724670410156 -close -move 411.5956115722656 286.547607421875 -cubic 409.3852844238281 300.414306640625 405.7242431640625 308.2731628417969 397.76617431640625 314.99700927734375 -cubic 387.21954345703125 323.907958984375 385.8935546875 339.6814270019531 394.8044738769531 350.22808837890625 -cubic 403.7154235839844 360.77471923828125 419.4888916015625 362.1007385253906 430.0355529785156 353.1897888183594 -cubic 446.4002685546875 339.36309814453125 457.6612854003906 315.18988037109375 460.9722595214844 294.4181823730469 -cubic 463.1456604003906 280.783203125 453.8542175292969 267.96795654296875 440.21923828125 265.7945556640625 -cubic 426.5842590332031 263.62115478515625 413.7690124511719 272.9126281738281 411.5956115722656 286.547607421875 -close -move 372.09783935546875 319.6598815917969 -cubic 362.1972961425781 317.5246887207031 352.57244873046875 313.3353576660156 338.86749267578125 304.19873046875 -cubic 328.9519348144531 297.5883483886719 315.7489318847656 298.8957214355469 307.32232666015625 307.32232666015625 -cubic 298.8957214355469 315.7489318847656 297.58837890625 328.9519348144531 304.19873046875 338.86749267578125 -cubic 304.9316711425781 339.9668884277344 305.56097412109375 340.93463134765625 306.24359130859375 342.01129150390625 -cubic 313.6366882324219 353.6722717285156 329.08306884765625 357.1321105957031 340.7440490722656 349.739013671875 -cubic 352.405029296875 342.3459167480469 355.8648681640625 326.8995056152344 348.4717712402344 315.238525390625 -cubic 347.634765625 313.9183654785156 346.6925964355469 312.4695129394531 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 328.538818359375 357.4054870605469 346.7988586425781 365.3533630371094 361.556884765625 368.5361633300781 -cubic 375.0537109375 371.44696044921875 388.3547058105469 362.86529541015625 391.2655029296875 349.3684997558594 -cubic 394.1763000488281 335.8716735839844 385.59466552734375 322.5706787109375 372.09783935546875 319.6598815917969 -close -move 320.5072937011719 377.37286376953125 -cubic 321.1820983886719 384.0038757324219 320.8011474609375 386.5968322753906 318.91082763671875 391.3132019042969 -cubic 317.13421630859375 395.7459411621094 315.9393310546875 397.34881591796875 311.99737548828125 400.8086853027344 -cubic 301.620361328125 409.9166259765625 300.5915832519531 425.7122802734375 309.6994934082031 436.0892639160156 -cubic 318.80743408203125 446.4662780761719 334.60308837890625 447.4950866699219 344.9801025390625 438.38714599609375 -cubic 352.87957763671875 431.4537353515625 361.119140625 420.400634765625 365.3218994140625 409.91461181640625 -cubic 369.4109802246094 399.7122802734375 371.5543212890625 385.123779296875 370.2503662109375 372.31060791015625 -cubic 368.8524475097656 358.5744323730469 356.5838623046875 348.5722961425781 342.8476867675781 349.9701843261719 -cubic 329.11151123046875 351.36810302734375 319.1094055175781 363.6366882324219 320.5072937011719 377.37286376953125 -close -move 280.6116638183594 412.2892150878906 -cubic 266.7866516113281 413.3319091796875 256.18310546875 411.4734191894531 245.48252868652344 405.86334228515625 -cubic 233.25408935546875 399.4522705078125 218.14376831054688 404.16815185546875 211.73269653320312 416.3966064453125 -cubic 205.3216094970703 428.6250305175781 210.0375213623047 443.7353515625 222.2659454345703 450.14642333984375 -cubic 239.87161254882812 459.3766784667969 264.312744140625 463.6605224609375 284.3720397949219 462.1476135253906 -cubic 298.1400451660156 461.1092224121094 308.4594421386719 449.1062316894531 307.4210205078125 435.3382263183594 -cubic 306.38262939453125 421.5702209472656 294.37969970703125 411.2508239746094 280.6116638183594 412.2892150878906 -close -move 229.63160705566406 385.910400390625 -cubic 228.2103271484375 376.67535400390625 229.63514709472656 368.3929138183594 237.4724578857422 352.979736328125 -cubic 243.7305450439453 340.67230224609375 238.8265838623047 325.6219787597656 226.5191650390625 319.3638916015625 -cubic 214.21173095703125 313.1058044433594 199.1614227294922 318.0097351074219 192.9033203125 330.3171691894531 -cubic 181.64035034179688 352.4674072265625 177.55282592773438 376.2280578613281 180.2134246826172 393.5158386230469 -cubic 182.31361389160156 407.16229248046875 195.0787811279297 416.52239990234375 208.72523498535156 414.4222106933594 -cubic 222.37167358398438 412.322021484375 231.73179626464844 399.5568542480469 229.63160705566406 385.910400390625 -close -move 188.2191619873047 316.4948425292969 -cubic 173.20083618164062 322.34747314453125 166.7279510498047 322.2638854980469 158.39903259277344 318.793212890625 -cubic 145.65414428710938 313.482421875 131.01712036132812 319.5089111328125 125.7063217163086 332.2538146972656 -cubic 120.39552307128906 344.9986877441406 126.42204284667969 359.6357116699219 139.1669158935547 364.9465026855469 -cubic 156.41775512695312 372.13494873046875 182.287353515625 372.46893310546875 206.37423706054688 363.08233642578125 -cubic 219.23902893066406 358.0689392089844 225.6038360595703 343.5758361816406 220.5904541015625 330.7110290527344 -cubic 215.57705688476562 317.84625244140625 201.0839385986328 311.4814453125 188.2191619873047 316.4948425292969 -close -move 140.9654541015625 297.0434875488281 -cubic 136.85035705566406 284.8676452636719 136.25331115722656 273.71368408203125 138.92724609375 260.5662841796875 -cubic 141.67901611328125 247.03616333007812 132.94142150878906 233.8370819091797 119.41130065917969 231.08531188964844 -cubic 105.88117980957031 228.3335418701172 92.6821060180664 237.0711212158203 89.93032836914062 250.6012420654297 -cubic 85.98338317871094 270.0079345703125 87.28816986083984 294.3839111328125 93.59761810302734 313.052490234375 -cubic 98.01837921142578 326.13275146484375 112.20577239990234 333.1526794433594 125.28604125976562 328.7319030761719 -cubic 138.36630249023438 324.3111572265625 145.38621520996094 310.1237487792969 140.9654541015625 297.0434875488281 -close -move 153.8240966796875 233.76339721679688 -cubic 157.5792999267578 231.07276916503906 159.162353515625 230.39691162109375 164.05201721191406 229.63742065429688 -cubic 169.4383087158203 228.80078125 173.2158966064453 229.01116943359375 180.70755004882812 231.01979064941406 -cubic 194.04364013671875 234.59539794921875 207.7532958984375 226.68296813964844 211.32891845703125 213.3468780517578 -cubic 214.90452575683594 200.01077270507812 206.9921112060547 186.30113220214844 193.656005859375 182.7255096435547 -cubic 181.16458129882812 179.37635803222656 166.96420288085938 178.58551025390625 156.377685546875 180.22987365722656 -cubic 145.2945098876953 181.95140075683594 132.9098663330078 187.23880004882812 124.70249938964844 193.11941528320312 -cubic 113.47897338867188 201.16111755371094 110.89959716796875 216.77867126464844 118.94129943847656 228.002197265625 -cubic 126.9830093383789 239.22572326660156 142.60057067871094 241.8050994873047 153.8240966796875 233.76339721679688 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BR.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BR.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BR.shape (working copy) @@ -1,24 +0,0 @@ -move 125.0 125.0 -line 475.0 125.0 -line 475.0 75.0 -line 425.0 75.0 -line 425.0 425.0 -line 475.0 425.0 -line 475.0 375.0 -line 125.0 375.0 -line 125.0 425.0 -line 175.0 425.0 -line 175.0 75.0 -line 125.0 75.0 -line 125.0 125.0 -close -move 125.0 25.0 -cubic 97.3857650756836 25.0 75.0 47.38576126098633 75.0 75.0 -line 75.0 425.0 -cubic 75.0 452.6142272949219 97.3857650756836 475.0 125.0 475.0 -line 475.0 475.0 -cubic 502.6142272949219 475.0 525.0 452.6142272949219 525.0 425.0 -line 525.0 75.0 -cubic 525.0 47.38576126098633 502.6142272949219 25.0 475.0 25.0 -line 125.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/01_sc4_d100BB.shape (working copy) @@ -1,44 +0,0 @@ -move 39.64466094970703 110.35533905029297 -cubic 68.1455307006836 138.856201171875 104.34325408935547 162.98802185058594 138.40965270996094 177.33177185058594 -cubic 172.74697875976562 191.7895965576172 213.7990264892578 200.0 250.0 200.0 -cubic 286.20098876953125 200.0 327.2530212402344 191.7895965576172 361.5903625488281 177.33177185058594 -cubic 395.65673828125 162.98802185058594 431.8544616699219 138.856201171875 460.3553466796875 110.35533905029297 -line 389.6446533203125 39.64466094970703 -cubic 361.143798828125 68.1455307006836 337.0119934082031 104.34325408935547 322.6682434082031 138.40965270996094 -cubic 308.2104187011719 172.74697875976562 300.0 213.7990264892578 300.0 250.0 -cubic 300.0 286.20098876953125 308.2104187011719 327.2530212402344 322.6682434082031 361.5903625488281 -cubic 337.0119934082031 395.65673828125 361.143798828125 431.8544616699219 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -cubic 431.8544616699219 361.143798828125 395.65673828125 337.0119934082031 361.5903625488281 322.6682434082031 -cubic 327.2530212402344 308.2104187011719 286.20098876953125 300.0 250.0 300.0 -cubic 213.7990264892578 300.0 172.74697875976562 308.2104187011719 138.40965270996094 322.6682434082031 -cubic 104.34325408935547 337.0119934082031 68.1455307006836 361.143798828125 39.64466094970703 389.6446533203125 -line 110.35533905029297 460.3553466796875 -cubic 138.856201171875 431.8544616699219 162.98802185058594 395.65673828125 177.33177185058594 361.5903625488281 -cubic 191.7895965576172 327.2530212402344 200.0 286.20098876953125 200.0 250.0 -cubic 200.0 213.7990264892578 191.7895965576172 172.74697875976562 177.33177185058594 138.40965270996094 -cubic 162.98802185058594 104.34325408935547 138.856201171875 68.1455307006836 110.35533905029297 39.64466094970703 -line 39.64466094970703 110.35533905029297 -close -move 110.35533905029297 39.64466094970703 -line 39.64466094970703 110.35533905029297 -cubic 61.14379119873047 131.85447692871094 74.51197814941406 151.90675354003906 85.16822814941406 177.21534729003906 -cubic 95.71041107177734 202.25302124023438 100.0 223.7009735107422 100.0 250.0 -cubic 100.0 276.29901123046875 95.71041107177734 297.7469787597656 85.16822814941406 322.7846374511719 -cubic 74.51197814941406 348.09326171875 61.14379119873047 368.1455383300781 39.64466094970703 389.6446533203125 -line 110.35533905029297 460.3553466796875 -cubic 131.85447692871094 438.856201171875 151.90675354003906 425.4880065917969 177.21534729003906 414.8317565917969 -cubic 202.25302124023438 404.2895812988281 223.7009735107422 400.0 250.0 400.0 -cubic 276.29901123046875 400.0 297.7469787597656 404.2895812988281 322.7846374511719 414.8317565917969 -cubic 348.09326171875 425.4880065917969 368.1455383300781 438.856201171875 389.6446533203125 460.3553466796875 -line 460.3553466796875 389.6446533203125 -cubic 438.856201171875 368.1455383300781 425.4880065917969 348.09326171875 414.8317565917969 322.7846374511719 -cubic 404.2895812988281 297.7469787597656 400.0 276.29901123046875 400.0 250.0 -cubic 400.0 223.7009735107422 404.2895812988281 202.25302124023438 414.8317565917969 177.21534729003906 -cubic 425.4880065917969 151.90675354003906 438.856201171875 131.85447692871094 460.3553466796875 110.35533905029297 -line 389.6446533203125 39.64466094970703 -cubic 368.1455383300781 61.14379119873047 348.09326171875 74.51197814941406 322.7846374511719 85.16822814941406 -cubic 297.7469787597656 95.71041107177734 276.29901123046875 100.0 250.0 100.0 -cubic 223.7009735107422 100.0 202.25302124023438 95.71041107177734 177.21534729003906 85.16822814941406 -cubic 151.90675354003906 74.51197814941406 131.85447692871094 61.14379119873047 110.35533905029297 39.64466094970703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100RB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100RB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/50_sl2_d100RB(50,50).shape (working copy) @@ -1,72 +0,0 @@ -move 175.0 175.0 -line 225.0 175.0 -cubic 252.61424255371094 175.0 275.0 152.61424255371094 275.0 125.0 -cubic 275.0 97.3857650756836 252.61424255371094 75.0 225.0 75.0 -line 175.0 75.0 -cubic 147.38575744628906 75.0 125.0 97.3857650756836 125.0 125.0 -cubic 125.0 152.61424255371094 147.38575744628906 175.0 175.0 175.0 -close -move 275.0 175.0 -line 325.0 175.0 -cubic 352.6142272949219 175.0 375.0 152.61424255371094 375.0 125.0 -cubic 375.0 97.3857650756836 352.6142272949219 75.0 325.0 75.0 -line 275.0 75.0 -cubic 247.38575744628906 75.0 225.0 97.3857650756836 225.0 125.0 -cubic 225.0 152.61424255371094 247.38575744628906 175.0 275.0 175.0 -close -move 375.0 175.0 -line 425.0 175.0 -cubic 452.6142272949219 175.0 475.0 152.61424255371094 475.0 125.0 -cubic 475.0 97.3857650756836 452.6142272949219 75.0 425.0 75.0 -line 375.0 75.0 -cubic 347.3857727050781 75.0 325.0 97.3857650756836 325.0 125.0 -cubic 325.0 152.61424255371094 347.3857727050781 175.0 375.0 175.0 -close -move 475.0 175.0 -line 525.0 175.0 -cubic 552.6142578125 175.0 575.0 152.61424255371094 575.0 125.0 -cubic 575.0 97.3857650756836 552.6142578125 75.0 525.0 75.0 -line 475.0 75.0 -cubic 447.3857727050781 75.0 425.0 97.3857650756836 425.0 125.0 -cubic 425.0 152.61424255371094 447.3857727050781 175.0 475.0 175.0 -close -move 575.0 175.0 -line 625.0 175.0 -cubic 652.6142578125 175.0 675.0 152.61424255371094 675.0 125.0 -cubic 675.0 97.3857650756836 652.6142578125 75.0 625.0 75.0 -line 575.0 75.0 -cubic 547.3857421875 75.0 525.0 97.3857650756836 525.0 125.0 -cubic 525.0 152.61424255371094 547.3857421875 175.0 575.0 175.0 -close -move 575.0 75.0 -line 525.0 75.0 -cubic 497.3857727050781 75.0 475.0 97.3857650756836 475.0 125.0 -cubic 475.0 152.61424255371094 497.3857727050781 175.0 525.0 175.0 -line 575.0 175.0 -cubic 602.6142578125 175.0 625.0 152.61424255371094 625.0 125.0 -cubic 625.0 97.3857650756836 602.6142578125 75.0 575.0 75.0 -close -move 475.0 75.0 -line 425.0 75.0 -cubic 397.3857727050781 75.0 375.0 97.3857650756836 375.0 125.0 -cubic 375.0 152.61424255371094 397.3857727050781 175.0 425.0 175.0 -line 475.0 175.0 -cubic 502.6142272949219 175.0 525.0 152.61424255371094 525.0 125.0 -cubic 525.0 97.3857650756836 502.6142272949219 75.0 475.0 75.0 -close -move 375.0 75.0 -line 325.0 75.0 -cubic 297.3857727050781 75.0 275.0 97.3857650756836 275.0 125.0 -cubic 275.0 152.61424255371094 297.3857727050781 175.0 325.0 175.0 -line 375.0 175.0 -cubic 402.6142272949219 175.0 425.0 152.61424255371094 425.0 125.0 -cubic 425.0 97.3857650756836 402.6142272949219 75.0 375.0 75.0 -close -move 275.0 75.0 -line 225.0 75.0 -cubic 197.38575744628906 75.0 175.0 97.3857650756836 175.0 125.0 -cubic 175.0 152.61424255371094 197.38575744628906 175.0 225.0 175.0 -line 275.0 175.0 -cubic 302.6142272949219 175.0 325.0 152.61424255371094 325.0 125.0 -cubic 325.0 97.3857650756836 302.6142272949219 75.0 275.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/56_sc1_d100BB.shape (working copy) @@ -1,14 +0,0 @@ -move 175.0 125.0 -cubic 343.75 125.0 343.75 125.0 512.5 125.0 -line 512.5 25.0 -cubic 468.75 25.0 468.75 25.0 425.0 25.0 -line 175.0 25.0 -line 175.0 125.0 -close -move 175.0 25.0 -line 175.0 125.0 -line 425.0 125.0 -cubic 468.75 125.0 468.75 125.0 512.5 125.0 -line 512.5 25.0 -cubic 343.75 25.0 343.75 25.0 175.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SB.shape (working copy) @@ -1,80 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 234.86111450195312 194.72227478027344 230.7455291748047 183.9188690185547 229.5345916748047 173.0204620361328 -cubic 228.49053955078125 163.62403869628906 229.3418731689453 160.4315948486328 233.30125427246094 154.4925079345703 -cubic 237.1758575439453 148.68060302734375 240.72752380371094 146.01686096191406 248.9104766845703 142.50987243652344 -cubic 257.3153991699219 138.90777587890625 264.8235168457031 137.5 275.0 137.5 -cubic 285.1764831542969 137.5 292.6846008300781 138.90777587890625 301.0895080566406 142.50987243652344 -cubic 309.2724914550781 146.01686096191406 312.82415771484375 148.68060302734375 316.69873046875 154.4925079345703 -cubic 320.65814208984375 160.4315948486328 321.50946044921875 163.62403869628906 320.46539306640625 173.0204620361328 -cubic 319.2544860839844 183.9188690185547 315.1388854980469 194.72227478027344 304.19873046875 211.1324920654297 -line 338.86749267578125 245.80125427246094 -cubic 355.2777099609375 234.86111450195312 366.0811462402344 230.7455291748047 376.97955322265625 229.5345916748047 -cubic 386.3759460449219 228.49053955078125 389.56842041015625 229.3418731689453 395.50750732421875 233.30125427246094 -cubic 401.31939697265625 237.1758575439453 403.983154296875 240.72752380371094 407.4901123046875 248.9104766845703 -cubic 411.09222412109375 257.3153991699219 412.5 264.8235168457031 412.5 275.0 -cubic 412.5 285.1764831542969 411.09222412109375 292.6846008300781 407.4901123046875 301.0895080566406 -cubic 403.983154296875 309.2724914550781 401.31939697265625 312.82415771484375 395.50750732421875 316.69873046875 -cubic 389.56842041015625 320.65814208984375 386.3759460449219 321.50946044921875 376.97955322265625 320.46539306640625 -cubic 366.0811462402344 319.2544860839844 355.2777099609375 315.1388854980469 338.86749267578125 304.19873046875 -line 304.19873046875 338.86749267578125 -cubic 315.1388854980469 355.2777099609375 319.2544860839844 366.0811462402344 320.46539306640625 376.97955322265625 -cubic 321.50946044921875 386.3759460449219 320.65814208984375 389.56842041015625 316.69873046875 395.50750732421875 -cubic 312.82415771484375 401.31939697265625 309.2724914550781 403.983154296875 301.0895080566406 407.4901123046875 -cubic 292.6846008300781 411.09222412109375 285.1764831542969 412.5 275.0 412.5 -cubic 264.8235168457031 412.5 257.3153991699219 411.09222412109375 248.9104766845703 407.4901123046875 -cubic 240.72752380371094 403.983154296875 237.1758575439453 401.31939697265625 233.30125427246094 395.50750732421875 -cubic 229.3418731689453 389.56842041015625 228.49053955078125 386.3759460449219 229.5345916748047 376.97955322265625 -cubic 230.7455291748047 366.0811462402344 234.86111450195312 355.2777099609375 245.80125427246094 338.86749267578125 -line 211.1324920654297 304.19873046875 -cubic 194.72227478027344 315.1388854980469 183.9188690185547 319.2544860839844 173.0204620361328 320.46539306640625 -cubic 163.62403869628906 321.50946044921875 160.4315948486328 320.65814208984375 154.4925079345703 316.69873046875 -cubic 148.68060302734375 312.82415771484375 146.01686096191406 309.2724914550781 142.50987243652344 301.0895080566406 -cubic 138.90777587890625 292.6846008300781 137.5 285.1764831542969 137.5 275.0 -cubic 137.5 264.8235168457031 138.90777587890625 257.3153991699219 142.50987243652344 248.9104766845703 -cubic 146.01686096191406 240.72752380371094 148.68060302734375 237.1758575439453 154.4925079345703 233.30125427246094 -cubic 160.4315948486328 229.3418731689453 163.62403869628906 228.49053955078125 173.0204620361328 229.5345916748047 -cubic 183.9188690185547 230.7455291748047 194.72227478027344 234.86111450195312 211.1324920654297 245.80125427246094 -line 245.80125427246094 211.1324920654297 -close -move 204.19874572753906 238.8675079345703 -line 225.0 225.0 -line 238.8675079345703 204.19874572753906 -cubic 217.77772521972656 190.13888549804688 195.7686309814453 181.7544708251953 178.5420379638672 179.8404083251953 -cubic 159.81346130371094 177.75946044921875 139.5684051513672 183.1581268310547 126.75749206542969 191.69874572753906 -cubic 113.81938934326172 200.3241424560547 102.42063903808594 215.52247619628906 96.55262756347656 229.2145233154297 -cubic 90.77973175048828 242.68460083007812 87.5 260.1764831542969 87.5 275.0 -cubic 87.5 289.8235168457031 90.77973175048828 307.3153991699219 96.55262756347656 320.7854919433594 -cubic 102.42063903808594 334.4775085449219 113.81938934326172 349.67584228515625 126.75749206542969 358.30126953125 -cubic 139.5684051513672 366.84185791015625 159.81346130371094 372.24053955078125 178.5420379638672 370.15960693359375 -cubic 195.7686309814453 368.2455139160156 217.77772521972656 359.8611145019531 238.8675079345703 345.80126953125 -line 225.0 325.0 -line 204.19874572753906 311.13250732421875 -cubic 190.13888549804688 332.2222900390625 181.7544708251953 354.2313537597656 179.8404083251953 371.45794677734375 -cubic 177.75946044921875 390.1865539550781 183.1581268310547 410.43157958984375 191.69874572753906 423.24249267578125 -cubic 200.3241424560547 436.18060302734375 215.52247619628906 447.579345703125 229.2145233154297 453.4473876953125 -cubic 242.68460083007812 459.22027587890625 260.1764831542969 462.5 275.0 462.5 -cubic 289.8235168457031 462.5 307.3153991699219 459.22027587890625 320.7854919433594 453.4473876953125 -cubic 334.4775085449219 447.579345703125 349.67584228515625 436.18060302734375 358.30126953125 423.24249267578125 -cubic 366.84185791015625 410.43157958984375 372.24053955078125 390.1865539550781 370.15960693359375 371.45794677734375 -cubic 368.2455139160156 354.2313537597656 359.8611145019531 332.2222900390625 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 332.2222900390625 359.8611145019531 354.2313537597656 368.2455139160156 371.45794677734375 370.15960693359375 -cubic 390.1865539550781 372.24053955078125 410.43157958984375 366.84185791015625 423.24249267578125 358.30126953125 -cubic 436.18060302734375 349.67584228515625 447.579345703125 334.4775085449219 453.4473876953125 320.7854919433594 -cubic 459.22027587890625 307.3153991699219 462.5 289.8235168457031 462.5 275.0 -cubic 462.5 260.1764831542969 459.22027587890625 242.68460083007812 453.4473876953125 229.2145233154297 -cubic 447.579345703125 215.52247619628906 436.18060302734375 200.3241424560547 423.24249267578125 191.69874572753906 -cubic 410.43157958984375 183.1581268310547 390.1865539550781 177.75946044921875 371.45794677734375 179.8404083251953 -cubic 354.2313537597656 181.7544708251953 332.2222900390625 190.13888549804688 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 359.8611145019531 217.77772521972656 368.2455139160156 195.7686309814453 370.15960693359375 178.5420379638672 -cubic 372.24053955078125 159.81346130371094 366.84185791015625 139.5684051513672 358.30126953125 126.75749206542969 -cubic 349.67584228515625 113.81938934326172 334.4775085449219 102.42063903808594 320.7854919433594 96.55262756347656 -cubic 307.3153991699219 90.77973175048828 289.8235168457031 87.5 275.0 87.5 -cubic 260.1764831542969 87.5 242.68460083007812 90.77973175048828 229.2145233154297 96.55262756347656 -cubic 215.52247619628906 102.42063903808594 200.3241424560547 113.81938934326172 191.69874572753906 126.75749206542969 -cubic 183.1581268310547 139.5684051513672 177.75946044921875 159.81346130371094 179.8404083251953 178.5420379638672 -cubic 181.7544708251953 195.7686309814453 190.13888549804688 217.77772521972656 204.19874572753906 238.8675079345703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d50SB.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d50SB.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/02_sc8_d50SB.shape (working copy) @@ -1,72 +0,0 @@ -move 395.80126953125 361.13250732421875 -cubic 371.9812927246094 325.4025573730469 361.470947265625 301.7543029785156 357.3270263671875 281.03460693359375 -cubic 353.53814697265625 262.0902099609375 355.5873718261719 249.79481506347656 361.2170715332031 232.90570068359375 -cubic 372.6583557128906 198.5818328857422 400.0 157.56939697265625 400.0 75.0 -line 350.0 75.0 -cubic 350.0 157.56939697265625 377.3416442871094 198.5818328857422 388.7829284667969 232.90570068359375 -cubic 394.4126281738281 249.79481506347656 396.46185302734375 262.0902099609375 392.6729736328125 281.03460693359375 -cubic 388.529052734375 301.7543029785156 378.0187072753906 325.4025573730469 354.19873046875 361.13250732421875 -line 388.86749267578125 395.80126953125 -cubic 424.5974426269531 371.9812927246094 448.2456970214844 361.470947265625 468.96539306640625 357.3270263671875 -cubic 487.9097900390625 353.53814697265625 500.2051696777344 355.5873718261719 517.0942993164062 361.2170715332031 -cubic 551.4181518554688 372.6583557128906 592.4306030273438 400.0 675.0 400.0 -line 675.0 350.0 -cubic 592.4306030273438 350.0 551.4181518554688 377.3416442871094 517.0942993164062 388.7829284667969 -cubic 500.2051696777344 394.4126281738281 487.9097900390625 396.46185302734375 468.96539306640625 392.6729736328125 -cubic 448.2456970214844 388.529052734375 424.5974426269531 378.0187072753906 388.86749267578125 354.19873046875 -line 354.19873046875 388.86749267578125 -cubic 378.0187072753906 424.5974426269531 388.529052734375 448.2456970214844 392.6729736328125 468.96539306640625 -cubic 396.46185302734375 487.9097900390625 394.4126281738281 500.2051696777344 388.7829284667969 517.0942993164062 -cubic 377.3416442871094 551.4181518554688 350.0 592.4306030273438 350.0 675.0 -line 400.0 675.0 -cubic 400.0 592.4306030273438 372.6583557128906 551.4181518554688 361.2170715332031 517.0942993164062 -cubic 355.5873718261719 500.2051696777344 353.53814697265625 487.9097900390625 357.3270263671875 468.96539306640625 -cubic 361.470947265625 448.2456970214844 371.9812927246094 424.5974426269531 395.80126953125 388.86749267578125 -line 361.13250732421875 354.19873046875 -cubic 325.4025573730469 378.0187072753906 301.7543029785156 388.529052734375 281.03460693359375 392.6729736328125 -cubic 262.0902099609375 396.46185302734375 249.79481506347656 394.4126281738281 232.90570068359375 388.7829284667969 -cubic 198.5818328857422 377.3416442871094 157.56939697265625 350.0 75.0 350.0 -line 75.0 400.0 -cubic 157.56939697265625 400.0 198.5818328857422 372.6583557128906 232.90570068359375 361.2170715332031 -cubic 249.79481506347656 355.5873718261719 262.0902099609375 353.53814697265625 281.03460693359375 357.3270263671875 -cubic 301.7543029785156 361.470947265625 325.4025573730469 371.9812927246094 361.13250732421875 395.80126953125 -line 395.80126953125 361.13250732421875 -close -move 354.19873046875 388.86749267578125 -line 375.0 375.0 -line 388.86749267578125 354.19873046875 -cubic 349.5974426269531 328.0187072753906 316.9956970214844 313.529052734375 290.84039306640625 308.2979736328125 -cubic 262.9097900390625 302.71185302734375 237.70518493652344 306.9126281738281 217.09429931640625 313.7829284667969 -cubic 176.4181671142578 327.3416442871094 142.43060302734375 350.0 75.0 350.0 -line 75.0 400.0 -cubic 142.43060302734375 400.0 176.4181671142578 422.6583557128906 217.09429931640625 436.2170715332031 -cubic 237.70518493652344 443.0873718261719 262.9097900390625 447.28814697265625 290.84039306640625 441.7020263671875 -cubic 316.9956970214844 436.470947265625 349.5974426269531 421.9812927246094 388.86749267578125 395.80126953125 -line 375.0 375.0 -line 354.19873046875 361.13250732421875 -cubic 328.0187072753906 400.4025573730469 313.529052734375 433.0043029785156 308.2979736328125 459.15960693359375 -cubic 302.71185302734375 487.0902099609375 306.9126281738281 512.2947998046875 313.7829284667969 532.9057006835938 -cubic 327.3416442871094 573.5818481445312 350.0 607.5693969726562 350.0 675.0 -line 400.0 675.0 -cubic 400.0 607.5693969726562 422.6583557128906 573.5818481445312 436.2170715332031 532.9057006835938 -cubic 443.0873718261719 512.2947998046875 447.28814697265625 487.0902099609375 441.7020263671875 459.15960693359375 -cubic 436.470947265625 433.0043029785156 421.9812927246094 400.4025573730469 395.80126953125 361.13250732421875 -line 375.0 375.0 -line 361.13250732421875 395.80126953125 -cubic 400.4025573730469 421.9812927246094 433.0043029785156 436.470947265625 459.15960693359375 441.7020263671875 -cubic 487.0902099609375 447.28814697265625 512.2947998046875 443.0873718261719 532.9057006835938 436.2170715332031 -cubic 573.5818481445312 422.6583557128906 607.5693969726562 400.0 675.0 400.0 -line 675.0 350.0 -cubic 607.5693969726562 350.0 573.5818481445312 327.3416442871094 532.9057006835938 313.7829284667969 -cubic 512.2947998046875 306.9126281738281 487.0902099609375 302.71185302734375 459.15960693359375 308.2979736328125 -cubic 433.0043029785156 313.529052734375 400.4025573730469 328.0187072753906 361.13250732421875 354.19873046875 -line 375.0 375.0 -line 395.80126953125 388.86749267578125 -cubic 421.9812927246094 349.5974426269531 436.470947265625 316.9956970214844 441.7020263671875 290.84039306640625 -cubic 447.28814697265625 262.9097900390625 443.0873718261719 237.70518493652344 436.2170715332031 217.09429931640625 -cubic 422.6583557128906 176.4181671142578 400.0 142.43060302734375 400.0 75.0 -line 350.0 75.0 -cubic 350.0 142.43060302734375 327.3416442871094 176.4181671142578 313.7829284667969 217.09429931640625 -cubic 306.9126281738281 237.70518493652344 302.71185302734375 262.9097900390625 308.2979736328125 290.84039306640625 -cubic 313.529052734375 316.9956970214844 328.0187072753906 349.5974426269531 354.19873046875 388.86749267578125 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM1.shape (working copy) @@ -1,24 +0,0 @@ -move 125.0 125.0 -line 475.0 125.0 -line 475.0 75.0 -line 425.0 75.0 -line 425.0 425.0 -line 475.0 425.0 -line 475.0 375.0 -line 125.0 375.0 -line 125.0 425.0 -line 175.0 425.0 -line 175.0 75.0 -line 125.0 75.0 -line 125.0 125.0 -close -move 125.0 25.0 -line 75.0 75.0 -line 75.0 425.0 -line 125.0 475.0 -line 475.0 475.0 -line 525.0 425.0 -line 525.0 75.0 -line 475.0 25.0 -line 125.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3_d100BM5.shape (working copy) @@ -1,28 +0,0 @@ -move 125.0 125.0 -line 475.0 125.0 -line 475.0 75.0 -line 425.0 75.0 -line 425.0 425.0 -line 475.0 425.0 -line 475.0 375.0 -line 125.0 375.0 -line 125.0 425.0 -line 175.0 425.0 -line 175.0 75.0 -line 125.0 75.0 -line 125.0 125.0 -close -move 125.0 25.0 -line 75.0 25.0 -line 75.0 75.0 -line 75.0 425.0 -line 75.0 475.0 -line 125.0 475.0 -line 475.0 475.0 -line 525.0 475.0 -line 525.0 425.0 -line 525.0 75.0 -line 525.0 25.0 -line 475.0 25.0 -line 125.0 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/55_sc1.shape (working copy) @@ -1,3 +0,0 @@ -move 125.0 75.0 -cubic 225.0 75.0 375.0 75.0 575.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d1BB(20,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d1BB(20,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d1BB(20,20).shape (working copy) @@ -1,272 +0,0 @@ -move 203.99142456054688 109.04247283935547 -line 193.70150756835938 126.19232940673828 -line 194.5590057373047 126.70682525634766 -line 204.8489227294922 109.55696868896484 -line 203.99142456054688 109.04247283935547 -close -move 183.41159057617188 143.34219360351562 -line 173.12167358398438 160.49205017089844 -line 173.9791717529297 161.0065460205078 -line 184.2690887451172 143.856689453125 -line 183.41159057617188 143.34219360351562 -close -move 162.83175659179688 177.64190673828125 -line 152.54185485839844 194.79176330566406 -line 153.3993377685547 195.30625915527344 -line 163.6892547607422 178.15640258789062 -line 162.83175659179688 177.64190673828125 -close -move 142.25193786621094 211.94161987304688 -line 131.96202087402344 229.0914764404297 -line 132.8195037841797 229.60597229003906 -line 143.1094207763672 212.45611572265625 -line 142.25193786621094 211.94161987304688 -close -move 121.67210388183594 246.2413330078125 -line 111.38218688964844 263.3912048339844 -line 112.23967742919922 263.90570068359375 -line 122.52959442138672 246.75582885742188 -line 121.67210388183594 246.2413330078125 -close -move 101.09226989746094 280.5410461425781 -line 90.80236053466797 297.69091796875 -line 91.65985107421875 298.2054138183594 -line 101.94976806640625 281.0555419921875 -line 101.09226989746094 280.5410461425781 -close -move 80.51244354248047 314.84075927734375 -line 74.57125091552734 324.7427673339844 -line 75.2236099243164 325.44720458984375 -line 82.7836685180664 321.66717529296875 -line 82.33645629882812 320.77276611328125 -line 74.7763900756836 324.55279541015625 -line 75.0 325.0 -line 75.42874908447266 325.2572326660156 -line 81.36993408203125 315.3552551269531 -line 80.51244354248047 314.84075927734375 -close -move 100.67221069335938 312.722900390625 -line 118.56075286865234 303.77862548828125 -line 118.11354064941406 302.88421630859375 -line 100.2249984741211 311.8284912109375 -line 100.67221069335938 312.722900390625 -close -move 136.4492950439453 294.8343811035156 -line 154.3378448486328 285.8901062011719 -line 153.890625 284.99566650390625 -line 136.00209045410156 293.93994140625 -line 136.4492950439453 294.8343811035156 -close -move 172.22637939453125 276.9458312988281 -line 190.11492919921875 268.0015563964844 -line 189.667724609375 267.10711669921875 -line 171.7791748046875 276.0513916015625 -line 172.22637939453125 276.9458312988281 -close -move 208.00347900390625 259.0572814941406 -line 225.8920135498047 250.11300659179688 -line 225.44480895996094 249.2185821533203 -line 207.55625915527344 258.162841796875 -line 208.00347900390625 259.0572814941406 -close -move 243.7805633544922 241.16873168945312 -line 261.6690979003906 232.22445678710938 -line 261.2218933105469 231.3300323486328 -line 243.33334350585938 240.27430725097656 -line 243.7805633544922 241.16873168945312 -close -move 279.5576477050781 223.2801971435547 -line 297.4461975097656 214.33592224121094 -line 296.9989929199219 213.44149780273438 -line 279.1104431152344 222.38575744628906 -line 279.5576477050781 223.2801971435547 -close -move 315.3347473144531 205.3916473388672 -line 333.2232666015625 196.44737243652344 -line 332.77606201171875 195.55294799804688 -line 314.88751220703125 204.49722290039062 -line 315.3347473144531 205.3916473388672 -close -move 351.11181640625 187.5030975341797 -line 369.0003662109375 178.558837890625 -line 368.55316162109375 177.66439819335938 -line 350.66461181640625 186.60867309570312 -line 351.11181640625 187.5030975341797 -close -move 361.9577941894531 174.5 -line 341.9577941894531 174.5 -line 341.9577941894531 175.5 -line 361.9577941894531 175.5 -line 361.9577941894531 174.5 -close -move 321.9577941894531 174.5 -line 301.9577941894531 174.5 -line 301.9577941894531 175.5 -line 321.9577941894531 175.5 -line 321.9577941894531 174.5 -close -move 281.9577941894531 174.5 -line 261.9577941894531 174.5 -line 261.9577941894531 175.5 -line 281.9577941894531 175.5 -line 281.9577941894531 174.5 -close -move 241.95779418945312 174.5 -line 221.95779418945312 174.5 -line 221.95779418945312 175.5 -line 241.95779418945312 175.5 -line 241.95779418945312 174.5 -close -move 201.95779418945312 174.5 -line 181.95779418945312 174.5 -line 181.95779418945312 175.5 -line 201.95779418945312 175.5 -line 201.95779418945312 174.5 -close -move 161.95779418945312 174.5 -line 141.95779418945312 174.5 -line 141.95779418945312 175.5 -line 161.95779418945312 175.5 -line 161.95779418945312 174.5 -close -move 121.95779418945312 174.5 -line 101.95779418945312 174.5 -line 101.95779418945312 175.5 -line 121.95779418945312 175.5 -line 121.95779418945312 174.5 -close -move 81.95779418945312 174.5 -line 75.0 174.5 -line 74.57125091552734 175.2572479248047 -line 81.28141784667969 186.44085693359375 -line 82.13890838623047 185.92636108398438 -line 75.42874908447266 174.7427520751953 -line 75.0 175.0 -line 75.0 175.5 -line 81.95779418945312 175.5 -line 81.95779418945312 174.5 -close -move 91.57132720947266 203.59071350097656 -line 101.86124420166016 220.74057006835938 -line 102.71873474121094 220.22607421875 -line 92.42882537841797 203.0762176513672 -line 91.57132720947266 203.59071350097656 -close -move 112.15116119384766 237.8904266357422 -line 122.44107818603516 255.040283203125 -line 123.29856872558594 254.52578735351562 -line 113.00865173339844 237.3759307861328 -line 112.15116119384766 237.8904266357422 -close -move 132.73098754882812 272.1901550292969 -line 143.02090454101562 289.3399963378906 -line 143.87840270996094 288.82550048828125 -line 133.58848571777344 271.6756591796875 -line 132.73098754882812 272.1901550292969 -close -move 153.31082153320312 306.4898681640625 -line 163.60073852539062 323.63970947265625 -line 164.45822143554688 323.1252136230469 -line 154.16831970214844 305.9753723144531 -line 153.31082153320312 306.4898681640625 -close -move 173.89065551757812 340.7895812988281 -line 184.18057250976562 357.9394226074219 -line 185.03805541992188 357.4249267578125 -line 174.74813842773438 340.27508544921875 -line 173.89065551757812 340.7895812988281 -close -move 194.47047424316406 375.08929443359375 -line 204.76039123535156 392.2391662597656 -line 205.61788940429688 391.72467041015625 -line 195.32797241210938 374.5747985839844 -line 194.47047424316406 375.08929443359375 -close -move 215.05030822753906 409.3890075683594 -line 224.57125854492188 425.2572326660156 -line 225.35354614257812 425.3535461425781 -line 226.410400390625 424.29669189453125 -line 225.7032928466797 423.589599609375 -line 224.64645385742188 424.6464538574219 -line 225.0 425.0 -line 225.42874145507812 424.7427673339844 -line 215.90780639648438 408.87451171875 -line 215.05030822753906 409.3890075683594 -close -move 240.5525360107422 410.1545715332031 -line 254.69467163085938 396.0124206542969 -line 253.98756408691406 395.3053283691406 -line 239.84542846679688 409.44744873046875 -line 240.5525360107422 410.1545715332031 -close -move 268.8368225097656 381.87030029296875 -line 282.97894287109375 367.7281494140625 -line 282.2718505859375 367.02105712890625 -line 268.12969970703125 381.1631774902344 -line 268.8368225097656 381.87030029296875 -close -move 297.12109375 353.5860290527344 -line 311.2632141113281 339.4438781738281 -line 310.5561218261719 338.7367858886719 -line 296.4139709472656 352.87890625 -line 297.12109375 353.5860290527344 -close -move 325.4053649902344 325.3017578125 -line 339.5474853515625 311.15960693359375 -line 338.84039306640625 310.4525146484375 -line 324.6982421875 324.5946350097656 -line 325.4053649902344 325.3017578125 -close -move 353.68963623046875 297.0174865722656 -line 367.8317565917969 282.8753356933594 -line 367.1246643066406 282.1682434082031 -line 352.9825134277344 296.31036376953125 -line 353.68963623046875 297.0174865722656 -close -move 369.7824401855469 267.2099304199219 -line 357.7824401855469 251.20993041992188 -line 356.9824523925781 251.8099365234375 -line 368.9824523925781 267.8099365234375 -line 369.7824401855469 267.2099304199219 -close -move 345.7824401855469 235.20993041992188 -line 333.7824401855469 219.20993041992188 -line 332.9824523925781 219.8099365234375 -line 344.9824523925781 235.8099365234375 -line 345.7824401855469 235.20993041992188 -close -move 321.7824401855469 203.20993041992188 -line 309.7824401855469 187.20993041992188 -line 308.9824523925781 187.8099365234375 -line 320.9824523925781 203.8099365234375 -line 321.7824401855469 203.20993041992188 -close -move 297.7824401855469 171.20993041992188 -line 285.7824401855469 155.20993041992188 -line 284.9824523925781 155.8099365234375 -line 296.9824523925781 171.8099365234375 -line 297.7824401855469 171.20993041992188 -close -move 273.7824401855469 139.20993041992188 -line 261.7824401855469 123.2099380493164 -line 260.9824523925781 123.8099365234375 -line 272.9824523925781 139.8099365234375 -line 273.7824401855469 139.20993041992188 -close -move 249.78245544433594 107.2099380493164 -line 237.78245544433594 91.2099380493164 -line 236.98245239257812 91.8099365234375 -line 248.98245239257812 107.8099365234375 -line 249.78245544433594 107.2099380493164 -close -move 225.78245544433594 75.2099380493164 -line 225.39999389648438 74.69999694824219 -line 224.57125854492188 74.74275207519531 -line 214.28134155273438 91.89260864257812 -line 215.13882446289062 92.4071044921875 -line 225.42874145507812 75.25724792480469 -line 225.0 75.0 -line 224.60000610351562 75.30000305175781 -line 224.98245239257812 75.8099365234375 -line 225.78245544433594 75.2099380493164 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/57_sc1.shape (working copy) @@ -1,3 +0,0 @@ -move 325.0 75.0 -cubic 75.0 75.0 825.0 75.0 475.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1_d100BB(100,100).shape (working copy) @@ -1,22 +0,0 @@ -move 375.1180725097656 125.0 -quad 386.42266845703125 125.0 397.7272644042969 125.0 -line 397.7272644042969 25.0 -quad 361.3636474609375 25.0 325.0 25.0 -line 320.1247253417969 25.0 -line 320.1247253417969 125.0 -line 325.0 125.0 -quad 361.3636474609375 125.0 397.7272644042969 125.0 -line 397.7272644042969 25.0 -quad 386.42266845703125 25.0 375.1180725097656 25.0 -line 375.1180725097656 125.0 -close -move 220.1247100830078 25.0 -line 175.0 25.0 -line 175.0 125.0 -quad 232.6036834716797 125.0 275.30938720703125 125.0 -line 275.30938720703125 25.0 -quad 232.6036834716797 25.0 175.0 25.0 -line 175.0 125.0 -line 220.1247100830078 125.0 -line 220.1247100830078 25.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50BR(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50BR(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50BR(100,100).shape (working copy) @@ -1,77 +0,0 @@ -move 100.66352844238281 233.6361846923828 -line 53.56267547607422 312.1376037597656 -cubic 47.84400939941406 321.668701171875 49.104801177978516 333.8308410644531 56.65694046020508 341.9862365722656 -cubic 64.2090835571289 350.1416320800781 76.23870086669922 352.3315124511719 86.18034362792969 347.3606872558594 -line 93.74040222167969 343.5806579589844 -line 71.37972259521484 298.8592834472656 -line 63.81966018676758 302.6393127441406 -line 75.0 325.0 -line 96.43732452392578 337.8623962402344 -line 143.53817749023438 259.3609924316406 -line 100.66352844238281 233.6361846923828 -close -move 183.18312072753906 298.8592834472656 -line 272.6258239746094 254.13792419433594 -line 250.26515197753906 209.41656494140625 -line 160.8224334716797 254.13792419433594 -line 183.18312072753906 298.8592834472656 -close -move 362.0685729980469 209.41656494140625 -line 386.1803283691406 197.36068725585938 -cubic 396.55072021484375 192.17550659179688 401.9950866699219 180.54046630859375 399.33123779296875 169.2561798095703 -cubic 396.6673889160156 157.97190856933594 386.5944519042969 150.0 375.0 150.0 -line 301.9577941894531 150.0 -line 301.9577941894531 200.0 -line 375.0 200.0 -line 375.0 175.0 -line 363.8196716308594 152.63931274414062 -line 339.7078857421875 164.69520568847656 -line 362.0685729980469 209.41656494140625 -close -move 201.95779418945312 150.0 -line 101.95779418945312 150.0 -line 101.95779418945312 200.0 -line 201.95779418945312 200.0 -line 201.95779418945312 150.0 -close -move 91.14258575439453 250.49557495117188 -line 142.5921630859375 336.244873046875 -line 185.46681213378906 310.52008056640625 -line 134.01722717285156 224.77078247070312 -line 91.14258575439453 250.49557495117188 -close -move 194.04173278808594 421.9941711425781 -line 203.56268310546875 437.8623962402344 -cubic 207.52346801757812 444.4637145996094 214.30471801757812 448.8720703125 221.94541931152344 449.81268310546875 -cubic 229.58612060546875 450.7532958984375 237.2340850830078 448.1212463378906 242.67767333984375 442.67767333984375 -line 300.3030700683594 385.0522766113281 -line 264.9477233886719 349.6969299316406 -line 207.32232666015625 407.32232666015625 -line 225.0 425.0 -line 246.43731689453125 412.1376037597656 -line 236.9163818359375 396.2693786621094 -line 194.04173278808594 421.9941711425781 -close -move 371.01373291015625 314.3415832519531 -line 392.67767333984375 292.67767333984375 -cubic 401.4749755859375 283.88037109375 402.4647521972656 269.9530029296875 395.0 260.0 -line 353.3824462890625 204.5099334716797 -line 313.3824462890625 234.5099334716797 -line 355.0 290.0 -line 375.0 275.0 -line 357.32232666015625 257.32232666015625 -line 335.6584167480469 278.98626708984375 -line 371.01373291015625 314.3415832519531 -close -move 293.3824462890625 124.50993347167969 -line 245.0 60.0 -cubic 240.0057373046875 53.340972900390625 232.0247802734375 49.604373931884766 223.71205139160156 50.033199310302734 -cubic 215.39932250976562 50.46202087402344 207.84523010253906 55.000022888183594 203.56268310546875 62.13760757446289 -line 152.11309814453125 147.88690185546875 -line 194.9877471923828 173.61167907714844 -line 246.43731689453125 87.86239624023438 -line 225.0 75.0 -line 205.0 90.0 -line 253.3824462890625 154.5099334716797 -line 293.3824462890625 124.50993347167969 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/07_sl3.shape (working copy) @@ -1,5 +0,0 @@ -move 125.0 75.0 -line 475.0 75.0 -line 475.0 425.0 -line 125.0 425.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1_d100BB(50,50).shape (working copy) @@ -1,70 +0,0 @@ -move 274.6908264160156 175.0 -quad 298.9061279296875 175.0 324.7220458984375 175.0 -line 324.7220458984375 75.0 -quad 298.9061279296875 75.0 274.6908264160156 75.0 -line 274.6908264160156 175.0 -close -move 374.75592041015625 175.0 -quad 399.1233215332031 175.0 424.7637634277344 175.0 -line 424.7637634277344 75.0 -quad 399.1233215332031 75.0 374.75592041015625 75.0 -line 374.75592041015625 175.0 -close -move 474.7440490722656 175.0 -quad 499.1998291015625 175.0 524.7115478515625 175.0 -line 524.7115478515625 75.0 -quad 499.1998291015625 75.0 474.7440490722656 75.0 -line 474.7440490722656 175.0 -close -move 574.6904907226562 175.0 -quad 599.2478637695312 175.0 624.7102661132812 175.0 -line 624.7102661132812 75.0 -quad 599.2478637695312 75.0 574.6904907226562 75.0 -line 574.6904907226562 175.0 -close -move 674.8026123046875 175.0 -quad 699.5032958984375 175.0 725.0 175.0 -line 725.0 75.0 -quad 699.5032958984375 75.0 674.8026123046875 75.0 -line 674.8026123046875 175.0 -close -move 675.0 75.0 -line 625.0 75.0 -line 625.0 175.0 -line 675.0 175.0 -line 675.0 75.0 -close -move 575.0 75.0 -line 525.0 75.0 -line 525.0 175.0 -line 575.0 175.0 -line 575.0 75.0 -close -move 475.0 75.0 -line 425.0 75.0 -line 425.0 175.0 -line 475.0 175.0 -line 475.0 75.0 -close -move 375.0 75.0 -line 325.0 75.0 -line 325.0 175.0 -line 375.0 175.0 -line 375.0 75.0 -close -move 275.0 75.0 -line 225.0 75.0 -line 225.0 175.0 -line 275.0 175.0 -line 275.0 75.0 -close -move 175.0 75.0 -line 175.0 75.0 -line 175.0 175.0 -quad 198.8050537109375 175.0 224.73516845703125 175.0 -line 224.73516845703125 75.0 -quad 198.8050537109375 75.0 175.0 75.0 -line 175.0 175.0 -line 175.0 175.0 -line 175.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/04_sc4_d50SR.shape (working copy) @@ -1,84 +0,0 @@ -move 245.80125427246094 211.1324920654297 -cubic 234.86111450195312 194.72227478027344 230.7455291748047 183.9188690185547 229.5345916748047 173.0204620361328 -cubic 228.49053955078125 163.62403869628906 229.3418731689453 160.4315948486328 233.30125427246094 154.4925079345703 -cubic 237.1758575439453 148.68060302734375 240.72752380371094 146.01686096191406 248.9104766845703 142.50987243652344 -cubic 257.3153991699219 138.90777587890625 264.8235168457031 137.5 275.0 137.5 -cubic 285.1764831542969 137.5 292.6846008300781 138.90777587890625 301.0895080566406 142.50987243652344 -cubic 309.2724914550781 146.01686096191406 312.82415771484375 148.68060302734375 316.69873046875 154.4925079345703 -cubic 320.65814208984375 160.4315948486328 321.50946044921875 163.62403869628906 320.46539306640625 173.0204620361328 -cubic 319.2544860839844 183.9188690185547 315.1388854980469 194.72227478027344 304.19873046875 211.1324920654297 -cubic 297.5883483886719 221.04806518554688 298.8957214355469 234.2510223388672 307.3222961425781 242.67764282226562 -cubic 315.7489013671875 251.10427856445312 328.9519348144531 252.41163635253906 338.86749267578125 245.80125427246094 -cubic 355.2777099609375 234.86111450195312 366.0811462402344 230.7455291748047 376.97955322265625 229.5345916748047 -cubic 386.3759460449219 228.49053955078125 389.56842041015625 229.3418731689453 395.50750732421875 233.30125427246094 -cubic 401.31939697265625 237.1758575439453 403.983154296875 240.72752380371094 407.4901123046875 248.9104766845703 -cubic 411.09222412109375 257.3153991699219 412.5 264.8235168457031 412.5 275.0 -cubic 412.5 285.1764831542969 411.09222412109375 292.6846008300781 407.4901123046875 301.0895080566406 -cubic 403.983154296875 309.2724914550781 401.31939697265625 312.82415771484375 395.50750732421875 316.69873046875 -cubic 389.56842041015625 320.65814208984375 386.3759460449219 321.50946044921875 376.97955322265625 320.46539306640625 -cubic 366.0811462402344 319.2544860839844 355.2777099609375 315.1388854980469 338.86749267578125 304.19873046875 -cubic 328.9519348144531 297.5883483886719 315.7489318847656 298.8957214355469 307.32232666015625 307.32232666015625 -cubic 298.8957214355469 315.7489318847656 297.58837890625 328.9519348144531 304.19873046875 338.86749267578125 -cubic 315.1388854980469 355.2777099609375 319.2544860839844 366.0811462402344 320.46539306640625 376.97955322265625 -cubic 321.50946044921875 386.3759460449219 320.65814208984375 389.56842041015625 316.69873046875 395.50750732421875 -cubic 312.82415771484375 401.31939697265625 309.2724914550781 403.983154296875 301.0895080566406 407.4901123046875 -cubic 292.6846008300781 411.09222412109375 285.1764831542969 412.5 275.0 412.5 -cubic 264.8235168457031 412.5 257.3153991699219 411.09222412109375 248.9104766845703 407.4901123046875 -cubic 240.72752380371094 403.983154296875 237.1758575439453 401.31939697265625 233.30125427246094 395.50750732421875 -cubic 229.3418731689453 389.56842041015625 228.49053955078125 386.3759460449219 229.5345916748047 376.97955322265625 -cubic 230.7455291748047 366.0811462402344 234.86111450195312 355.2777099609375 245.80125427246094 338.86749267578125 -cubic 252.41162109375 328.9519348144531 251.10426330566406 315.7489013671875 242.67764282226562 307.3222961425781 -cubic 234.25103759765625 298.8957214355469 221.0480499267578 297.58837890625 211.1324920654297 304.19873046875 -cubic 194.72227478027344 315.1388854980469 183.9188690185547 319.2544860839844 173.0204620361328 320.46539306640625 -cubic 163.62403869628906 321.50946044921875 160.4315948486328 320.65814208984375 154.4925079345703 316.69873046875 -cubic 148.68060302734375 312.82415771484375 146.01686096191406 309.2724914550781 142.50987243652344 301.0895080566406 -cubic 138.90777587890625 292.6846008300781 137.5 285.1764831542969 137.5 275.0 -cubic 137.5 264.8235168457031 138.90777587890625 257.3153991699219 142.50987243652344 248.9104766845703 -cubic 146.01686096191406 240.72752380371094 148.68060302734375 237.1758575439453 154.4925079345703 233.30125427246094 -cubic 160.4315948486328 229.3418731689453 163.62403869628906 228.49053955078125 173.0204620361328 229.5345916748047 -cubic 183.9188690185547 230.7455291748047 194.72227478027344 234.86111450195312 211.1324920654297 245.80125427246094 -cubic 221.0480499267578 252.41163635253906 234.2510528564453 251.10427856445312 242.67767333984375 242.67767333984375 -cubic 251.10427856445312 234.2510528564453 252.41163635253906 221.0480499267578 245.80125427246094 211.1324920654297 -close -move 204.19874572753906 238.8675079345703 -line 225.0 225.0 -line 238.8675079345703 204.19874572753906 -cubic 217.77772521972656 190.13888549804688 195.7686309814453 181.7544708251953 178.5420379638672 179.8404083251953 -cubic 159.81346130371094 177.75946044921875 139.5684051513672 183.1581268310547 126.75749206542969 191.69874572753906 -cubic 113.81938934326172 200.3241424560547 102.42063903808594 215.52247619628906 96.55262756347656 229.2145233154297 -cubic 90.77973175048828 242.68460083007812 87.5 260.1764831542969 87.5 275.0 -cubic 87.5 289.8235168457031 90.77973175048828 307.3153991699219 96.55262756347656 320.7854919433594 -cubic 102.42063903808594 334.4775085449219 113.81938934326172 349.67584228515625 126.75749206542969 358.30126953125 -cubic 139.5684051513672 366.84185791015625 159.81346130371094 372.24053955078125 178.5420379638672 370.15960693359375 -cubic 195.7686309814453 368.2455139160156 217.77772521972656 359.8611145019531 238.8675079345703 345.80126953125 -line 225.0 325.0 -line 204.19874572753906 311.13250732421875 -cubic 190.13888549804688 332.2222900390625 181.7544708251953 354.2313537597656 179.8404083251953 371.45794677734375 -cubic 177.75946044921875 390.1865539550781 183.1581268310547 410.43157958984375 191.69874572753906 423.24249267578125 -cubic 200.3241424560547 436.18060302734375 215.52247619628906 447.579345703125 229.2145233154297 453.4473876953125 -cubic 242.68460083007812 459.22027587890625 260.1764831542969 462.5 275.0 462.5 -cubic 289.8235168457031 462.5 307.3153991699219 459.22027587890625 320.7854919433594 453.4473876953125 -cubic 334.4775085449219 447.579345703125 349.67584228515625 436.18060302734375 358.30126953125 423.24249267578125 -cubic 366.84185791015625 410.43157958984375 372.24053955078125 390.1865539550781 370.15960693359375 371.45794677734375 -cubic 368.2455139160156 354.2313537597656 359.8611145019531 332.2222900390625 345.80126953125 311.13250732421875 -line 325.0 325.0 -line 311.13250732421875 345.80126953125 -cubic 332.2222900390625 359.8611145019531 354.2313537597656 368.2455139160156 371.45794677734375 370.15960693359375 -cubic 390.1865539550781 372.24053955078125 410.43157958984375 366.84185791015625 423.24249267578125 358.30126953125 -cubic 436.18060302734375 349.67584228515625 447.579345703125 334.4775085449219 453.4473876953125 320.7854919433594 -cubic 459.22027587890625 307.3153991699219 462.5 289.8235168457031 462.5 275.0 -cubic 462.5 260.1764831542969 459.22027587890625 242.68460083007812 453.4473876953125 229.2145233154297 -cubic 447.579345703125 215.52247619628906 436.18060302734375 200.3241424560547 423.24249267578125 191.69874572753906 -cubic 410.43157958984375 183.1581268310547 390.1865539550781 177.75946044921875 371.45794677734375 179.8404083251953 -cubic 354.2313537597656 181.7544708251953 332.2222900390625 190.13888549804688 311.13250732421875 204.19874572753906 -line 325.0 225.0 -line 345.80126953125 238.8675079345703 -cubic 359.8611145019531 217.77772521972656 368.2455139160156 195.7686309814453 370.15960693359375 178.5420379638672 -cubic 372.24053955078125 159.81346130371094 366.84185791015625 139.5684051513672 358.30126953125 126.75749206542969 -cubic 349.67584228515625 113.81938934326172 334.4775085449219 102.42063903808594 320.7854919433594 96.55262756347656 -cubic 307.3153991699219 90.77973175048828 289.8235168457031 87.5 275.0 87.5 -cubic 260.1764831542969 87.5 242.68460083007812 90.77973175048828 229.2145233154297 96.55262756347656 -cubic 215.52247619628906 102.42063903808594 200.3241424560547 113.81938934326172 191.69874572753906 126.75749206542969 -cubic 183.1581268310547 139.5684051513672 177.75946044921875 159.81346130371094 179.8404083251953 178.5420379638672 -cubic 181.7544708251953 195.7686309814453 190.13888549804688 217.77772521972656 204.19874572753906 238.8675079345703 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(50,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(50,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/53_sq1_d100BB(50,50).shape (working copy) @@ -1,44 +0,0 @@ -move 225.0 125.0 -quad 252.695068359375 125.0 275.0679626464844 125.0 -line 275.0679626464844 25.0 -quad 252.695068359375 25.0 225.0 25.0 -line 225.0 125.0 -close -move 325.20404052734375 125.0 -quad 347.16082763671875 125.0 369.1176452636719 125.0 -line 369.1176452636719 25.0 -quad 366.1315612792969 25.0 363.1454772949219 25.0 -line 363.1454772949219 125.0 -quad 366.1315612792969 125.0 369.1176452636719 125.0 -line 369.1176452636719 25.0 -quad 347.16082763671875 25.0 325.20404052734375 25.0 -line 325.20404052734375 125.0 -close -move 313.3101806640625 25.0 -quad 292.2145080566406 25.0 263.14447021484375 25.0 -line 263.14447021484375 125.0 -quad 292.2145080566406 125.0 313.3101806640625 125.0 -line 313.3101806640625 25.0 -close -move 213.18505859375 25.0 -quad 189.98452758789062 25.0 163.33209228515625 25.0 -line 163.33209228515625 125.0 -quad 189.98452758789062 125.0 213.18505859375 125.0 -line 213.18505859375 25.0 -close -move 113.04655456542969 25.0 -quad 94.68180847167969 25.0 75.0 25.0 -line 75.0 125.0 -line 86.98224639892578 125.0 -line 86.98224639892578 25.0 -line 75.0 25.0 -line 75.0 125.0 -quad 94.68180847167969 125.0 113.04655456542969 125.0 -line 113.04655456542969 25.0 -close -move 136.9822540283203 125.0 -line 186.9822540283203 125.0 -line 186.9822540283203 25.0 -line 136.9822540283203 25.0 -line 136.9822540283203 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/52_sq1.shape (working copy) @@ -1,3 +0,0 @@ -move 175.0 125.0 -quad 375.0 125.0 725.0 125.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1.shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1.shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/54_sq1.shape (working copy) @@ -1,3 +0,0 @@ -move 175.0 75.0 -quad 525.0 75.0 325.0 75.0 -close Index: modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RM10(100,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RM10(100,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/shapes/06_sl5_d50RM10(100,100).shape (working copy) @@ -1,94 +0,0 @@ -move 100.66352844238281 233.6361846923828 -line 53.56267547607422 312.1376037597656 -line 9.392460823059082 385.7546081542969 -line 86.18034362792969 347.3606872558594 -line 93.74040222167969 343.5806579589844 -cubic 106.0898666381836 337.4059143066406 111.0954818725586 322.38909912109375 104.92074584960938 310.0396423339844 -cubic 98.74601745605469 297.6901550292969 83.72918701171875 292.6845397949219 71.37972259521484 298.8592834472656 -line 63.81966018676758 302.6393127441406 -line 75.0 325.0 -line 96.43732452392578 337.8623962402344 -line 143.53817749023438 259.3609924316406 -cubic 150.6418914794922 247.521484375 146.80276489257812 232.1649627685547 134.9632568359375 225.06126403808594 -cubic 123.12374877929688 217.95755004882812 107.7672348022461 221.7966766357422 100.66352844238281 233.6361846923828 -close -move 183.18312072753906 298.8592834472656 -line 272.6258239746094 254.13792419433594 -cubic 284.97528076171875 247.96319580078125 289.98089599609375 232.94638061523438 283.8061828613281 220.596923828125 -cubic 277.6314392089844 208.24746704101562 262.6146240234375 203.24183654785156 250.26515197753906 209.41656494140625 -line 160.8224334716797 254.13792419433594 -cubic 148.47296142578125 260.3126525878906 143.4673614501953 275.3294982910156 149.64208984375 287.678955078125 -cubic 155.81683349609375 300.0284118652344 170.8336639404297 305.0340270996094 183.18312072753906 298.8592834472656 -close -move 362.0685729980469 209.41656494140625 -line 386.1803283691406 197.36068725585938 -line 480.9018249511719 150.0 -line 375.0 150.0 -line 301.9577941894531 150.0 -cubic 288.1506652832031 150.0 276.9577941894531 161.19287109375 276.9577941894531 175.0 -cubic 276.9577941894531 188.80711364746094 288.1506652832031 200.0 301.9577941894531 200.0 -line 375.0 200.0 -line 375.0 175.0 -line 363.8196716308594 152.63931274414062 -line 339.7078857421875 164.69520568847656 -cubic 327.3584289550781 170.86993408203125 322.3528137207031 185.8867645263672 328.52752685546875 198.23622131347656 -cubic 334.7022705078125 210.585693359375 349.7191162109375 215.59130859375 362.0685729980469 209.41656494140625 -close -move 201.95779418945312 150.0 -line 101.95779418945312 150.0 -cubic 88.15067291259766 150.0 76.95779418945312 161.19287109375 76.95779418945312 175.0 -cubic 76.9577865600586 188.80711364746094 88.15067291259766 200.0 101.95779418945312 200.0 -line 201.95779418945312 200.0 -cubic 215.76490783691406 200.0 226.95779418945312 188.80711364746094 226.95779418945312 175.0 -cubic 226.95779418945312 161.19287109375 215.76490783691406 150.0 201.95779418945312 150.0 -close -move 91.14258575439453 250.49557495117188 -line 142.5921630859375 336.244873046875 -cubic 149.6958770751953 348.0843811035156 165.05238342285156 351.9234924316406 176.8918914794922 344.8197937011719 -cubic 188.73138427734375 337.716064453125 192.5705108642578 322.3595886230469 185.46681213378906 310.52008056640625 -line 134.01722717285156 224.77078247070312 -cubic 126.91352081298828 212.9312744140625 111.55701446533203 209.09214782714844 99.71751403808594 216.19586181640625 -cubic 87.87800598144531 223.299560546875 84.03887939453125 238.65606689453125 91.14258575439453 250.49557495117188 -close -move 194.04173278808594 421.9941711425781 -line 203.56268310546875 437.8623962402344 -line 220.03652954101562 465.3188171386719 -line 242.67767333984375 442.67767333984375 -line 300.3030700683594 385.0522766113281 -cubic 310.0661926269531 375.2891540527344 310.066162109375 359.4600524902344 300.3030700683594 349.6969299316406 -cubic 290.5399475097656 339.9338073730469 274.7108459472656 339.9338073730469 264.9477233886719 349.6969299316406 -line 207.32232666015625 407.32232666015625 -line 225.0 425.0 -line 246.43731689453125 412.1376037597656 -line 236.9163818359375 396.2693786621094 -cubic 229.81268310546875 384.42987060546875 214.4561767578125 380.5907287597656 202.61666870117188 387.6944274902344 -cubic 190.77716064453125 394.7981262207031 186.93801879882812 410.1546630859375 194.04173278808594 421.9941711425781 -close -move 371.01373291015625 314.3415832519531 -line 392.67767333984375 292.67767333984375 -line 408.0094299316406 277.3459167480469 -line 395.0 260.0 -line 353.3824462890625 204.5099334716797 -cubic 345.0981750488281 193.46424865722656 329.4281311035156 191.2256622314453 318.3824462890625 199.50994873046875 -cubic 307.3367614746094 207.79421997070312 305.0981750488281 223.4642333984375 313.3824462890625 234.5099334716797 -line 355.0 290.0 -line 375.0 275.0 -line 357.32232666015625 257.32232666015625 -line 335.6584167480469 278.98626708984375 -cubic 325.89532470703125 288.7493591308594 325.89532470703125 304.5784912109375 335.6584167480469 314.3415832519531 -cubic 345.4215087890625 324.10467529296875 361.2506408691406 324.10467529296875 371.01373291015625 314.3415832519531 -close -move 293.3824462890625 124.50993347167969 -line 245.0 60.0 -line 222.69180297851562 30.255741119384766 -line 203.56268310546875 62.13760757446289 -line 152.11309814453125 147.88690185546875 -cubic 145.0093994140625 159.72640991210938 148.84852600097656 175.08291625976562 160.6880340576172 182.18661499023438 -cubic 172.5275421142578 189.29031372070312 187.88404846191406 185.45118713378906 194.9877471923828 173.61167907714844 -line 246.43731689453125 87.86239624023438 -line 225.0 75.0 -line 205.0 90.0 -line 253.3824462890625 154.5099334716797 -cubic 261.6667175292969 165.55563354492188 277.3367614746094 167.79420471191406 288.3824462890625 159.50994873046875 -cubic 299.42816162109375 151.22567749023438 301.6667175292969 135.5556182861328 293.3824462890625 124.50993347167969 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/RoundRectangle2DTest.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.geom.ShapeTestCase; @@ -26,7 +22,7 @@ public RoundRectangle2DTest(String name) { super(name); - filterImage = createFilter("^(round).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); +// filterImage = createFilter("^(round).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); filterShape = createFilter("^(round).*([.]shape)$", null); } Index: modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/Ellipse2DTest.java (working copy) @@ -14,17 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; public class Ellipse2DTest extends ShapeTestCase { public Ellipse2DTest(String name) { super(name); - filterImage = createFilter("^(ellipse).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); +// filterImage = createFilter("^(ellipse).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); filterShape = createFilter("^(ellipse).*([.]shape)$", null); } Index: modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/GeomTestCase.java (working copy) @@ -14,14 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.SerializeTestCase; import java.awt.Tools; +import java.util.Arrays; public class GeomTestCase extends SerializeTestCase { @@ -142,7 +139,9 @@ fail(concat(msg, "Wrong array length " + a2.length + ", needed at least " + length)); } for(int i = 0; i < length; i++) { - assertEquals(concat(msg, "Element " + i), a1[i], a2[i], delta); + if (a1[i] != a2[i]) { + fail(msg, Arrays.toString(a1), Arrays.toString(a2)); + } } } @@ -158,7 +157,9 @@ fail(concat(msg, "Wrong array length " + a2.length + ", needed at least " + length)); } for(int i = 0; i < length; i++) { - assertEquals(concat(msg, "Element " + i), a1[i], a2[i], delta); + if (a1[i] != a2[i]) { + fail(msg, Arrays.toString(a1), Arrays.toString(a2)); + } } } @@ -174,7 +175,9 @@ fail(concat(msg, "Wrong array length " + a2.length + ", needed at least " + length)); } for(int i = 0; i < length; i++) { - assertEquals(concat(msg, "Element " + i), a1[i], a2[i]); + if (a1[i] != a2[i]) { + fail(msg, Arrays.toString(a1), Arrays.toString(a2)); + } } } Index: modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/QuadCurve2DTest.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.Point; @@ -68,9 +64,8 @@ QuadCurve2D q; public QuadCurve2DTest(String name) { - super(name); - filterImage = createFilter("^(quad).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); -// filterShape = createFilter("^(quad).*([.]shape)$", null); + super(name); +// filterImage = createFilter("^(quad).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); } protected void setUp() throws Exception { Index: modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/Rectangle2DTest.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.Point; @@ -114,8 +110,7 @@ public Rectangle2DTest(String name) { super(name); - filterImage = createFilter("^(rect).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); -// filterShape = createFilter("^(rect).*([.]shape)$", null); +// filterImage = createFilter("^(rect).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); } protected void setUp() throws Exception { Index: modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/GeneralPathTest.java (working copy) @@ -24,7 +24,7 @@ import java.awt.Shape; import java.awt.Tools; -public class GeneralPathTest extends PathIteratorTestCase { +public class GeneralPathTest extends ShapeTestCase { // Test append float[][][][] shapes1 = new float[][][][] { Index: modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/Arc2DTest.java (working copy) @@ -168,9 +168,8 @@ public Arc2DTest(String name) { super(name); - filterImage = createFilter("^(arc).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); +// filterImage = createFilter("^(arc).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); filterShape = createFilter("^(arc).*([.]shape)$", null); -// filterBounds = createFilter("^(arc).*(bounds).*([.]ico)$", null); } protected void setUp() throws Exception { Index: modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/ShapeTestCase.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.io.File; @@ -25,7 +21,8 @@ import java.io.IOException; import java.io.StreamTokenizer; import java.io.StringReader; -import java.lang.reflect.Method; +import java.net.URL; +import java.util.HashMap; import java.util.Random; import java.util.regex.Pattern; import java.awt.Color; @@ -42,9 +39,8 @@ public abstract class ShapeTestCase extends PathIteratorTestCase { - final static String SHAPE_PATH = "java/awt/geom/shapes/"; - final static String OUTPUT_PATH = "java/awt/geom/shapes/output/"; - final boolean OUTPUT = System.getProperty("TEST_OUTPUT") != null; + final static boolean OUTPUT = System.getProperty("OUTPUT") != null; + final static double SHAPE_DELTA = 0.01; final static int RECT_WIDTH = 46; final static int RECT_HEIGHT = 34; @@ -65,748 +61,510 @@ final static Color errorColor = Color.red; final static Color successColor = Color.green; - String shapePath, outputPath; - String tests[]; + final static HashMap arcTypes = new HashMap(); + static { + arcTypes.put("PIE", Arc2D.PIE); + arcTypes.put("CHORD", Arc2D.CHORD); + arcTypes.put("OPEN", Arc2D.OPEN); + } + + static String shapePath = null; + static String outputPath = null; + protected FilenameFilter filterImage, filterShape; - int[] prevRect; - int[] count; - int countGoldenFiles = 0; + abstract static class Runner { - class TextTokenizer { + class TextTokenizer { - StreamTokenizer t; - String buf; + StreamTokenizer t; + String buf; - TextTokenizer(String text) { - t = new StreamTokenizer(new StringReader(text)); - buf = text; - } - - double getDouble() throws IOException { - while (t.nextToken() != StreamTokenizer.TT_EOF) { - if (t.ttype == StreamTokenizer.TT_NUMBER) { - return t.nval; - } + TextTokenizer(String text) { + t = new StreamTokenizer(new StringReader(text)); + buf = text; } - throw new IOException("Double not found"); - } - String getString() throws IOException { - while (t.nextToken() != StreamTokenizer.TT_EOF) { - if (t.ttype == StreamTokenizer.TT_WORD) { - return t.sval; + double getDouble() throws IOException { + while (t.nextToken() != StreamTokenizer.TT_EOF) { + if (t.ttype == StreamTokenizer.TT_NUMBER) { + return t.nval; + } } + throw new IOException("Double not found"); } - throw new IOException("String not found"); - } - boolean findString(String substr) { - int pos = buf.indexOf(substr); - if (pos != -1) { - t = new StreamTokenizer(new StringReader(buf.substring(pos + substr.length()))); - } - return pos != -1; - } - - } - - public ShapeTestCase(String name) { - super(name); - String basePath = System.getProperty("TEST_SRC_DIR"); - assertNotNull(basePath, "Parameter TEST_SRC_DIR not defined"); - if (!basePath.endsWith(File.separator)) { - basePath += File.separator; - } - - shapePath = basePath + SHAPE_PATH; - outputPath = basePath + OUTPUT_PATH; - - if (OUTPUT) { - new File(outputPath).mkdirs(); - } - } - - protected void setUp() throws Exception { - super.setUp(); - countGoldenFiles = 0; - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - - public FilenameFilter createFilter(final String include, final String exclude) { - return new FilenameFilter() { - public boolean accept(File dir, String name) { - return - (include == null || Pattern.matches(include, name)) && - (exclude == null || !Pattern.matches(exclude, name)); - } - }; - } - - BufferedImage createImage(Shape shape, AffineTransform t) { - return Tools.Shape.createImage(shape, t, colorShape, colorInside); - } - - String [] getTestList(String path, FilenameFilter filter) { - File folder = new File(path); - String list[] = folder.list(filter); - if (list != null) { - for(int i = 0; i < list.length; i++) { - list[i] = folder.getAbsolutePath() + File.separator + list[i]; - } - } - assertTrue("Shapes weren't found in " + folder.getAbsolutePath(), list != null && list.length > 0); -// System.out.println("Found " + list.length + " shape(s) " + shapePath); - return list; - } - - double StrToDouble(String value) { - return new Double(value).doubleValue(); - } - - int StrToArcType(String value) { - if (value.equals("PIE")) { - return Arc2D.PIE; - } - if (value.equals("CHORD")) { - return Arc2D.CHORD; - } - if (value.equals("OPEN")) { - return Arc2D.OPEN; - } - fail("Unknown Arc2D type " + value); - return -1; - } - - double getFlatness(String fileName) { - try { - TextTokenizer t = new TextTokenizer(Tools.File.extractFileName(fileName)); - if (t.findString("flat(")) { - return t.getDouble(); - } - } catch(IOException e) { - fail("Cann't read flatness " + fileName); - } - return -1.0; - } -/* - Polygon makePolygon(PathIterator p) { - Polygon pg = new Polygon(); - double[] coords = new double[2]; - while(!p.isDone()) { - switch(p.currentSegment(coords)) { - case PathIterator.SEG_MOVETO: - case PathIterator.SEG_LINETO: - pg.addPoint((int)coords[0], (int)coords[1]); - break; - default: - fail("Wrong segment type"); - } - } - return pg; - } -*/ - Shape createShape(String fileName) { - Shape shape = null; - try { - String fname = Tools.File.extractFileName(fileName); - TextTokenizer t = new TextTokenizer(fname); - - int type = 0; - if (t.findString("rect(")) { - shape = new Rectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("ellipse(")) { - shape = new Ellipse2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("round(")) { - shape = new RoundRectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("arc(")) { - shape = new Arc2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - StrToArcType(t.getString())); - } else - if (t.findString("line(")) { - shape = new Line2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("quad(")) { - shape = new QuadCurve2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("cubic(")) { - shape = new CubicCurve2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("polygon(")) { - shape = new Polygon(); - try { - while(true) { - ((Polygon)shape).addPoint((int)t.getDouble(), (int)t.getDouble()); + String getString() throws IOException { + while (t.nextToken() != StreamTokenizer.TT_EOF) { + if (t.ttype == StreamTokenizer.TT_WORD) { + return t.sval; } - } catch(IOException e) { } - } else { - // GeneralPath - shape = Tools.Shape.load(Tools.File.changeExt(fileName, ".shape")); + throw new IOException("String not found"); } - } catch (IOException e) { - fail("Cann't read shape " + fileName); - } - return shape; - } - - AffineTransform createTransform(String fileName) { - AffineTransform at = null; - try { - String fname = Tools.File.extractFileName(fileName); - TextTokenizer t = new TextTokenizer(fname); - - - if (t.findString("affine(")) { -/* - String ttype = t.getString(); - if (ttype.equals("M")) { - at.setTransform(AffineTransform.getTranslateInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("R")) { - at.setTransform(AffineTransform.getRotateInstance(t.getDouble())); - } else - if (ttype.equals("SC")) { - at.setTransform(AffineTransform.getScaleInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("SH")) { - at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("F")) { - at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); + boolean findString(String substr) { + int pos = buf.indexOf(substr); + if (pos != -1) { + t = new StreamTokenizer(new StringReader(buf.substring(pos + substr.length()))); } -*/ - at = new AffineTransform( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); + return pos != -1; } - } catch (IOException e) { - fail("Cann't read transform " + fileName); } - return at; - } - Rectangle2D createBounds2D(String fileName) { - try { - TextTokenizer t = new TextTokenizer(Tools.File.extractFileName(fileName)); - if (t.findString("bounds(")) { - return new Rectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); + abstract static class Rectangle extends Runner { + + static String outputPrefix = "undefined"; + + static class Contains extends Rectangle { + + static { + outputPrefix = "cr_"; + } + + static boolean[] result = new boolean[] {false, false, true, false}; + + boolean execute(Shape shape, int x, int y, int width, int height, int expected) { + return result[expected] == shape.contains(x, y, width, height); + } + } - } catch(IOException e) { - fail("Cann't read bounds " + fileName); - } - return null; - } - - int[][] createImageBuffer(BufferedImage img) { - int buf[][] = new int[img.getWidth()][img.getHeight()]; - for(int x = 0; x < img.getWidth(); x++) - for(int y = 0; y < img.getHeight(); y++) { - buf[x][y] = img.getRGB(x, y); + + static class Intersects extends Rectangle { + + static { + outputPrefix = "ir_"; + } + + static boolean[] result = new boolean[] {false, false, true, true}; + + boolean execute(Shape shape, int x, int y, int width, int height, int expected) { + return result[expected] == shape.intersects(x, y, width, height); + } + } - return buf; - } + + int[] prevRect; + int[] count; + + abstract boolean execute(Shape shape, int x, int y, int width, int height, int expected); + + public boolean run(String fileName) { + boolean error = false; + try { + Shape shape = createShape(fileName); + BufferedImage img = Tools.BufferedImage.loadIcon(fileName); + int buf[][] = createImageBuffer(img); + Graphics g = img.getGraphics(); + g.setColor(errorColor); - int getColor(int color) { - if (color == cInside || color == cOutside || color == cShape) { - return color; - } - int xored = (color ^ cGrid ^ 0xFF808080); - if (xored == cInside || xored == cOutside || xored == cShape) { - return xored; - } - return color; - } + count = new int[]{0, 0, 0}; + prevRect = null; - void countRect(int[][] buf, int[] r1, int[] r2, int[] count) { - if (r1 != null && (r1[0] > r2[2] || r1[2] < r2[0] || r1[1] > r2[3] || r1[3] < r2[1])) { - count[0] = count[1] = count[2] = 0; - countRect(buf, null, r2, count); - return; - } + for(int x = 0; x < img.getWidth() - RECT_WIDTH; x++) + for(int y = 0; y < img.getHeight() - RECT_HEIGHT; y++) { + int rectType = getRectType(null, buf, x, y, RECT_WIDTH, RECT_HEIGHT, true); + if (rectType == 0) { + // Invalid rectangle + continue; + } + if (!execute(shape, x, y, RECT_WIDTH, RECT_HEIGHT, rectType)) { + g.drawRect(x, y, RECT_WIDTH, RECT_HEIGHT); + error = true; + } + } - int x1, y1, x2, y2; - if (r1 == null) { - x1 = r2[0]; - y1 = r2[1]; - x2 = r2[2]; - y2 = r2[3]; - } else { - x1 = Math.min(r1[0], r2[0]); - y1 = Math.min(r1[1], r2[1]); - x2 = Math.max(r1[2], r2[2]); - y2 = Math.max(r1[3], r2[3]); - } - for(int x = x1; x <= x2; x++) - for(int y = y1; y <= y2; y++) { - boolean inside1 = r1 != null && r1[0] <= x && x <= r1[2] && r1[1] <= y && y <= r1[3]; - boolean inside2 = r2 != null && r2[0] <= x && x <= r2[2] && r2[1] <= y && y <= r2[3]; + int errCount = 0; + Random rnd = new Random(); + for(int i = 0; i < 1000; i ++) { + int rx = (int)(rnd.nextDouble() * (img.getWidth() - RECT_WIDTH)); + int ry = (int)(rnd.nextDouble() * (img.getHeight() - RECT_HEIGHT)); + int rw = (int)(rnd.nextDouble() * (img.getWidth() - rx - 1)) + 1; + int rh = (int)(rnd.nextDouble() * (img.getHeight() - ry - 1)) + 1; - if (inside1 ^ inside2) { - int index = 3; - int color = getColor(buf[x][y]); - if (color == colorOutside.getRGB()) { - index = 0; - } else - if (color == colorInside.getRGB()) { - index = 1; - } else - if (color == colorShape.getRGB()) { - index = 2; + int rectType = getRectType(img, buf, rx, ry, rw, rh, false); + if (rectType == 0) { + // Invalid rectangle + continue; + } + if (!execute(shape, rx, ry, rw, rh, rectType)) { + g.drawRect(rx, ry, rw, rh); + error = true; + errCount++; + } + if (errCount > ERROR_MAX_COUNT) { + break; + } } - if (inside1) { - count[index]--; - } else { - count[index]++; + + if (OUTPUT) { + Tools.BufferedImage.saveIcon(img, outputPath + outputPrefix + Tools.File.extractFileName(fileName)); } + } catch(Exception e) { + e.printStackTrace(); + fail(e.toString()); } + return !error; } - } + + int getRectType(BufferedImage img, int buf[][], int rx, int ry, int rw, int rh, boolean usePrev) { - int getRectType(BufferedImage img, int buf[][], int rx, int ry, int rw, int rh, boolean usePrev) { + if ((rx + ry) % 2 == 0) { + return 0; + } - if ((rx + ry) % 2 == 0) { - return 0; - } + if (!usePrev) { + prevRect = null; + count = new int[3]; + } - if (!usePrev) { - prevRect = null; - count = new int[3]; - } + int[] newRect = new int[]{rx, ry, rx + rw, ry + rh}; + countRect(buf, prevRect, newRect, count); + prevRect = newRect; - int[] newRect = new int[]{rx, ry, rx + rw, ry + rh}; - countRect(buf, prevRect, newRect, count); - prevRect = newRect; + if (count[0] > POINT_MIN_COUNT && count[1] == 0 && count[2] == 0) { + return 1; // Outside + } + if (count[1] > POINT_MIN_COUNT && count[0] == 0 && count[2] == 0) { + return 2; // Inside + } + if (count[0] > POINT_MIN_COUNT && count[1] > POINT_MIN_COUNT) { + return 3; // Both + } + return 0; // Invalid rectangle + } + + void countRect(int[][] buf, int[] r1, int[] r2, int[] count) { + if (r1 != null && (r1[0] > r2[2] || r1[2] < r2[0] || r1[1] > r2[3] || r1[3] < r2[1])) { + count[0] = count[1] = count[2] = 0; + countRect(buf, null, r2, count); + return; + } - if (count[0] > POINT_MIN_COUNT && count[1] == 0 && count[2] == 0) { - return 1; // Outside - } - if (count[1] > POINT_MIN_COUNT && count[0] == 0 && count[2] == 0) { - return 2; // Inside - } - if (count[0] > POINT_MIN_COUNT && count[1] > POINT_MIN_COUNT) { - return 3; // Both - } - return 0; // Invalid rectangle - } + int x1, y1, x2, y2; + if (r1 == null) { + x1 = r2[0]; + y1 = r2[1]; + x2 = r2[2]; + y2 = r2[3]; + } else { + x1 = Math.min(r1[0], r2[0]); + y1 = Math.min(r1[1], r2[1]); + x2 = Math.max(r1[2], r2[2]); + y2 = Math.max(r1[3], r2[3]); + } + for(int x = x1; x <= x2; x++) + for(int y = y1; y <= y2; y++) { + boolean inside1 = r1 != null && r1[0] <= x && x <= r1[2] && r1[1] <= y && y <= r1[3]; + boolean inside2 = r2 != null && r2[0] <= x && x <= r2[2] && r2[1] <= y && y <= r2[3]; - int getRectType_(BufferedImage img, int buf[][], int rx, int ry, int rw, int rh) { - - if ((rx + ry) % 2 == 0) { - return 0; + if (inside1 ^ inside2) { + int index = 3; + int color = getColor(buf[x][y]); + if (color == colorOutside.getRGB()) { + index = 0; + } else + if (color == colorInside.getRGB()) { + index = 1; + } else + if (color == colorShape.getRGB()) { + index = 2; + } + if (inside1) { + count[index]--; + } else { + count[index]++; + } + } + } + } + } + + static class Point extends Runner { - int countOutside = 0; - int countInside = 0; - int countShape = 0; - - for(int x = rx; x <= rx + rw; x++) { - for(int y = ry; y <= ry + rh; y++) { - if (x == rx || x == rx + rw || - y == ry || y == ry + rh || - (x + y) % CHECK_STEP == 0 || (x - y) % CHECK_STEP == 0) - { - if (img != null) { -// img.setRGB(x, y, Color.blue.getRGB()); + public boolean run(String fileName) { + boolean error = false; + Shape shape = createShape(fileName); + BufferedImage img = Tools.BufferedImage.loadIcon(fileName); + for(int x = 0; x < img.getWidth(); x++) + for(int y = 0; y < img.getHeight(); y++) { + int color = getColor(img.getRGB(x, y)); + boolean res = shape.contains(x, y); + if ((color == colorInside.getRGB() && !res) || + (color == colorOutside.getRGB() && res)) + { + img.setRGB(x, y, errorColor.getRGB()); + error = true; + } } - int color = getColor(buf[x][y]); - if (color == colorOutside.getRGB()) { - countOutside++; - } else - if (color == colorInside.getRGB()) { - countInside++; - } else - if (color == colorShape.getRGB()) { - countShape++; - } + if (OUTPUT) { + Tools.BufferedImage.saveIcon(img, outputPath + "cp_" + Tools.File.extractFileName(fileName)); } + return !error; } + } + + static class PathIterator extends Runner { - if (countInside == 0 && countOutside > POINT_MIN_COUNT && countShape == 0) { - return 1; // Outside - } - if (countOutside == 0 && countInside > POINT_MIN_COUNT && countShape == 0) { - return 2; // Inside - } - if (countInside > POINT_MIN_COUNT && countOutside > POINT_MIN_COUNT) { - return 3; // Both - } - return 0; // Invalid rectangle - } - - void checkRunner(String name, FilenameFilter filter, String methodName, Object[] params) { - if (filter == null) { - return; // skip test - } - tests = getTestList(shapePath, filter); - int countErr = 0; - try { - Method method = this.getClass().getMethod(methodName, new Class[] {String.class, Object[].class}); - for(int i = 0; i < tests.length; i++) { - Object res = method.invoke(this, new Object[] {tests[i], params}); - if (!((Boolean)res).booleanValue()) { - if (countErr == 0) { - System.out.println(name); + public boolean run(String fileName) { + double flatness = getFlatness(fileName); + AffineTransform at = createTransform(fileName); + Shape shape1 = createShape(fileName); + Shape shape2 = Tools.Shape.load(fileName); + GeneralPath path = new GeneralPath(); + path.append(flatness < 0.0 ? shape1.getPathIterator(at) : shape1.getPathIterator(at, flatness), false); + if (OUTPUT) { + Tools.Shape.save(path, outputPath + (at == null ? "pi_" : "pia_") + Tools.File.extractFileName(fileName)); + } + return Tools.PathIterator.equals( + path.getPathIterator(null), + shape2.getPathIterator(null), + SHAPE_DELTA); + } + + double getFlatness(String fileName) { + try { + TextTokenizer t = new TextTokenizer(Tools.File.extractFileName(fileName)); + if (t.findString("flat(")) { + return t.getDouble(); } - countErr++; - System.out.println("Failed " + tests[i]); - } else { - System.out.println(" " + tests[i]); + } catch(IOException e) { + fail("Can't read flatness " + fileName); } + return -1.0; } - } catch(Exception e) { - e.printStackTrace(); - fail(e.toString()); - } - if (countErr == 0 && countGoldenFiles != 0) { - System.out.println("Checked " + countGoldenFiles + " golden file(s) " + name); - } - assertTrue("Failed " + countErr + "/" + tests.length + " test(s)", countErr == 0); - } + + AffineTransform createTransform(String fileName) { + AffineTransform at = null; + try { + String fname = Tools.File.extractFileName(fileName); + TextTokenizer t = new TextTokenizer(fname); - public boolean checkRect1(String fileName, Object[] params) { - countGoldenFiles++; - boolean error = false; - try { - String methodName = (String)params[0]; - String prefix = (String)params[1]; - boolean[] expected = (boolean[])params[2]; - Method method = Shape.class.getMethod(methodName, new Class[]{double.class, double.class, double.class, double.class}); - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - int buf[][] = createImageBuffer(img); - Graphics g = img.getGraphics(); - g.setColor(errorColor); - - count = new int[]{0, 0, 0}; - prevRect = null; - - for(int x = 0; x < img.getWidth() - RECT_WIDTH; x++) - for(int y = 0; y < img.getHeight() - RECT_HEIGHT; y++) { - int rectType = getRectType(null, buf, x, y, RECT_WIDTH, RECT_HEIGHT, true); - if (rectType == 0) { - // Invalid rectangle - continue; + if (t.findString("affine(")) { + /* + String ttype = t.getString(); + if (ttype.equals("M")) { + at.setTransform(AffineTransform.getTranslateInstance(t.getDouble(), t.getDouble())); + } else + if (ttype.equals("R")) { + at.setTransform(AffineTransform.getRotateInstance(t.getDouble())); + } else + if (ttype.equals("SC")) { + at.setTransform(AffineTransform.getScaleInstance(t.getDouble(), t.getDouble())); + } else + if (ttype.equals("SH")) { + at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); + } else + if (ttype.equals("F")) { + at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); + } + */ + at = new AffineTransform( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); } - Object res = method.invoke(shape, new Object[]{ - new Double(x), - new Double(y), - new Double(RECT_WIDTH), - new Double(RECT_HEIGHT)}); - if (expected[rectType] != ((Boolean)res).booleanValue()) { - g.drawRect(x, y, RECT_WIDTH, RECT_HEIGHT); - error = true; - } - } - int errCount = 0; - Random rnd = new Random(); - for(int i = 0; i < 1000; i ++) { - int rx = (int)(rnd.nextDouble() * (img.getWidth() - RECT_WIDTH)); - int ry = (int)(rnd.nextDouble() * (img.getHeight() - RECT_HEIGHT)); - int rw = (int)(rnd.nextDouble() * (img.getWidth() - rx - 1)) + 1; - int rh = (int)(rnd.nextDouble() * (img.getHeight() - ry - 1)) + 1; - - int rectType = getRectType(img, buf, rx, ry, rw, rh, false); - if (rectType == 0) { - // Invalid rectangle - continue; + } catch (IOException e) { + fail("Can't read transform " + fileName); } + return at; + } - Object res = method.invoke(shape, new Object[]{ - new Double(rx), - new Double(ry), - new Double(rw), - new Double(rh)}); - - if (expected[rectType] != ((Boolean)res).booleanValue()) { - g.drawRect(rx, ry, rw, rh); - error = true; - errCount++; + } + + abstract boolean run(String fileName); + + Shape createShape(String fileName) { + Shape shape = null; + try { + String fname = Tools.File.extractFileName(fileName); + TextTokenizer t = new TextTokenizer(fname); + if (t.findString("rect(")) { + shape = new Rectangle2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("ellipse(")) { + shape = new Ellipse2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("round(")) { + shape = new RoundRectangle2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("arc(")) { + shape = new Arc2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + arcTypes.get(t.getString())); + } else + if (t.findString("line(")) { + shape = new Line2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("quad(")) { + shape = new QuadCurve2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("cubic(")) { + shape = new CubicCurve2D.Double( + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble(), + t.getDouble()); + } else + if (t.findString("polygon(")) { + shape = new Polygon(); + try { + while(true) { + ((Polygon)shape).addPoint((int)t.getDouble(), (int)t.getDouble()); + } + } catch(IOException e) { + } + } else { + // GeneralPath + shape = Tools.Shape.load(Tools.File.changeExt(fileName, ".shape")); } - if (errCount > ERROR_MAX_COUNT) { - break; - } - } - if (OUTPUT) { - Tools.BufferedImage.saveIcon(img, outputPath + prefix + Tools.File.extractFileName(fileName)); + } catch (IOException e) { + fail("Can't read shape " + fileName); } - } catch(Exception e) { - e.printStackTrace(); - fail(e.toString()); + return shape; } - return !error; - } - public boolean checkRect2(String fileName, Object[] params) { - boolean error = false; - try { - String methodName = (String)params[0]; - String prefix = (String)params[1]; - - Method method1 = Shape.class.getMethod(methodName, new Class[]{double.class, double.class, double.class, double.class}); - Method method2 = Shape.class.getMethod(methodName, new Class[]{Rectangle2D.class}); - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - int buf[][] = createImageBuffer(img); - Graphics g = img.getGraphics(); - g.setColor(errorColor); - - Random rnd = new Random(); - for(int i = 0; i < 100; i ++) { - int rx = (int)(rnd.nextDouble() * (img.getWidth() - RECT_WIDTH)); - int ry = (int)(rnd.nextDouble() * (img.getHeight() - RECT_HEIGHT)); - int rw = (int)(rnd.nextDouble() * (img.getWidth() - rx - 1)) + 1; - int rh = (int)(rnd.nextDouble() * (img.getHeight() - ry - 1)) + 1; - - Object res1 = method1.invoke(shape, new Object[]{ - new Double(rx), - new Double(ry), - new Double(rw), - new Double(rh)}); - - Object res2 = method2.invoke(shape, new Object[]{new Rectangle2D.Double(rx, ry, rw, rh)}); - - if (!res1.equals(res2)) { - g.drawRect(rx, ry, rw, rh); - error = true; + int[][] createImageBuffer(BufferedImage img) { + int buf[][] = new int[img.getWidth()][img.getHeight()]; + for(int x = 0; x < img.getWidth(); x++) + for(int y = 0; y < img.getHeight(); y++) { + buf[x][y] = img.getRGB(x, y); } - } + return buf; + } - if (OUTPUT) { - Tools.BufferedImage.saveIcon(img, outputPath + prefix + Tools.File.extractFileName(fileName)); + static int getColor(int color) { + if (color == cInside || color == cOutside || color == cShape) { + return color; } - } catch(Exception e) { - e.printStackTrace(); - fail(e.toString()); + int xored = (color ^ cGrid ^ 0xFF808080); + if (xored == cInside || xored == cOutside || xored == cShape) { + return xored; + } + return color; } - return !error; + } + + public ShapeTestCase(String name) { + super(name); + String classPath = "shapes/" + Tools.getClasstPath(this.getClass()); + URL url = ClassLoader.getSystemClassLoader().getResource(classPath); + assertNotNull("Path not found " + classPath, url); + shapePath = url.getPath(); + outputPath = shapePath + "output/"; + } - public boolean checkContainsPoint1(String fileName, Object[] params) { - countGoldenFiles++; - boolean error = false; - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - for(int x = 0; x < img.getWidth(); x++) - for(int y = 0; y < img.getHeight(); y++) { - int color = getColor(img.getRGB(x, y)); - boolean res = shape.contains(x, y); - if ((color == colorInside.getRGB() && !res) || - (color == colorOutside.getRGB() && res)) - { - img.setRGB(x, y, errorColor.getRGB()); - error = true; - } - } + void print(String text) { if (OUTPUT) { - Tools.BufferedImage.saveIcon(img, outputPath + "cp_" + Tools.File.extractFileName(fileName)); + System.out.println(text); } - return !error; } + + public FilenameFilter createFilter(final String include, final String exclude) { + return new FilenameFilter() { + public boolean accept(File dir, String name) { + return + (include == null || Pattern.matches(include, name)) && + (exclude == null || !Pattern.matches(exclude, name)); + } + }; + } - public boolean checkContainsPoint2(String fileName, Object[] params) { - boolean error = false; - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - Random rnd = new Random(); - for(int i = 0; i < 100; i++) { - int x = (int)(rnd.nextDouble() * img.getWidth()); - int y = (int)(rnd.nextDouble() * img.getHeight()); - if (shape.contains(x, y) != shape.contains(new Point2D.Double(x, y))) { - img.setRGB(x, y, errorColor.getRGB()); - error = true; - } + String [] getTestList(String path, FilenameFilter filter) { + File folder = new File(path); + String list[] = folder.list(filter); + if (list != null) { + for(int i = 0; i < list.length; i++) { + list[i] = folder.getAbsolutePath() + File.separator + list[i]; + } + } + return list; + } + + void interator(String name, FilenameFilter filter, Runner runner) { + if (filter == null) { + return; // skip test } if (OUTPUT) { - Tools.BufferedImage.saveIcon(img, outputPath + "cp2_" + Tools.File.extractFileName(fileName)); + new File(outputPath).mkdirs(); } - return !error; + String tests[] = getTestList(shapePath, filter); + assertTrue("Shapes not found " + shapePath, tests != null && tests.length > 0); + for(int i = 0; i < tests.length; i++) { + boolean result = runner.run(tests[i]); + assertTrue(tests[i] + " " + Tools.PathIterator.equalsError, result); + } } - public boolean checkPathIterator(String fileName, Object[] params) { - countGoldenFiles++; - boolean error = false; - double flatness = getFlatness(fileName); - AffineTransform at = createTransform(fileName); - Shape shape1 = createShape(fileName); - Shape shape2 = Tools.Shape.load(fileName); - String name = at == null ? "pi_" : "pia_"; - GeneralPath path = new GeneralPath(); - path.append(flatness < 0.0 ? shape1.getPathIterator(at) : shape1.getPathIterator(at, flatness), false); - if (OUTPUT) { - Tools.Shape.save(path, outputPath + name + Tools.File.extractFileName(fileName)); - } - return Tools.PathIterator.equals( - path.getPathIterator(null), - shape2.getPathIterator(null), - SHAPE_DELTA); + public void testGetPathIterator() { + interator( + "getPathIterator()", + filterShape, + new Runner.PathIterator()); } - public void _testContainsPoint1() { - checkRunner( + public void testContainsPoint() { + interator( "contains(double,double)", filterImage, - "checkContainsPoint1", - null); + new Runner.Point()); } - public void _testContainsPoint2() { - checkRunner( - "contains(Point2D)", - filterImage, - "checkContainsPoint2", - null); - } - - public void _testContainsRect1() { - checkRunner( + public void testContainsRect() { + interator( "contains(double,double,double,double)", filterImage, - "checkRect1", - new Object[]{"contains", "cr_", new boolean[] {false, false, true, false}}); + new Runner.Rectangle.Contains()); } - public void _testContainsRect2() { - checkRunner( - "contains(Rectangle2D)", - filterImage, - "checkRect2", - new Object[]{"contains", "cr2_"}); - } - - public void _testIntersectsRect1() { - checkRunner( + public void testIntersectsRect() { + interator( "intersects(double,double,double,double)", filterImage, - "checkRect1", - new Object[]{"intersects", "ir_", new boolean[] {false, false, true, true}}); + new Runner.Rectangle.Intersects()); } - public void _testIntersectsRect2() { - checkRunner( - "contains(Rectangle2D)", - filterImage, - "checkRect2", - new Object[]{"intersects", "ir2_"}); - } - - public void testGetPathIterator() { - checkRunner( - "getPathIterator()", - filterShape, - "checkPathIterator", - null); - } - - - /* - public boolean checkBounds(String fileName) { - boolean error = false; - Shape shape = createShape(fileName); - Rectangle2D expectBounds = createBounds2D(fileName); - Rectangle2D actualBounds = bounds2D ? shape.getBounds2D() : shape.getBounds(); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - Graphics g = img.getGraphics(); - g.setColor(Color.red); - ((Graphics2D)g).draw(actualBounds); - String name = bounds2D ? "bounds2D_" : "bounds_"; - if (OUTPUT) { - Tools.BufferedImage.saveIcon(img, outputPath + name + Tools.File.extractFileName(fileName)); - } - return !equalRects(expectBounds, actualBounds, SHAPE_DELTA); - } - - - public void testGetBounds2D() { - System.out.println("testdsfsd"); - if (filterBounds == null) { - return; // skip test - } - tests = getTestList(shapePath, filterBounds); - System.out.println("test"); - int countErr = 0; - for(int i = 0; i < tests.length; i++) { - if (checkBounds(tests[i], true)) { - countErr++; - System.out.println("Failed " + tests[i]); - } - } - assertTrue("Failed " + countErr + " test(s)", countErr == 0); - } -*/ -/* - public void testGetBounds() { - if (filterBounds == null) { - return; // skip test - } - tests = getTestList(shapePath, filterBounds); - int countErr = 0; - for(int i = 0; i < tests.length; i++) { - if (checkBounds(tests[i], false)) { - countErr++; - System.out.println("Failed " + tests[i]); - } - } - assertTrue("Failed " + countErr + " test(s)", countErr == 0); - } -*/ -} - +} \ No newline at end of file Index: modules/awt/src/test/api/java/common/java/awt/geom/serialization/java.awt.geom.AffineTransform[[1.0, 3.0, 5.0], [2.0, 4.0, 6.0]] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/geom/serialization/java.awt.geom.AffineTransform[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]] =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: modules/awt/src/test/api/java/common/java/awt/geom/ShapeTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/ShapeTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/ShapeTest.java (working copy) @@ -1,785 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ -package java.awt.geom; - -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.StreamTokenizer; -import java.io.StringReader; -import java.lang.reflect.Method; -import java.util.Random; -import java.util.regex.Pattern; -import java.awt.Color; -import java.awt.Graphics; -import java.awt.Shape; -import java.awt.geom.Arc2D; -import java.awt.geom.Ellipse2D; -import java.awt.geom.Rectangle2D; -import java.awt.geom.RoundRectangle2D; -import java.awt.image.BufferedImage; - -import java.awt.Tools; - -public abstract class ShapeTest extends GeomTestCase { - - final static String SHAPE_PATH = "java/awt/geom/shapes/"; - final static String OUTPUT_PATH = "java/awt/geom/output/"; - final static double SHAPE_DELTA = 0.01; - final static int RECT_WIDTH = 46; - final static int RECT_HEIGHT = 34; - final static int POINT_MIN_COUNT = 10; - final static int ERROR_MAX_COUNT = 5; - final static int CHECK_STEP = 8; - - final static Color colorInside = Color.lightGray; - final static Color colorOutside = Color.white; - final static Color colorShape = Color.gray; - final static Color colorGrid = new Color(0xA0, 0xA0, 0xA0); - - final static int cInside = colorInside.getRGB(); - final static int cOutside = colorOutside.getRGB(); - final static int cShape = colorShape.getRGB(); - final static int cGrid = colorGrid.getRGB(); - - final static Color errorColor = Color.red; - final static Color successColor = Color.green; - - String shapePath, outputPath; - String tests[]; - protected FilenameFilter filterImage, filterShape, filterBounds; - - int[] prevRect; - int[] count; - - String[] testNames = new String[] { - "Unknown", - "cr", - "cr2", - "ir", - "ir2", - "cp", - "cp2" - }; - - class TextTokenizer { - - StreamTokenizer t; - String buf; - - TextTokenizer(String text) { - t = new StreamTokenizer(new StringReader(text)); - buf = text; - } - - double getDouble() throws IOException { - while (t.nextToken() != StreamTokenizer.TT_EOF) { - if (t.ttype == StreamTokenizer.TT_NUMBER) { - return t.nval; - } - } - throw new IOException("Double not found"); - } - - String getString() throws IOException { - while (t.nextToken() != StreamTokenizer.TT_EOF) { - if (t.ttype == StreamTokenizer.TT_WORD) { - return t.sval; - } - } - throw new IOException("String not found"); - } - - boolean findString(String substr) { - int pos = buf.indexOf(substr); - if (pos != -1) { - t = new StreamTokenizer(new StringReader(buf.substring(pos + substr.length()))); - } - return pos != -1; - } - - } - - public ShapeTest(String name) { - super(name); - String basePath = System.getProperty("TEST_CLASSES_DIR"); - if (basePath == null) { - basePath = "."; - } else { - if (!basePath.endsWith(File.separator)) { - basePath += File.separator; - } - } - - shapePath = basePath + SHAPE_PATH; - outputPath = basePath + OUTPUT_PATH; - - new File(outputPath).mkdirs(); - } - - protected void setUp() throws Exception { - super.setUp(); - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - - FilenameFilter createFilter(final String include, final String exclude) { - return new FilenameFilter() { - public boolean accept(File dir, String name) { - return - (include == null || Pattern.matches(include, name)) && - (exclude == null || !Pattern.matches(exclude, name)); - } - }; - } - - BufferedImage createImage(Shape shape, AffineTransform t) { - return Tools.Shape.createImage(shape, t, colorShape, colorInside); - } - - String getShapeDesc(RectangularShape shape) { - String desc = - doubleToStr(shape.getX()) + "," + - doubleToStr(shape.getY()) + "," + - doubleToStr(shape.getWidth()) + "," + - doubleToStr(shape.getHeight()); - - if (shape instanceof Arc2D) { - Arc2D arc = (Arc2D)shape; - desc = "arc(" + desc; - switch(arc.getArcType()) { - case Arc2D.CHORD: - desc += ",CORD)"; - case Arc2D.OPEN: - desc += ",OPEN)"; - case Arc2D.PIE: - desc += ",PIE)"; - } - } else - if (shape instanceof Rectangle2D) { - desc = "rect(" + desc + ")"; - } else - if (shape instanceof Ellipse2D) { - desc = "ellipse(" + desc + ")"; - } else - if (shape instanceof RoundRectangle2D) { - RoundRectangle2D rr = (RoundRectangle2D)shape; - desc = "rrect(" + desc + "," + - doubleToStr(rr.getArcWidth()) + "," + - doubleToStr(rr.getArcHeight()) + ")"; - } - return desc; - } - - String [] getTestList(String path, FilenameFilter filter) { - File folder = new File(path); - String list[] = folder.list(filter); - if (list != null) { - for(int i = 0; i < list.length; i++) { - list[i] = folder.getAbsolutePath() + File.separator + list[i]; - } - } - assertTrue("Shapes weren't found in " + folder.getAbsolutePath(), list != null && list.length > 0); -// System.out.println("Found " + list.length + " shape(s) " + shapePath); - return list; - } - - double StrToDouble(String value) { - return new Double(value).doubleValue(); - } - - int StrToArcType(String value) { - if (value.equals("PIE")) { - return Arc2D.PIE; - } - if (value.equals("CHORD")) { - return Arc2D.CHORD; - } - if (value.equals("OPEN")) { - return Arc2D.OPEN; - } - fail("Unknown Arc2D type " + value); - return -1; - } - - double getFlatness(String fileName) { - try { - TextTokenizer t = new TextTokenizer(Tools.File.extractFileName(fileName)); - if (t.findString("flat(")) { - return t.getDouble(); - } - } catch(IOException e) { - fail("Cann't read flatness " + fileName); - } - return -1.0; - } - - Shape createShape(String fileName) { - Shape shape = null; - try { - String fname = Tools.File.extractFileName(fileName); - TextTokenizer t = new TextTokenizer(fname); - - int type = 0; - if (t.findString("rect(")) { - shape = new Rectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("ellipse(")) { - shape = new Ellipse2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("round(")) { - shape = new RoundRectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else - if (t.findString("arc(")) { - shape = new Arc2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - StrToArcType(t.getString())); - } else - if (t.findString("line(")) { - shape = new Line2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } else { - // GeneralPath - shape = Tools.Shape.load(Tools.File.changeExt(fileName, ".shape")); - } - - } catch (IOException e) { - fail("Cann't read shape " + fileName); - } - return shape; - } - - AffineTransform createTransform(String fileName) { - AffineTransform at = null; - try { - String fname = Tools.File.extractFileName(fileName); - TextTokenizer t = new TextTokenizer(fname); - - - if (t.findString("affine(")) { -/* - String ttype = t.getString(); - if (ttype.equals("M")) { - at.setTransform(AffineTransform.getTranslateInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("R")) { - at.setTransform(AffineTransform.getRotateInstance(t.getDouble())); - } else - if (ttype.equals("SC")) { - at.setTransform(AffineTransform.getScaleInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("SH")) { - at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); - } else - if (ttype.equals("F")) { - at.setTransform(AffineTransform.getShearInstance(t.getDouble(), t.getDouble())); - } -*/ - at = new AffineTransform( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } - - } catch (IOException e) { - fail("Cann't read transform " + fileName); - } - return at; - } - - Rectangle2D createBounds2D(String fileName) { - try { - TextTokenizer t = new TextTokenizer(Tools.File.extractFileName(fileName)); - if (t.findString("bounds(")) { - return new Rectangle2D.Double( - t.getDouble(), - t.getDouble(), - t.getDouble(), - t.getDouble()); - } - } catch(IOException e) { - fail("Cann't read bounds " + fileName); - } - return null; - } - - int[][] createImageBuffer(BufferedImage img) { - int buf[][] = new int[img.getWidth()][img.getHeight()]; - for(int x = 0; x < img.getWidth(); x++) - for(int y = 0; y < img.getHeight(); y++) { - buf[x][y] = img.getRGB(x, y); - } - return buf; - } - - int getColor(int color) { - if (color == cInside || color == cOutside || color == cShape) { - return color; - } - int xored = (color ^ cGrid ^ 0xFF808080); - if (xored == cInside || xored == cOutside || xored == cShape) { - return xored; - } - return color; - } - - void countRect(int[][] buf, int[] r1, int[] r2, int[] count) { - if (r1 != null && (r1[0] > r2[2] || r1[2] < r2[0] || r1[1] > r2[3] || r1[3] < r2[1])) { - count[0] = count[1] = count[2] = 0; - countRect(buf, null, r2, count); - return; - } - - int x1, y1, x2, y2; - if (r1 == null) { - x1 = r2[0]; - y1 = r2[1]; - x2 = r2[2]; - y2 = r2[3]; - } else { - x1 = Math.min(r1[0], r2[0]); - y1 = Math.min(r1[1], r2[1]); - x2 = Math.max(r1[2], r2[2]); - y2 = Math.max(r1[3], r2[3]); - } - for(int x = x1; x <= x2; x++) - for(int y = y1; y <= y2; y++) { - boolean inside1 = r1 != null && r1[0] <= x && x <= r1[2] && r1[1] <= y && y <= r1[3]; - boolean inside2 = r2 != null && r2[0] <= x && x <= r2[2] && r2[1] <= y && y <= r2[3]; - - if (inside1 ^ inside2) { - int index = 3; - int color = getColor(buf[x][y]); - if (color == colorOutside.getRGB()) { - index = 0; - } else - if (color == colorInside.getRGB()) { - index = 1; - } else - if (color == colorShape.getRGB()) { - index = 2; - } - if (inside1) { - count[index]--; - } else { - count[index]++; - } - } - } - } - - int getRectType(BufferedImage img, int buf[][], int rx, int ry, int rw, int rh, boolean usePrev) { - - if ((rx + ry) % 2 == 0) { - return 0; - } - - if (!usePrev) { - prevRect = null; - count = new int[3]; - } - - int[] newRect = new int[]{rx, ry, rx + rw, ry + rh}; - countRect(buf, prevRect, newRect, count); - prevRect = newRect; - - if (count[0] > POINT_MIN_COUNT && count[1] == 0 && count[2] == 0) { - return 1; // Outside - } - if (count[1] > POINT_MIN_COUNT && count[0] == 0 && count[2] == 0) { - return 2; // Inside - } - if (count[0] > POINT_MIN_COUNT && count[1] > POINT_MIN_COUNT) { - return 3; // Both - } - return 0; // Invalid rectangle - } - - int getRectType_(BufferedImage img, int buf[][], int rx, int ry, int rw, int rh) { - - if ((rx + ry) % 2 == 0) { - return 0; - } - - int countOutside = 0; - int countInside = 0; - int countShape = 0; - - for(int x = rx; x <= rx + rw; x++) { - for(int y = ry; y <= ry + rh; y++) { - if (x == rx || x == rx + rw || - y == ry || y == ry + rh || - (x + y) % CHECK_STEP == 0 || (x - y) % CHECK_STEP == 0) - { - if (img != null) { -// img.setRGB(x, y, Color.blue.getRGB()); - } - int color = getColor(buf[x][y]); - if (color == colorOutside.getRGB()) { - countOutside++; - } else - if (color == colorInside.getRGB()) { - countInside++; - } else - if (color == colorShape.getRGB()) { - countShape++; - } - } - } - } - - if (countInside == 0 && countOutside > POINT_MIN_COUNT && countShape == 0) { - return 1; // Outside - } - if (countOutside == 0 && countInside > POINT_MIN_COUNT && countShape == 0) { - return 2; // Inside - } - if (countInside > POINT_MIN_COUNT && countOutside > POINT_MIN_COUNT) { - return 3; // Both - } - return 0; // Invalid rectangle - } - - void checkRunner(String name, FilenameFilter filter, String methodName, Object[] params) { - if (filter == null) { - return; // skip test - } - tests = getTestList(shapePath, filter); - int countErr = 0; - try { - Method method = this.getClass().getMethod(methodName, new Class[] {String.class, Object[].class}); - for(int i = 0; i < tests.length; i++) { - Object res = method.invoke(this, new Object[] {tests[i], params}); - if (!((Boolean)res).booleanValue()) { - if (countErr == 0) { - System.out.println(name); - } - countErr++; - System.out.println("Failed " + tests[i]); - } - } - } catch(Exception e) { - fail(e.toString()); - } - assertTrue("Failed " + countErr + " test(s)", countErr == 0); - } - - public boolean checkRect1(String fileName, Object[] params) { - boolean error = false; - try { - String methodName = (String)params[0]; - String prefix = (String)params[1]; - boolean[] expected = (boolean[])params[2]; - - Method method = Shape.class.getMethod(methodName, new Class[]{double.class, double.class, double.class, double.class}); - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - int buf[][] = createImageBuffer(img); - Graphics g = img.getGraphics(); - g.setColor(errorColor); - - count = new int[]{0, 0, 0}; - prevRect = null; - - for(int x = 0; x < img.getWidth() - RECT_WIDTH; x++) - for(int y = 0; y < img.getHeight() - RECT_HEIGHT; y++) { - int rectType = getRectType(null, buf, x, y, RECT_WIDTH, RECT_HEIGHT, true); - if (rectType == 0) { - // Invalid rectangle - continue; - } - Object res = method.invoke(shape, new Object[]{ - new Double(x), - new Double(y), - new Double(RECT_WIDTH), - new Double(RECT_HEIGHT)}); - if (expected[rectType] != ((Boolean)res).booleanValue()) { - g.drawRect(x, y, RECT_WIDTH, RECT_HEIGHT); - error = true; - } - } - - int errCount = 0; - Random rnd = new Random(); - for(int i = 0; i < 1000; i ++) { - int rx = (int)(rnd.nextDouble() * (img.getWidth() - RECT_WIDTH)); - int ry = (int)(rnd.nextDouble() * (img.getHeight() - RECT_HEIGHT)); - int rw = (int)(rnd.nextDouble() * (img.getWidth() - rx - 1)) + 1; - int rh = (int)(rnd.nextDouble() * (img.getHeight() - ry - 1)) + 1; - - int rectType = getRectType(img, buf, rx, ry, rw, rh, false); - if (rectType == 0) { - // Invalid rectangle - continue; - } - - Object res = method.invoke(shape, new Object[]{ - new Double(rx), - new Double(ry), - new Double(rw), - new Double(rh)}); - - if (expected[rectType] != ((Boolean)res).booleanValue()) { - g.drawRect(rx, ry, rw, rh); - error = true; - errCount++; - } - if (errCount > ERROR_MAX_COUNT) { - break; - } - } - - Tools.BufferedImage.saveIcon(img, outputPath + prefix + Tools.File.extractFileName(fileName)); - } catch(Exception e) { - fail(e.toString()); - } - return !error; - } - - public boolean checkRect2(String fileName, Object[] params) { - boolean error = false; - try { - String methodName = (String)params[0]; - String prefix = (String)params[1]; - - Method method1 = Shape.class.getMethod(methodName, new Class[]{double.class, double.class, double.class, double.class}); - Method method2 = Shape.class.getMethod(methodName, new Class[]{Rectangle2D.class}); - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - int buf[][] = createImageBuffer(img); - Graphics g = img.getGraphics(); - g.setColor(errorColor); - - Random rnd = new Random(); - for(int i = 0; i < 100; i ++) { - int rx = (int)(rnd.nextDouble() * (img.getWidth() - RECT_WIDTH)); - int ry = (int)(rnd.nextDouble() * (img.getHeight() - RECT_HEIGHT)); - int rw = (int)(rnd.nextDouble() * (img.getWidth() - rx - 1)) + 1; - int rh = (int)(rnd.nextDouble() * (img.getHeight() - ry - 1)) + 1; - - Object res1 = method1.invoke(shape, new Object[]{ - new Double(rx), - new Double(ry), - new Double(rw), - new Double(rh)}); - - Object res2 = method2.invoke(shape, new Object[]{new Rectangle2D.Double(rx, ry, rw, rh)}); - - if (!res1.equals(res2)) { - g.drawRect(rx, ry, rw, rh); - error = true; - } - } - - Tools.BufferedImage.saveIcon(img, outputPath + prefix + Tools.File.extractFileName(fileName)); - } catch(Exception e) { - fail(e.toString()); - } - return !error; - } - - public boolean checkContainsPoint1(String fileName, Object[] params) { - boolean error = false; - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - for(int x = 0; x < img.getWidth(); x++) - for(int y = 0; y < img.getHeight(); y++) { - int color = getColor(img.getRGB(x, y)); - boolean res = shape.contains(x, y); - if ((color == colorInside.getRGB() && !res) || - (color == colorOutside.getRGB() && res)) - { - img.setRGB(x, y, errorColor.getRGB()); - error = true; - } - } - Tools.BufferedImage.saveIcon(img, outputPath + "cp_" + Tools.File.extractFileName(fileName)); - return !error; - } - - public boolean checkContainsPoint2(String fileName, Object[] params) { - boolean error = false; - Shape shape = createShape(fileName); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - Random rnd = new Random(); - for(int i = 0; i < 100; i++) { - int x = (int)(rnd.nextDouble() * img.getWidth()); - int y = (int)(rnd.nextDouble() * img.getHeight()); - if (shape.contains(x, y) != shape.contains(new Point2D.Double(x, y))) { - img.setRGB(x, y, errorColor.getRGB()); - error = true; - } - } - Tools.BufferedImage.saveIcon(img, outputPath + "cp2_" + Tools.File.extractFileName(fileName)); - return !error; - } - - public boolean checkPathIterator(String fileName, Object[] params) { - boolean error = false; - double flatness = getFlatness(fileName); - AffineTransform at = createTransform(fileName); - Shape shape1 = createShape(fileName); - Shape shape2 = Tools.Shape.load(fileName); - String name = at == null ? "pi_" : "pia_"; - GeneralPath path = new GeneralPath(); - path.append(flatness < 0.0 ? shape1.getPathIterator(at) : shape1.getPathIterator(at, flatness), false); - Tools.Shape.save(path, outputPath + name + Tools.File.extractFileName(fileName)); - return Tools.PathIterator.equals( - path.getPathIterator(null), - shape2.getPathIterator(null), - SHAPE_DELTA); - } - - public void testContainsPoint1() { - checkRunner( - "contains(double,double)", - filterImage, - "checkContainsPoint1", - null); - } - - public void testContainsPoint2() { - checkRunner( - "contains(Point2D)", - filterImage, - "checkContainsPoint2", - null); - } - - public void testContainsRect1() { - checkRunner( - "contains(double,double,double,double)", - filterImage, - "checkRect1", - new Object[]{"contains", "cr_", new boolean[] {false, false, true, false}}); - } - - public void testContainsRect2() { - checkRunner( - "contains(Rectangle2D)", - filterImage, - "checkRect2", - new Object[]{"contains", "cr2_"}); - } - - public void testIntersectsRect1() { - checkRunner( - "intersects(double,double,double,double)", - filterImage, - "checkRect1", - new Object[]{"intersects", "ir_", new boolean[] {false, false, true, true}}); - } - - public void testIntersectsRect2() { - checkRunner( - "contains(Rectangle2D)", - filterImage, - "checkRect2", - new Object[]{"intersects", "ir2_"}); - } - - public void testGetPathIterator() { - checkRunner( - "getPathIterator()", - filterShape, - "checkPathIterator", - null); - } - - - /* - public boolean checkBounds(String fileName) { - boolean error = false; - Shape shape = createShape(fileName); - Rectangle2D expectBounds = createBounds2D(fileName); - Rectangle2D actualBounds = bounds2D ? shape.getBounds2D() : shape.getBounds(); - BufferedImage img = Tools.BufferedImage.loadIcon(fileName); - Graphics g = img.getGraphics(); - g.setColor(Color.red); - ((Graphics2D)g).draw(actualBounds); - String name = bounds2D ? "bounds2D_" : "bounds_"; - Tools.BufferedImage.saveIcon(img, outputPath + name + Tools.File.extractFileName(fileName)); - return !equalRects(expectBounds, actualBounds, SHAPE_DELTA); - } - - - public void testGetBounds2D() { - System.out.println("testdsfsd"); - if (filterBounds == null) { - return; // skip test - } - tests = getTestList(shapePath, filterBounds); - System.out.println("test"); - int countErr = 0; - for(int i = 0; i < tests.length; i++) { - if (checkBounds(tests[i], true)) { - countErr++; - System.out.println("Failed " + tests[i]); - } - } - assertTrue("Failed " + countErr + " test(s)", countErr == 0); - } -*/ -/* - public void testGetBounds() { - if (filterBounds == null) { - return; // skip test - } - tests = getTestList(shapePath, filterBounds); - int countErr = 0; - for(int i = 0; i < tests.length; i++) { - if (checkBounds(tests[i], false)) { - countErr++; - System.out.println("Failed " + tests[i]); - } - } - assertTrue("Failed " + countErr + " test(s)", countErr == 0); - } -*/ -} - Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).shape (working copy) @@ -1,10 +0,0 @@ -move 250.0 100.0 -line 220.71067810058594 135.3553466796875 -line 150.0 150.0 -line 79.28932189941406 135.3553466796875 -line 50.0 100.0 -line 79.28932189941406 64.64466094970703 -line 150.0 50.0 -line 220.71067810058594 64.64466094970703 -line 250.0 100.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape (working copy) @@ -1,7 +0,0 @@ -move 76.794921875 350.0 -line 198.23619079589844 443.1851501464844 -line 350.0 423.205078125 -line 443.1851501464844 301.7637939453125 -line 423.205078125 150.0 -line 301.7637939453125 56.81483459472656 -line 150.0 76.794921875 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).shape (working copy) @@ -1,5 +0,0 @@ -move 378.5575256347656 96.7911148071289 -cubic 457.9971008300781 163.44882202148438 473.31085205078125 279.7684020996094 413.8304138183594 364.7153015136719 -cubic 354.3499755859375 449.66217041015625 239.8076934814453 475.0555725097656 150.0 423.205078125 -line 250.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).shape (working copy) @@ -1,7 +0,0 @@ -move 62.06147766113281 115.79798889160156 -cubic 99.72347259521484 64.06024169921875 213.94451904296875 37.27732849121094 317.5833435058594 55.88239669799805 -cubic 421.22216796875 74.48747253417969 475.285888671875 131.4805908203125 438.5282897949219 183.3806915283203 -cubic 401.7707214355469 235.28079223632812 288.0214538574219 262.5610656738281 184.06187438964844 244.40890502929688 -cubic 80.1022720336914 226.25674438476562 25.045921325683594 169.50169372558594 60.89628601074219 117.44318389892578 -line 250.0 150.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).shape (working copy) @@ -1,3 +0,0 @@ -move 132.6351776123047 248.48077392578125 -cubic 71.4053955078125 237.68431091308594 34.7658576965332 174.22276306152344 56.030738830566406 115.79798889160156 -cubic 77.29561614990234 57.37320327758789 146.15542602539062 32.31028366088867 200.0 63.3974609375 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).shape (working copy) @@ -1,2 +0,0 @@ -move 50.0 300.0 -cubic 150.0 250.0 150.0 100.0 300.0 50.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).shape (working copy) @@ -1,5 +0,0 @@ -move 181.59597778320312 437.93853759765625 -cubic 77.8003921508789 400.1600341796875 24.282974243164062 285.39154052734375 62.06147766113281 181.59597778320312 -cubic 99.83998107910156 77.8003921508789 214.6084442138672 24.282974243164062 318.4040222167969 62.06147766113281 -cubic 422.1996154785156 99.83998107910156 475.717041015625 214.6084442138672 437.93853759765625 318.4040222167969 -cubic 400.1600341796875 422.1996154785156 285.39154052734375 475.717041015625 181.59597778320312 437.93853759765625 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).shape (working copy) @@ -1,5 +0,0 @@ -move 150.0 450.0 -cubic 205.2284698486328 450.0 250.0 360.4569396972656 250.0 250.0 -cubic 250.0 139.5430450439453 205.2284698486328 50.0 150.0 50.0 -cubic 94.77152252197266 50.0 50.0 139.5430450439453 50.0 250.0 -cubic 50.0 360.4569396972656 94.77152252197266 450.0 150.0 450.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-200,-359,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-100,-200,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).shape (working copy) @@ -1,5 +0,0 @@ -move 403.2088928222656 214.2787628173828 -cubic 332.2085266113281 256.5862121582031 206.05740356445312 262.1046142578125 121.44247436523438 226.6044464111328 -cubic 36.827545166015625 191.10426330566406 25.790752410888672 128.02870178222656 96.7911148071289 85.72123718261719 -cubic 167.79147338867188 43.41377258300781 293.9425964355469 37.89537811279297 378.5575256347656 73.39555358886719 -cubic 463.1724548339844 108.89573669433594 474.2092590332031 171.97129821777344 403.2088928222656 214.2787628173828 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,250,-360,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).shape (working copy) @@ -1,7 +0,0 @@ -move 115.79798889160156 62.06147766113281 -cubic 63.90019607543945 99.83998107910156 37.14148712158203 214.6084442138672 56.030738830566406 318.4040222167969 -cubic 74.91999053955078 422.1996154785156 132.30422973632812 475.717041015625 184.20201110839844 437.93853759765625 -cubic 236.0998077392578 400.1600341796875 262.8585205078125 285.39154052734375 243.96926879882812 181.59597778320312 -cubic 225.08001708984375 77.8003921508789 167.69577026367188 24.282974243164062 115.79798889160156 62.06147766113281 -line 150.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,150,250,250,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).shape (working copy) @@ -1,14 +0,0 @@ -move 120.0 50.0 -line 380.0 50.0 -line 429.4974670410156 64.64466094970703 -line 450.0 100.0 -line 450.0 200.0 -line 429.4974670410156 235.3553466796875 -line 380.0 250.0 -line 120.0 250.0 -line 70.50252532958984 235.3553466796875 -line 50.0 200.0 -line 50.0 100.0 -line 70.50252532958984 64.64466094970703 -line 120.0 50.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-250,360,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).shape (working copy) @@ -1,2 +0,0 @@ -move 250.0 150.0 -cubic 250.0 114.2734375 230.9401092529297 81.2607421875 200.0 63.3974609375 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape (working copy) @@ -1,10 +0,0 @@ -move 130.0 70.0 -line 230.0 70.0 -cubic 257.6142578125 70.0 280.0 101.3400650024414 280.0 140.0 -line 280.0 400.0 -cubic 280.0 438.6599426269531 257.6142578125 470.0 230.0 470.0 -line 130.0 470.0 -cubic 102.3857650756836 470.0 80.0 438.6599426269531 80.0 400.0 -line 80.0 140.0 -cubic 80.0 101.3400650024414 102.3857650756836 70.0 130.0 70.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).shape (working copy) @@ -1,2 +0,0 @@ -move 50.0 50.0 -cubic 150.0 150.0 250.0 150.0 350.0 60.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).shape (working copy) @@ -1,6 +0,0 @@ -move 150.0 150.0 -cubic 150.0 205.2284698486328 127.6142349243164 250.0 100.0 250.0 -cubic 72.3857650756836 250.0 50.0 205.2284698486328 50.0 150.0 -cubic 50.0 94.77152252197266 72.3857650756836 50.0 100.0 50.0 -cubic 127.6142349243164 50.0 150.0 94.77152252197266 150.0 150.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).shape (working copy) @@ -1,6 +0,0 @@ -move 250.0 50.0 -cubic 360.4569396972656 50.0 450.0 139.5430450439453 450.0 250.0 -cubic 450.0 360.4569396972656 360.4569396972656 450.0 250.0 450.0 -cubic 139.5430450439453 450.0 50.0 360.4569396972656 50.0 250.0 -cubic 50.0 139.5430450439453 139.5430450439453 50.0 250.0 50.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).shape (working copy) @@ -1,6 +0,0 @@ -move 446.9615478515625 215.27037048339844 -cubic 427.7809143066406 106.49150085449219 324.0492248535156 33.8577995300293 215.27037048339844 53.038448333740234 -cubic 106.49150085449219 72.21910095214844 33.8577995300293 175.95077514648438 53.038448333740234 284.7296447753906 -cubic 72.21910095214844 393.50848388671875 175.95077514648438 466.1422119140625 284.7296447753906 446.9615478515625 -cubic 393.50848388671875 427.7809143066406 466.1422119140625 324.0492248535156 446.9615478515625 215.27037048339844 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).shape (working copy) @@ -1,2 +0,0 @@ -move 250.0 50.0 -quad 50.0 250.0 200.0 200.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,300,250,150,100,100,200,250,200,50).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,150,250,150,350,60).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(5).shape (working copy) @@ -1,22 +0,0 @@ -move 120.0 50.0 -line 380.0 50.0 -line 407.2471618652344 53.92924880981445 -line 429.4974670410156 64.64466094970703 -line 444.4990539550781 80.5377426147461 -line 450.0 100.0 -line 450.0 200.0 -line 444.4990539550781 219.46224975585938 -line 429.4974670410156 235.3553466796875 -line 407.2471618652344 246.0707550048828 -line 380.0 250.0 -line 120.0 250.0 -line 92.75283813476562 246.0707550048828 -line 70.50252532958984 235.3553466796875 -line 55.500946044921875 219.46224975585938 -line 50.0 200.0 -line 50.0 100.0 -line 55.500946044921875 80.5377426147461 -line 70.50252532958984 64.64466094970703 -line 92.75283813476562 53.92924880981445 -line 120.0 50.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(50,50,250,100,150,250).shape (working copy) @@ -1,2 +0,0 @@ -move 50.0 50.0 -quad 250.0 100.0 150.0 250.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE).shape (working copy) @@ -1,7 +0,0 @@ -move 437.93853759765625 181.59597778320312 -cubic 403.61126708984375 87.2825698852539 304.69921875 33.01757049560547 206.7120819091797 54.74079895019531 -cubic 108.72492980957031 76.46402740478516 42.01356887817383 167.44683837890625 50.76105880737305 267.43115234375 -cubic 59.50855255126953 367.41546630859375 141.0054168701172 445.4317321777344 241.276123046875 449.80963134765625 -cubic 341.54681396484375 454.18756103515625 429.53314208984375 383.5710754394531 446.9615478515625 284.7296447753906 -line 250.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,100,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-350,390,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/quad(250,50,50,250,200,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).shape (working copy) @@ -1,7 +0,0 @@ -move 248.48077392578125 284.7296447753906 -cubic 238.8904571533203 393.50848388671875 187.0246124267578 466.1422119140625 132.6351776123047 446.9615478515625 -cubic 78.2457504272461 427.7809143066406 41.92890167236328 324.0492248535156 51.51922607421875 215.27037048339844 -cubic 61.10955047607422 106.49150085449219 112.97538757324219 33.8577995300293 167.3648223876953 53.038448333740234 -cubic 221.75424194335938 72.21910095214844 258.07110595703125 175.95077514648438 248.48077392578125 284.7296447753906 -line 150.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).shape (working copy) @@ -1,5 +0,0 @@ -move 350.0 236.6025390625 -cubic 445.6585388183594 208.98829650878906 478.4335632324219 147.8292694091797 423.205078125 100.0 -cubic 367.9765930175781 52.170738220214844 245.6585235595703 35.78322219848633 150.0 63.3974609375 -cubic 54.34147644042969 91.0116958618164 21.566444396972656 152.1707305908203 76.794921875 200.0 -cubic 132.0233917236328 247.8292694091797 254.3414764404297 264.2167663574219 350.0 236.6025390625 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape (working copy) @@ -1,2 +0,0 @@ -move 453.2088928222656 242.88494873046875 -cubic 515.5970458984375 391.5875549316406 515.5970458984375 608.4124145507812 453.2088928222656 757.1150512695312 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,350,-390,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,300,361,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,150,-270,CHORD).shape (working copy) @@ -1,5 +0,0 @@ -move 63.3974609375 150.0 -cubic 91.0116958618164 54.34147644042969 152.1707305908203 21.566444396972656 200.0 76.794921875 -cubic 247.8292694091797 132.0233917236328 264.2167663574219 254.3414764404297 236.6025390625 350.0 -cubic 208.98829650878906 445.6585388183594 147.8292694091797 478.4335632324219 100.0 423.205078125 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape (working copy) @@ -1,6 +0,0 @@ -move 270.0 130.0 -cubic 270.0 157.61422729492188 225.2284698486328 180.0 170.0 180.0 -cubic 114.77152252197266 180.0 70.0 157.61422729492188 70.0 130.0 -cubic 70.0 102.3857650756836 114.77152252197266 80.0 170.0 80.0 -cubic 225.2284698486328 80.0 270.0 102.3857650756836 270.0 130.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,200,50,200,150,100,150,100,100,150,100,150,200,50,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN).shape (working copy) @@ -1,4 +0,0 @@ -move 76.794921875 350.0 -cubic 132.0233917236328 445.6585388183594 254.3414764404297 478.4335632324219 350.0 423.205078125 -cubic 445.6585388183594 367.9765930175781 478.4335632324219 245.6585235595703 423.205078125 150.0 -cubic 367.9765930175781 54.34147644042969 245.6585235595703 21.566444396972656 150.0 76.794921875 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).shape (working copy) @@ -1,5 +0,0 @@ -move 50.0 50.0 -line 150.0 50.0 -line 150.0 250.0 -line 50.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-150,270,OPEN)_flat(30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,50,-170,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(150,250,50,250,250,50,250,200).shape (working copy) @@ -1,2 +0,0 @@ -move 150.0 250.0 -cubic 50.0 250.0 250.0 50.0 250.0 200.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,300,150,250,150,100,300,50).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,100,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,CHORD)_flat(10).shape (working copy) @@ -1,4 +0,0 @@ -move 250.0 150.0 -line 236.6025390625 100.0 -line 200.0 63.3974609375 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,-450,730,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).shape (working copy) @@ -1,2 +0,0 @@ -move 50.0 50.0 -cubic 100.0 150.0 250.0 100.0 50.0 300.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).shape (working copy) @@ -1,5 +0,0 @@ -move 132.6351776123047 51.51922607421875 -cubic 71.4053955078125 62.31568908691406 34.7658576965332 125.77722930908203 56.030738830566406 184.20201110839844 -cubic 77.29561614990234 242.62680053710938 146.15542602539062 267.6897277832031 200.0 236.6025390625 -line 150.0 150.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,-400,-710,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/polygon(50,50,150,50,150,150,50,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).shape (working copy) @@ -1,10 +0,0 @@ -move 437.93853759765625 181.59597778320312 -line 346.19775390625 74.65464782714844 -line 206.7120819091797 54.74079895019531 -line 88.7110824584961 131.73806762695312 -line 50.76105880737305 267.43115234375 -line 111.6973876953125 394.4727783203125 -line 241.276123046875 449.80963134765625 -line 375.1846923828125 405.9768981933594 -line 446.9615478515625 284.7296447753906 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,100,150,250,100,50,300).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,400,710,PIE).shape (working copy) @@ -1,7 +0,0 @@ -move 226.6044464111328 85.72123718261719 -cubic 191.10426330566406 43.41377258300781 128.02870178222656 37.89537811279297 85.72123718261719 73.39555358886719 -cubic 43.41377258300781 108.89573669433594 37.89537811279297 171.97129821777344 73.39555358886719 214.2787628173828 -cubic 108.89573669433594 256.5862121582031 171.97129821777344 262.1046142578125 214.2787628173828 226.6044464111328 -cubic 256.5862121582031 191.10426330566406 262.1046142578125 128.02870178222656 226.6044464111328 85.72123718261719 -line 150.0 150.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).shape (working copy) @@ -1,3 +0,0 @@ -move 226.6044464111328 121.44247436523438 -cubic 257.79852294921875 195.7937774658203 257.79852294921875 304.2062072753906 226.6044464111328 378.5575256347656 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).shape (working copy) @@ -1,2 +0,0 @@ -move 50.0 50.0 -cubic 150.0 200.0 300.0 320.0 200.0 100.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100).shape (working copy) @@ -1,10 +0,0 @@ -move 120.0 50.0 -line 380.0 50.0 -cubic 418.6599426269531 50.0 450.0 72.3857650756836 450.0 100.0 -line 450.0 200.0 -cubic 450.0 227.61424255371094 418.6599426269531 250.0 380.0 250.0 -line 120.0 250.0 -cubic 81.3400650024414 250.0 50.0 227.61424255371094 50.0 200.0 -line 50.0 100.0 -cubic 50.0 72.3857650756836 81.3400650024414 50.0 120.0 50.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape (working copy) @@ -1,5 +0,0 @@ -move 70.0 80.0 -line 270.0 80.0 -line 270.0 180.0 -line 70.0 180.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,400,200,140,100)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,CHORD)_flat(40).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,330,PIE)_flat(10).shape (working copy) @@ -1,19 +0,0 @@ -move 437.93853759765625 181.59597778320312 -line 401.1070251464844 118.93155670166016 -line 346.19775390625 74.65464782714844 -line 279.3522644042969 52.13460922241211 -line 206.7120819091797 54.74079895019531 -line 139.7762908935547 83.0778579711914 -line 88.7110824584961 131.73806762695312 -line 57.65861511230469 195.07223510742188 -line 50.76105880737305 267.43115234375 -line 70.11882019042969 337.4930114746094 -line 111.6973876953125 394.4727783203125 -line 170.43655395507812 433.5263671875 -line 241.276123046875 449.80963134765625 -line 313.2652893066406 439.76239013671875 -line 375.1846923828125 405.9768981933594 -line 421.5711669921875 352.8377685546875 -line 446.9615478515625 284.7296447753906 -line 250.0 250.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,0,60,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape (working copy) @@ -1,4 +0,0 @@ -move 469.4893798828125 574.6513671875 -cubic 649.3861083984375 711.3908081054688 866.2109375 819.80322265625 983.719482421875 831.7664184570312 -line 650.0 550.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).shape (working copy) @@ -1,3 +0,0 @@ -move 450.0 150.0 -cubic 450.0 185.7265625 411.8802185058594 218.7392578125 350.0 236.6025390625 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,400,40,-80,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(50,50,150,200,300,320,200,100).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).shape (working copy) @@ -1,6 +0,0 @@ -move 200.0 63.3974609375 -cubic 247.8292694091797 91.0116958618164 264.2167663574219 152.1707305908203 236.6025390625 200.0 -cubic 208.98829650878906 247.8292694091797 147.8292694091797 264.2167663574219 100.0 236.6025390625 -cubic 52.170738220214844 208.98829650878906 35.78322219848633 147.8292694091797 63.3974609375 100.0 -cubic 91.0116958618164 52.170738220214844 152.1707305908203 35.78322219848633 200.0 63.3974609375 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).shape (working copy) @@ -1,2 +0,0 @@ -move 450.0 100.0 -cubic 50.0 250.0 150.0 50.0 300.0 250.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/rect(50,50,200,100)_affine(1,0,0,1,20,30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,100,200,PIE)_flat(20).shape (working copy) @@ -1,7 +0,0 @@ -move 132.6351776123047 51.51922607421875 -line 63.3974609375 100.0 -line 56.030738830566406 184.20201110839844 -line 115.79798889160156 243.96926879882812 -line 200.0 236.6025390625 -line 150.0 150.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,20,-330,OPEN).shape (working copy) @@ -1,5 +0,0 @@ -move 437.93853759765625 181.59597778320312 -cubic 472.26580810546875 275.90936279296875 431.3756408691406 381.0581970214844 342.3497314453125 427.40216064453125 -cubic 253.32379150390625 473.7461242675781 143.73728942871094 446.93048095703125 86.16959381103516 364.7153015136719 -cubic 28.60188865661621 282.5000915527344 40.884212493896484 170.35096740722656 114.8819580078125 102.5445327758789 -cubic 188.87969970703125 34.738094329833984 301.67254638671875 32.27694320678711 378.5575256347656 96.7911148071289 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,450,-730,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,400,-50,170,CHORD).shape (working copy) @@ -1,4 +0,0 @@ -move 378.5575256347656 403.2088928222656 -cubic 457.9971008300781 336.5511779785156 473.31085205078125 220.23159790039062 413.8304138183594 135.2847137451172 -cubic 354.3499755859375 50.33782958984375 239.8076934814453 24.944421768188477 150.0 76.794921875 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,400,200,0,-60,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/ellipse(50,50,200,100)_flat(5).shape (working copy) @@ -1,18 +0,0 @@ -move 250.0 100.0 -line 242.14151000976562 119.4622573852539 -line 220.71067810058594 135.3553466796875 -line 188.9245147705078 146.0707550048828 -line 150.0 150.0 -line 111.07548522949219 146.0707550048828 -line 79.28932189941406 135.3553466796875 -line 57.85849380493164 119.4622573852539 -line 50.0 100.0 -line 57.85849380493164 80.5377426147461 -line 79.28932189941406 64.64466094970703 -line 111.07548522949219 53.92924880981445 -line 150.0 50.0 -line 188.9245147705078 53.92924880981445 -line 220.71067810058594 64.64466094970703 -line 242.14151000976562 80.5377426147461 -line 250.0 100.0 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,-300,-361,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(300,50,50,200,300,50,350,150).shape (working copy) @@ -1,2 +0,0 @@ -move 300.0 50.0 -cubic 50.0 200.0 300.0 50.0 350.0 150.0 Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).shape =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).shape (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/shapes/arc(50,50,200,200,200,359,CHORD).shape (working copy) @@ -1,6 +0,0 @@ -move 56.030738830566406 184.20201110839844 -cubic 74.86173248291016 235.93975830078125 131.97225952148438 262.7226867675781 183.7916717529297 244.1175994873047 -cubic 235.611083984375 225.5125274658203 262.6429443359375 168.5194091796875 244.26414489746094 116.61931610107422 -cubic 225.88536071777344 64.7192153930664 169.01072692871094 37.43893814086914 117.03093719482422 55.59109878540039 -cubic 65.05113983154297 73.74325561523438 37.5229606628418 130.49830627441406 55.448143005371094 182.5568084716797 -close Index: modules/awt/src/test/api/java/common/java/awt/geom/shapes/cubic(450,100,50,250,150,50,300,250).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = image/x-icon Index: modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/CubicCurve2DTest.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.Point; @@ -68,8 +64,7 @@ public CubicCurve2DTest(String name) { super(name); - filterImage = createFilter("^(cubic).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); -// filterShape = createFilter("^(quad).*([.]shape)$", null); +// filterImage = createFilter("^(cubic).*([.]ico)$", "(.*)((affine)|(flat)|(bounds))(.*)"); } protected void setUp() throws Exception { Index: modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java =================================================================== --- modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java (revision 454346) +++ modules/awt/src/test/api/java/common/java/awt/geom/AffineTransformTest.java (working copy) @@ -14,10 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** - * @author Denis M. Kishenko - * @version $Revision$ - */ package java.awt.geom; import java.awt.Shape; @@ -27,6 +23,10 @@ public class AffineTransformTest extends GeomTestCase { + { + SERIALIZATION_TEST = true; + } + final static double ROTATION_DELTA = 1E-5; double[][] type = new double[][]{ @@ -102,7 +102,6 @@ public AffineTransformTest(String name) { super(name); - serializePath = getSerializePath(AffineTransform.class); } protected void setUp() throws Exception { @@ -223,8 +222,6 @@ s += Integer.toString(type & ~all) + ","; } } -// System.out.println(s); -// return s; return Integer.toString(type); } @@ -491,7 +488,6 @@ t.translate(8, 9); assertEquals( AffineTransform.TYPE_GENERAL_TRANSFORM, -// new double[]{2, 3, 4, 5, 14, 16}, new double[]{2, 3, 4, 5, 58, 76}, 0.0, t); @@ -507,7 +503,6 @@ t.scale(2, 3); assertEquals( AffineTransform.TYPE_GENERAL_TRANSFORM, -// new double[]{4, 9, 8, 15, 12, 21}, new double[]{4, 6, 12, 15, 6, 7}, 0.0, t); @@ -524,7 +519,6 @@ assertEquals( AffineTransform.TYPE_GENERAL_TRANSFORM, new double[]{10, 13, 10, 14, 6, 7}, -// new double[]{11, 7, 19, 13, 27, 19}, 0.0, t); } @@ -546,7 +540,6 @@ assertEquals( AffineTransform.TYPE_GENERAL_TRANSFORM, new double[]{4, 5, -2, -3, 6, 7}, -// new double[]{-3, 2, -5, 4, -7, 6}, 0.0, t); } @@ -613,7 +606,7 @@ } } - public void testTransform1() { + public void testTransformPoint() { for(int i = 0; i < points.length; i++) { AffineTransform at = new AffineTransform(points[i][0]); for(int j = 1; j < points[i].length; j++) { @@ -640,7 +633,7 @@ } } - public void testTransform2() { + public void testTransformArray1() { AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4); Point2D[] src = new Point2D[]{ null, @@ -653,7 +646,7 @@ assertEquals(new Point2D.Float(1, 5), dst[3]); } - public void testTransform3() { + public void testTransformArray2() { AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4); double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0}; double[] dst = new double[6]; @@ -661,8 +654,8 @@ at.transform(src, 4, dst, 2, 2); assertEquals(expected, dst, 6, 0.0); } - - public void testTransform4() { + + public void testTransformArray3() { AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4); float[] src = new float[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0}; float[] dst = new float[6]; @@ -671,7 +664,7 @@ assertEquals(expected, dst, 6, 0.0f); } - public void testTransform5() { + public void testTransformArray4() { AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4); float[] src = new float[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0}; double[] dst = new double[6]; @@ -680,7 +673,7 @@ assertEquals(expected, dst, 6, 0.0); } - public void testTransform6() { + public void testTransformArray5() { AffineTransform at = new AffineTransform(0, 1, -2, 0, 3, 4); double[] src = new double[]{0, 0, 0, 0, 0, 0, 1, 1, 0, 0}; float[] dst = new float[6]; @@ -688,7 +681,7 @@ at.transform(src, 4, dst, 2, 2); assertEquals(expected, dst, 6, 0.0f); } - + public void testDeltaTransform1() { for(int i = 0; i < points.length; i++) { AffineTransform at = new AffineTransform(points[i][0]); @@ -822,33 +815,30 @@ t.toString()); } - public String objToStr(Object obj) { - double[] m = new double[6]; - ((AffineTransform)obj).getMatrix(m); - return - obj.getClass().getName() + "[[" + - m[0] + ", " + m[2] + ", " + m[4] + "], [" + - m[1] + ", " + m[3] + ", " + m[5] + "]]"; + public void testSerializeRead1() { + checkRead(new AffineTransform()); } - public void testSerializeRead() { - assertTrue(checkRead(new AffineTransform())); - assertTrue(checkRead(new AffineTransform(1, 2, 3, 4, 5, 6))); + public void testSerializeRead2() { + checkRead(new AffineTransform(1, 2, 3, 4, 5, 6)); } - public void testSerializeWrite() { - assertTrue(checkWrite(new AffineTransform())); - assertTrue(checkWrite(new AffineTransform(1, 2, 3, 4, 5, 6))); + public void testSerializeWrite1() { + checkWrite(new AffineTransform()); } + public void testSerializeWrite2() { + checkWrite(new AffineTransform(1, 2, 3, 4, 5, 6)); + } + public void createSerializeTemplates() { saveSerialized(new AffineTransform()); saveSerialized(new AffineTransform(1, 2, 3, 4, 5, 6)); } public static void main(String[] args) { -// junit.textui.TestRunner.run(AffineTransformTest.class); - new AffineTransformTest("").createSerializeTemplates(); +// new AffineTransformTest("").createSerializeTemplates(); + junit.textui.TestRunner.run(AffineTransformTest.class); } } Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,20,330,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\quad(50,50,250,100,150,250).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\round(50,50,400,200,140,100)_flat(5).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,20,-330,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\ellipse(50,50,200,100)_flat(5).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).shape (revision 0) @@ -0,0 +1,10 @@ +move 250.0 100.0 +line 220.71067810058594 135.3553466796875 +line 150.0 150.0 +line 79.28932189941406 135.3553466796875 +line 50.0 100.0 +line 79.28932189941406 64.64466094970703 +line 150.0 50.0 +line 220.71067810058594 64.64466094970703 +line 250.0 100.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).shape (revision 0) @@ -0,0 +1,7 @@ +move 76.794921875 350.0 +line 198.23619079589844 443.1851501464844 +line 350.0 423.205078125 +line 443.1851501464844 301.7637939453125 +line 423.205078125 150.0 +line 301.7637939453125 56.81483459472656 +line 150.0 76.794921875 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).shape (revision 0) @@ -0,0 +1,5 @@ +move 378.5575256347656 96.7911148071289 +cubic 457.9971008300781 163.44882202148438 473.31085205078125 279.7684020996094 413.8304138183594 364.7153015136719 +cubic 354.3499755859375 449.66217041015625 239.8076934814453 475.0555725097656 150.0 423.205078125 +line 250.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,200,359,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).shape (revision 0) @@ -0,0 +1,7 @@ +move 62.06147766113281 115.79798889160156 +cubic 99.72347259521484 64.06024169921875 213.94451904296875 37.27732849121094 317.5833435058594 55.88239669799805 +cubic 421.22216796875 74.48747253417969 475.285888671875 131.4805908203125 438.5282897949219 183.3806915283203 +cubic 401.7707214355469 235.28079223632812 288.0214538574219 262.5610656738281 184.06187438964844 244.40890502929688 +cubic 80.1022720336914 226.25674438476562 25.045921325683594 169.50169372558594 60.89628601074219 117.44318389892578 +line 250.0 150.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(300,50,50,200,300,50,350,150).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape (revision 0) @@ -0,0 +1,3 @@ +move 132.6351776123047 248.48077392578125 +cubic 71.4053955078125 237.68431091308594 34.7658576965332 174.22276306152344 56.030738830566406 115.79798889160156 +cubic 77.29561614990234 57.37320327758789 146.15542602539063 32.31028366088867 200.0 63.3974609375 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).shape (revision 0) @@ -0,0 +1,2 @@ +move 50.0 300.0 +cubic 150.0 250.0 150.0 100.0 300.0 50.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).shape (revision 0) @@ -0,0 +1,5 @@ +move 181.59597778320312 437.93853759765625 +cubic 77.8003921508789 400.1600341796875 24.282974243164062 285.39154052734375 62.06147766113281 181.59597778320312 +cubic 99.83998107910156 77.8003921508789 214.6084442138672 24.282974243164062 318.4040222167969 62.06147766113281 +cubic 422.1996154785156 99.83998107910156 475.717041015625 214.6084442138672 437.93853759765625 318.4040222167969 +cubic 400.1600341796875 422.1996154785156 285.39154052734375 475.717041015625 181.59597778320312 437.93853759765625 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).shape (revision 0) @@ -0,0 +1,5 @@ +move 150.0 450.0 +cubic 205.2284698486328 450.0 250.0 360.4569396972656 250.0 250.0 +cubic 250.0 139.5430450439453 205.2284698486328 50.0 150.0 50.0 +cubic 94.77152252197266 50.0 50.0 139.5430450439453 50.0 250.0 +cubic 50.0 360.4569396972656 94.77152252197266 450.0 150.0 450.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\ellipse(50,50,200,100)_flat(10).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-200,-359,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,200,-200,-359,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,150,-270,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,-100,-200,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).shape (revision 0) @@ -0,0 +1,5 @@ +move 403.2088928222656 214.2787628173828 +cubic 332.2085266113281 256.5862121582031 206.05740356445312 262.1046142578125 121.44247436523438 226.6044464111328 +cubic 36.827545166015625 191.10426330566406 25.790752410888672 128.02870178222656 96.7911148071289 85.72123718261719 +cubic 167.79147338867188 43.41377258300781 293.9425964355469 37.89537811279297 378.5575256347656 73.39555358886719 +cubic 463.1724548339844 108.89573669433594 474.2092590332031 171.97129821777344 403.2088928222656 214.2787628173828 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,-150,270,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).shape (revision 0) @@ -0,0 +1,7 @@ +move 115.79798889160156 62.06147766113281 +cubic 63.90019607543945 99.83998107910156 37.14148712158203 214.6084442138672 56.030738830566406 318.4040222167969 +cubic 74.91999053955078 422.1996154785156 132.30422973632812 475.717041015625 184.20201110839844 437.93853759765625 +cubic 236.0998077392578 400.1600341796875 262.8585205078125 285.39154052734375 243.96926879882812 181.59597778320312 +cubic 225.08001708984375 77.8003921508789 167.69577026367188 24.282974243164062 115.79798889160156 62.06147766113281 +line 150.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,250,-360,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,250,-360,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(150,250,50,250,250,50,250,200).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,150,250,250,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\polygon(50,50,150,250,250,150).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).shape (revision 0) @@ -0,0 +1,14 @@ +move 120.0 50.0 +line 380.0 50.0 +line 429.4974670410156 64.64466094970703 +line 450.0 100.0 +line 450.0 200.0 +line 429.4974670410156 235.3553466796875 +line 380.0 250.0 +line 120.0 250.0 +line 70.50252532958984 235.3553466796875 +line 50.0 200.0 +line 50.0 100.0 +line 70.50252532958984 64.64466094970703 +line 120.0 50.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-250,360,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,-250,360,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,0,60,CHORD)_flat(10).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).shape (revision 0) @@ -0,0 +1,2 @@ +move 250.0 150.0 +cubic 250.0 114.2734375 230.9401092529297 81.2607421875 200.0 63.3974609375 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).shape (revision 0) @@ -0,0 +1,10 @@ +move 130.0 70.0 +line 230.0 70.0 +cubic 257.6142578125 70.0 280.0 101.3400650024414 280.0 140.0 +line 280.0 400.0 +cubic 280.0 438.6599426269531 257.6142578125 470.0 230.0 470.0 +line 130.0 470.0 +cubic 102.3857650756836 470.0 80.0 438.6599426269531 80.0 400.0 +line 80.0 140.0 +cubic 80.0 101.3400650024414 102.3857650756836 70.0 130.0 70.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).shape (revision 0) @@ -0,0 +1,2 @@ +move 50.0 50.0 +cubic 150.0 150.0 250.0 150.0 350.0 60.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).shape (revision 0) @@ -0,0 +1,6 @@ +move 150.0 150.0 +cubic 150.0 205.2284698486328 127.6142349243164 250.0 100.0 250.0 +cubic 72.3857650756836 250.0 50.0 205.2284698486328 50.0 150.0 +cubic 50.0 94.77152252197266 72.3857650756836 50.0 100.0 50.0 +cubic 127.6142349243164 50.0 150.0 94.77152252197266 150.0 150.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).shape (revision 0) @@ -0,0 +1,6 @@ +move 250.0 50.0 +cubic 360.4569396972656 50.0 450.0 139.5430450439453 450.0 250.0 +cubic 450.0 360.4569396972656 360.4569396972656 450.0 250.0 450.0 +cubic 139.5430450439453 450.0 50.0 360.4569396972656 50.0 250.0 +cubic 50.0 139.5430450439453 139.5430450439453 50.0 250.0 50.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,400,710,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).shape (revision 0) @@ -0,0 +1,6 @@ +move 446.9615478515625 215.27037048339844 +cubic 427.7809143066406 106.49150085449219 324.0492248535156 33.8577995300293 215.27037048339844 53.038448333740234 +cubic 106.49150085449219 72.21910095214844 33.8577995300293 175.95077514648438 53.038448333740234 284.7296447753906 +cubic 72.21910095214844 393.50848388671875 175.95077514648438 466.1422119140625 284.7296447753906 446.9615478515625 +cubic 393.50848388671875 427.7809143066406 466.1422119140625 324.0492248535156 446.9615478515625 215.27037048339844 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).shape (revision 0) @@ -0,0 +1,2 @@ +move 250.0 50.0 +quad 50.0 250.0 200.0 200.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\round(50,50,400,200,140,100).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,150,250,150,350,60).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(50,50,150,150,250,150,350,60).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,300,250,150,100,100,200,250,200,50).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\polygon(50,300,250,150,100,100,200,250,200,50).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(5).shape (revision 0) @@ -0,0 +1,22 @@ +move 120.0 50.0 +line 380.0 50.0 +line 407.2471618652344 53.92924880981445 +line 429.4974670410156 64.64466094970703 +line 444.4990539550781 80.5377426147461 +line 450.0 100.0 +line 450.0 200.0 +line 444.4990539550781 219.46224975585938 +line 429.4974670410156 235.3553466796875 +line 407.2471618652344 246.0707550048828 +line 380.0 250.0 +line 120.0 250.0 +line 92.75283813476562 246.0707550048828 +line 70.50252532958984 235.3553466796875 +line 55.500946044921875 219.46224975585938 +line 50.0 200.0 +line 50.0 100.0 +line 55.500946044921875 80.5377426147461 +line 70.50252532958984 64.64466094970703 +line 92.75283813476562 53.92924880981445 +line 120.0 50.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(50,50,250,100,150,250).shape (revision 0) @@ -0,0 +1,2 @@ +move 50.0 50.0 +quad 250.0 100.0 150.0 250.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE).shape (revision 0) @@ -0,0 +1,7 @@ +move 437.93853759765625 181.59597778320312 +cubic 403.61126708984375 87.2825698852539 304.69921875 33.01757049560547 206.7120819091797 54.74079895019531 +cubic 108.72492980957031 76.46402740478516 42.01356887817383 167.44683837890625 50.76105880737305 267.43115234375 +cubic 59.50855255126953 367.41546630859375 141.0054168701172 445.4317321777344 241.276123046875 449.80963134765625 +cubic 341.54681396484375 454.18756103515625 429.53314208984375 383.5710754394531 446.9615478515625 284.7296447753906 +line 250.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,20,330,PIE)_flat(10).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,100,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\ellipse(50,50,100,200).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-350,390,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,-350,390,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).shape (revision 0) @@ -0,0 +1,7 @@ +move 248.48077392578125 284.7296447753906 +cubic 238.8904571533203 393.50848388671875 187.0246124267578 466.1422119140625 132.6351776123047 446.9615478515625 +cubic 78.2457504272461 427.7809143066406 41.92890167236328 324.0492248535156 51.51922607421875 215.27037048339844 +cubic 61.10955047607422 106.49150085449219 112.97538757324219 33.8577995300293 167.3648223876953 53.038448333740234 +cubic 221.75424194335938 72.21910095214844 258.07110595703125 175.95077514648438 248.48077392578125 284.7296447753906 +line 150.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).shape (revision 0) @@ -0,0 +1,5 @@ +move 350.0 236.6025390625 +cubic 445.6585388183594 208.98829650878906 478.4335632324219 147.8292694091797 423.205078125 100.0 +cubic 367.9765930175781 52.170738220214844 245.6585235595703 35.78322219848633 150.0 63.3974609375 +cubic 54.34147644042969 91.0116958618164 21.566444396972656 152.1707305908203 76.794921875 200.0 +cubic 132.0233917236328 247.8292694091797 254.3414764404297 264.2167663574219 350.0 236.6025390625 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/quad(250,50,50,250,200,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\quad(250,50,50,250,200,200).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,100,200,PIE)_flat(20).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,OPEN)_affine(2,0,0,2,0,0).shape (revision 0) @@ -0,0 +1,2 @@ +move 453.2088928222656 242.88494873046875 +cubic 515.5970458984375 391.5875549316406 515.5970458984375 608.4124145507812 453.2088928222656 757.1150512695312 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,-50,170,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,350,-390,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,350,-390,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,300,361,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,200,300,361,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,150,-270,CHORD).shape (revision 0) @@ -0,0 +1,5 @@ +move 63.3974609375 150.0 +cubic 91.0116958618164 54.34147644042969 152.1707305908203 21.566444396972656 200.0 76.794921875 +cubic 247.8292694091797 132.0233917236328 264.2167663574219 254.3414764404297 236.6025390625 350.0 +cubic 208.98829650878906 445.6585388183594 147.8292694091797 478.4335632324219 100.0 423.205078125 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape_ =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape_ (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-100,-200,OPEN).shape_ (revision 0) @@ -0,0 +1,3 @@ +move 132.6351776123047 248.48077392578125 +cubic 71.4053955078125 237.68431091308594 34.7658576965332 174.22276306152344 56.030738830566406 115.79798889160156 +cubic 77.29561614990234 57.37320327758789 146.15542602539062 32.31028366088867 200.0 63.3974609375 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 0) @@ -0,0 +1,6 @@ +move 270.0 130.0 +cubic 270.0 157.61422729492188 225.2284698486328 180.0 170.0 180.0 +cubic 114.77152252197266 180.0 70.0 157.61422729492188 70.0 130.0 +cubic 70.0 102.3857650756836 114.77152252197266 80.0 170.0 80.0 +cubic 225.2284698486328 80.0 270.0 102.3857650756836 270.0 130.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,200,50,200,150,100,150,100,100,150,100,150,200,50,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\polygon(50,50,200,50,200,150,100,150,100,100,150,100,150,200,50,200).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN).shape (revision 0) @@ -0,0 +1,4 @@ +move 76.794921875 350.0 +cubic 132.0233917236328 445.6585388183594 254.3414764404297 478.4335632324219 350.0 423.205078125 +cubic 445.6585388183594 367.9765930175781 478.4335632324219 245.6585235595703 423.205078125 150.0 +cubic 367.9765930175781 54.34147644042969 245.6585235595703 21.566444396972656 150.0 76.794921875 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).shape (revision 0) @@ -0,0 +1,5 @@ +move 50.0 50.0 +line 150.0 50.0 +line 150.0 250.0 +line 50.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,50,-170,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,50,-170,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-150,270,OPEN)_flat(30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,-150,270,OPEN)_flat(30).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_affine(1,0,0,1,20,30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\ellipse(50,50,200,100)_affine(1,0,0,1,20,30).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,300,150,250,150,100,300,50).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(50,300,150,250,150,100,300,50).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(150,250,50,250,250,50,250,200).shape (revision 0) @@ -0,0 +1,2 @@ +move 150.0 250.0 +cubic 50.0 250.0 250.0 50.0 250.0 200.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,100,200).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\rect(50,50,100,200).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,CHORD)_flat(10).shape (revision 0) @@ -0,0 +1,4 @@ +move 250.0 150.0 +line 236.6025390625 100.0 +line 200.0 63.3974609375 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,-450,730,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,-450,730,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).shape (revision 0) @@ -0,0 +1,2 @@ +move 50.0 50.0 +cubic 100.0 150.0 250.0 100.0 50.0 300.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).shape (revision 0) @@ -0,0 +1,5 @@ +move 132.6351776123047 51.51922607421875 +cubic 71.4053955078125 62.31568908691406 34.7658576965332 125.77722930908203 56.030738830566406 184.20201110839844 +cubic 77.29561614990234 242.62680053710938 146.15542602539062 267.6897277832031 200.0 236.6025390625 +line 150.0 150.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,-400,-710,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,200,-400,-710,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/polygon(50,50,150,50,150,150,50,150).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\polygon(50,50,150,50,150,150,50,150).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).shape (revision 0) @@ -0,0 +1,10 @@ +move 437.93853759765625 181.59597778320312 +line 346.19775390625 74.65464782714844 +line 206.7120819091797 54.74079895019531 +line 88.7110824584961 131.73806762695312 +line 50.76105880737305 267.43115234375 +line 111.6973876953125 394.4727783203125 +line 241.276123046875 449.80963134765625 +line 375.1846923828125 405.9768981933594 +line 446.9615478515625 284.7296447753906 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,100,150,250,100,50,300).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(50,50,100,150,250,100,50,300).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,400,710,PIE).shape (revision 0) @@ -0,0 +1,7 @@ +move 226.6044464111328 85.72123718261719 +cubic 191.10426330566406 43.41377258300781 128.02870178222656 37.89537811279297 85.72123718261719 73.39555358886719 +cubic 43.41377258300781 108.89573669433594 37.89537811279297 171.97129821777344 73.39555358886719 214.2787628173828 +cubic 108.89573669433594 256.5862121582031 171.97129821777344 262.1046142578125 214.2787628173828 226.6044464111328 +cubic 256.5862121582031 191.10426330566406 262.1046142578125 128.02870178222656 226.6044464111328 85.72123718261719 +line 150.0 150.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).shape (revision 0) @@ -0,0 +1,2 @@ +move 50.0 50.0 +cubic 150.0 200.0 300.0 320.0 200.0 100.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,100,200,PIE).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).shape (revision 0) @@ -0,0 +1,3 @@ +move 226.6044464111328 121.44247436523438 +cubic 257.79852294921875 195.7937774658203 257.79852294921875 304.2062072753906 226.6044464111328 378.5575256347656 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100).shape (revision 0) @@ -0,0 +1,10 @@ +move 120.0 50.0 +line 380.0 50.0 +cubic 418.6599426269531 50.0 450.0 72.3857650756836 450.0 100.0 +line 450.0 200.0 +cubic 450.0 227.61424255371094 418.6599426269531 250.0 380.0 250.0 +line 120.0 250.0 +cubic 81.3400650024414 250.0 50.0 227.61424255371094 50.0 200.0 +line 50.0 100.0 +cubic 50.0 72.3857650756836 81.3400650024414 50.0 120.0 50.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).shape (revision 0) @@ -0,0 +1,5 @@ +move 70.0 80.0 +line 270.0 80.0 +line 270.0 180.0 +line 70.0 180.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,400,200,140,100)_flat(10).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\round(50,50,400,200,140,100)_flat(10).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,CHORD)_flat(40).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,20,330,CHORD)_flat(40).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,330,PIE)_flat(10).shape (revision 0) @@ -0,0 +1,19 @@ +move 437.93853759765625 181.59597778320312 +line 401.1070251464844 118.93155670166016 +line 346.19775390625 74.65464782714844 +line 279.3522644042969 52.13460922241211 +line 206.7120819091797 54.74079895019531 +line 139.7762908935547 83.0778579711914 +line 88.7110824584961 131.73806762695312 +line 57.65861511230469 195.07223510742188 +line 50.76105880737305 267.43115234375 +line 70.11882019042969 337.4930114746094 +line 111.6973876953125 394.4727783203125 +line 170.43655395507812 433.5263671875 +line 241.276123046875 449.80963134765625 +line 313.2652893066406 439.76239013671875 +line 375.1846923828125 405.9768981933594 +line 421.5711669921875 352.8377685546875 +line 446.9615478515625 284.7296447753906 +line 250.0 250.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,0,60,OPEN).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,0,60,OPEN).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,PIE)_affine(1,2,2,1,0,0).shape (revision 0) @@ -0,0 +1,4 @@ +move 469.4893798828125 574.6513671875 +cubic 649.3861083984375 711.3908081054688 866.2109375 819.80322265625 983.719482421875 831.7664184570312 +line 650.0 550.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\round(50,50,200,400,100,140)_affine(1,0,0,1,30,20).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,400,40,-80,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,400,40,-80,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(50,50,150,200,300,320,200,100).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(50,50,150,200,300,320,200,100).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).shape (revision 0) @@ -0,0 +1,3 @@ +move 450.0 150.0 +cubic 450.0 185.7265625 411.8802185058594 218.7392578125 350.0 236.6025390625 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).shape (revision 0) @@ -0,0 +1,6 @@ +move 200.0 63.3974609375 +cubic 247.8292694091797 91.0116958618164 264.2167663574219 152.1707305908203 236.6025390625 200.0 +cubic 208.98829650878906 247.8292694091797 147.8292694091797 264.2167663574219 100.0 236.6025390625 +cubic 52.170738220214844 208.98829650878906 35.78322219848633 147.8292694091797 63.3974609375 100.0 +cubic 91.0116958618164 52.170738220214844 152.1707305908203 35.78322219848633 200.0 63.3974609375 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).shape (revision 0) @@ -0,0 +1,2 @@ +move 450.0 100.0 +cubic 50.0 250.0 150.0 50.0 300.0 250.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/rect(50,50,200,100)_affine(1,0,0,1,20,30).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\rect(50,50,200,100)_affine(1,0,0,1,20,30).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,100,200,PIE)_flat(20).shape (revision 0) @@ -0,0 +1,7 @@ +move 132.6351776123047 51.51922607421875 +line 63.3974609375 100.0 +line 56.030738830566406 184.20201110839844 +line 115.79798889160156 243.96926879882812 +line 200.0 236.6025390625 +line 150.0 150.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,20,-330,OPEN).shape (revision 0) @@ -0,0 +1,5 @@ +move 437.93853759765625 181.59597778320312 +cubic 472.26580810546875 275.90936279296875 431.3756408691406 381.0581970214844 342.3497314453125 427.40216064453125 +cubic 253.32379150390625 473.7461242675781 143.73728942871094 446.93048095703125 86.16959381103516 364.7153015136719 +cubic 28.60188865661621 282.5000915527344 40.884212493896484 170.35096740722656 114.8819580078125 102.5445327758789 +cubic 188.87969970703125 34.738094329833984 301.67254638671875 32.27694320678711 378.5575256347656 96.7911148071289 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,450,-730,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,400,450,-730,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,400,-50,170,CHORD).shape (revision 0) @@ -0,0 +1,4 @@ +move 378.5575256347656 403.2088928222656 +cubic 457.9971008300781 336.5511779785156 473.31085205078125 220.23159790039062 413.8304138183594 135.2847137451172 +cubic 354.3499755859375 50.33782958984375 239.8076934814453 24.944421768188477 150.0 76.794921875 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,400,200,0,-60,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,400,200,0,-60,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/ellipse(50,50,200,100)_flat(5).shape (revision 0) @@ -0,0 +1,18 @@ +move 250.0 100.0 +line 242.14151000976562 119.4622573852539 +line 220.71067810058594 135.3553466796875 +line 188.9245147705078 146.0707550048828 +line 150.0 150.0 +line 111.07548522949219 146.0707550048828 +line 79.28932189941406 135.3553466796875 +line 57.85849380493164 119.4622573852539 +line 50.0 100.0 +line 57.85849380493164 80.5377426147461 +line 79.28932189941406 64.64466094970703 +line 111.07548522949219 53.92924880981445 +line 150.0 50.0 +line 188.9245147705078 53.92924880981445 +line 220.71067810058594 64.64466094970703 +line 242.14151000976562 80.5377426147461 +line 250.0 100.0 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,-300,-361,CHORD).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\arc(50,50,200,200,-300,-361,CHORD).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/arc(50,50,200,200,200,359,CHORD).shape (revision 0) @@ -0,0 +1,6 @@ +move 56.030738830566406 184.20201110839844 +cubic 74.86173248291016 235.93975830078125 131.97225952148438 262.7226867675781 183.7916717529297 244.1175994873047 +cubic 235.611083984375 225.5125274658203 262.6429443359375 168.5194091796875 244.26414489746094 116.61931610107422 +cubic 225.88536071777344 64.7192153930664 169.01072692871094 37.43893814086914 117.03093719482422 55.59109878540039 +cubic 65.05113983154297 73.74325561523438 37.5229606628418 130.49830627441406 55.448143005371094 182.5568084716797 +close Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).shape =================================================================== --- modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).shape (revision 0) +++ modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(300,50,50,200,300,50,350,150).shape (revision 0) @@ -0,0 +1,2 @@ +move 300.0 50.0 +cubic 50.0 200.0 300.0 50.0 350.0 150.0 Index: modules/awt/src/test/api/resources/shapes/java/awt/geom/cubic(450,100,50,250,150,50,300,250).ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\shapes\java\awt\geom\cubic(450,100,50,250,150,50,300,250).ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Polygon[0 [0,0,0,0] () ()].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Polygon[0 [0,0,0,0] () ()].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Polygon[3 [1,4,2,2] (1,2,3) (4,5,6)].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Polygon[3 [1,4,2,2] (1,2,3) (4,5,6)].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=0,y=0,width=0,height=0].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Rectangle[x=0,y=0,width=0,height=0].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Dimension[width=1,height=2].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Dimension[width=1,height=2].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=0,y=0,width=1,height=2].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Rectangle[x=0,y=0,width=1,height=2].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/geom/java.awt.geom.AffineTransform[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\geom\java.awt.geom.AffineTransform[[1.0, 0.0, 0.0], [0.0, 1.0, 0.0]].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/geom/java.awt.geom.AffineTransform[[1.0, 3.0, 5.0], [2.0, 4.0, 6.0]].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\geom\java.awt.geom.AffineTransform[[1.0, 3.0, 5.0], [2.0, 4.0, 6.0]].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Point[x=0,y=0].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Point[x=0,y=0].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Rectangle[x=1,y=2,width=3,height=4].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Rectangle[x=1,y=2,width=3,height=4].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Point[x=1,y=2].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Point[x=1,y=2].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/src/test/api/resources/serialization/java/awt/java.awt.Dimension[width=0,height=0].ser =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: modules\awt\src\test\api\resources\serialization\java\awt\java.awt.Dimension[width=0,height=0].ser ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: modules/awt/build.xml =================================================================== --- modules/awt/build.xml (revision 454346) +++ modules/awt/build.xml (working copy) @@ -52,7 +52,7 @@ - + @@ -220,29 +220,9 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -272,11 +252,6 @@ - - - - - @@ -327,6 +302,12 @@ + + + + + + @@ -350,4 +331,13 @@ append="true">awt${line.separator} + + + + + + + + +