/hg/gfx-test: Added two new class to compile into Makefile. Adde...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Feb 28 02:05:21 PST 2013
changeset 406c7bcb1337 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=406c7bcb1337
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Feb 28 11:08:30 2013 +0100
Added two new class to compile into Makefile. Added new class containing callback methods. Refactoring of other classes.
diffstat:
ChangeLog | 13 +
Makefile | 4 +-
src/org/gfxtest/callbacks/CommonArcDrawCallbacks.java | 102 +++++++++++++++
src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java | 2 +-
src/org/gfxtest/testsuites/PrintTestArcs.java | 60 +--------
src/org/gfxtest/testsuites/PrintTestColorPaint.java | 1 +
6 files changed, 121 insertions(+), 61 deletions(-)
diffs (254 lines):
diff -r 779aa3c435fa -r 406c7bcb1337 ChangeLog
--- a/ChangeLog Wed Feb 27 09:50:21 2013 +0100
+++ b/ChangeLog Thu Feb 28 11:08:30 2013 +0100
@@ -1,3 +1,16 @@
+2013-02-28 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile:
+ Added two new class to compile.
+ * src/org/gfxtest/callbacks/CommonArcDrawCallbacks.java:
+ Added new class containing callback methods.
+ * src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java:
+ Fixed indentation.
+ * src/org/gfxtest/testsuites/PrintTestArcs.java:
+ Refactored to use new CommonArcDrawCallbacks class.
+ * src/org/gfxtest/testsuites/PrintTestColorPaint.java:
+ Added missing import.
+
2013-02-27 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/testsuites/BitBltRescaleOp.java:
diff -r 779aa3c435fa -r 406c7bcb1337 Makefile
--- a/Makefile Wed Feb 27 09:50:21 2013 +0100
+++ b/Makefile Thu Feb 28 11:08:30 2013 +0100
@@ -1,6 +1,6 @@
# Java gfx-test framework
#
-# Copyright (C) 2010, 2011, 2012 Red Hat
+# Copyright (C) 2010, 2011, 2012, 2013 Red Hat
#
# This file is part of IcedTea.
#
@@ -90,6 +90,7 @@
$(CLASSES)/$(FRAMEWORK_DIR)/ColorPalette.class \
$(CLASSES)/$(FRAMEWORK_DIR)/GrayscalePalette.class \
$(CLASSES)/$(FRAMEWORK_DIR)/HSBPalette.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/BitBltOperations.class \
$(CLASSES)/$(FRAMEWORK_DIR)/CommonAreaOperations.class \
$(CLASSES)/$(FRAMEWORK_DIR)/CommonCAGOperations.class \
$(CLASSES)/$(FRAMEWORK_DIR)/CommonRenderingStyles.class \
@@ -111,6 +112,7 @@
$(CLASSES)/$(FRAMEWORK_DIR)/PostScriptToPngConverter.class \
$(CLASSES)/$(FRAMEWORK_DIR)/PrintJobWatcher.class \
$(CLASSES)/$(CALLBACKS_DIR)/CommonCallbacks.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/CommonArcDrawCallbacks.class \
$(CLASSES)/$(CALLBACKS_DIR)/CommonCircleDrawCallbacks.class \
$(CLASSES)/$(CALLBACKS_DIR)/CommonCurveDrawCallbacks.class \
$(CLASSES)/$(CALLBACKS_DIR)/CommonEllipseDrawCallbacks.class \
diff -r 779aa3c435fa -r 406c7bcb1337 src/org/gfxtest/callbacks/CommonArcDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/CommonArcDrawCallbacks.java Thu Feb 28 11:08:30 2013 +0100
@@ -0,0 +1,102 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2013 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.callbacks;
+
+
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+
+
+import org.gfxtest.framework.TestImage;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered arc.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class CommonArcDrawCallbacks extends CommonCallbacks
+{
+ /**
+ * Setup phase. @see CommonCallbacks#setup(TestImage, Graphics2D)
+ *
+ * @param image
+ * image to which arcs are to be drawn
+ * @param graphics2d
+ * graphics canvas
+ */
+ @Override
+ public void setup(TestImage image, Graphics2D graphics)
+ {
+ this.image = image;
+ this.graphics = graphics;
+ // set drawing color
+ graphics.setColor(Color.BLACK);
+ }
+
+ /**
+ * This method is called for each rendered horizontal arc.
+ *
+ * @param x
+ * horizontal coordinate of a arc center
+ * @param y
+ * vertical coordinate of a arc center
+ * @param radius
+ * arc radius
+ * @param maxRadius
+ * maximum allowable arc radius
+ * @param colorIndex
+ * color index
+ */
+ public abstract void iterationCallBack(int x, int y, int radius, int maxRadius, int colorIndex);
+
+ /**
+ * Cleanup phase. {@see CommonCallbacks#cleanup()}
+ */
+ @Override
+ public void cleanup()
+ {
+ return;
+ }
+}
diff -r 779aa3c435fa -r 406c7bcb1337 src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java
--- a/src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java Wed Feb 27 09:50:21 2013 +0100
+++ b/src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java Thu Feb 28 11:08:30 2013 +0100
@@ -36,7 +36,7 @@
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
- */
+*/
package org.gfxtest.callbacks;
diff -r 779aa3c435fa -r 406c7bcb1337 src/org/gfxtest/testsuites/PrintTestArcs.java
--- a/src/org/gfxtest/testsuites/PrintTestArcs.java Wed Feb 27 09:50:21 2013 +0100
+++ b/src/org/gfxtest/testsuites/PrintTestArcs.java Thu Feb 28 11:08:30 2013 +0100
@@ -41,11 +41,11 @@
package org.gfxtest.testsuites;
import java.awt.BasicStroke;
-import java.awt.Color;
import java.awt.Graphics2D;
+import org.gfxtest.callbacks.CommonArcDrawCallbacks;
import org.gfxtest.framework.ColorPalette;
import org.gfxtest.framework.GrayscalePalette;
import org.gfxtest.framework.HSBPalette;
@@ -1373,61 +1373,3 @@
new PrintTestArcs().runTestSuite(args);
}
}
-
-/**
- * Class representing set of callback methods called for each rendered arc.
- *
- * @author Pavel Tisnovsky
- */
-abstract class CommonArcDrawCallbacks
-{
- /**
- * Image to which arcs are to be drawn.
- */
- protected TestImage image;
-
- /**
- * Graphics canvas.
- */
- protected Graphics2D graphics;
-
- /**
- * Setup phase.
- *
- * @param image
- * image to which arcs are to be drawn
- * @param graphics2d
- * graphics canvas
- */
- public void setup(TestImage image, Graphics2D graphics)
- {
- this.image = image;
- this.graphics = graphics;
- // set drawing color
- graphics.setColor(Color.BLACK);
- }
-
- /**
- * This method is called for each rendered horizontal arc.
- *
- * @param x
- * horizontal coordinate of a arc center
- * @param y
- * vertical coordinate of a arc center
- * @param radius
- * arc radius
- * @param maxRadius
- * maximum allowable arc radius
- * @param colorIndex
- * color index
- */
- public abstract void iterationCallBack(int x, int y, int radius, int maxRadius, int colorIndex);
-
- /**
- * Cleanup phase.
- */
- public void cleanup()
- {
- return;
- }
-}
diff -r 779aa3c435fa -r 406c7bcb1337 src/org/gfxtest/testsuites/PrintTestColorPaint.java
--- a/src/org/gfxtest/testsuites/PrintTestColorPaint.java Wed Feb 27 09:50:21 2013 +0100
+++ b/src/org/gfxtest/testsuites/PrintTestColorPaint.java Thu Feb 28 11:08:30 2013 +0100
@@ -44,6 +44,7 @@
+import org.gfxtest.callbacks.CommonArcDrawCallbacks;
import org.gfxtest.callbacks.CommonCircleDrawCallbacks;
import org.gfxtest.callbacks.DiagonalLineDrawCallbacks;
import org.gfxtest.callbacks.HorizontalLineDrawCallbacks;
More information about the distro-pkg-dev
mailing list