deweese 02/02/06 09:52:37
Modified: sources/org/apache/batik/gvt CompositeShapePainter.java
FillShapePainter.java MarkerShapePainter.java
ShapeNode.java ShapePainter.java
StrokeShapePainter.java
Log:
Renamed getPaintedBounds to getPaintedBounds2D
Revision Changes Path
1.13 +2 -2
xml-batik/sources/org/apache/batik/gvt/CompositeShapePainter.java
Index: CompositeShapePainter.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/gvt/CompositeShapePainter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CompositeShapePainter.java 6 Feb 2002 13:18:33 -0000 1.12
+++ CompositeShapePainter.java 6 Feb 2002 17:52:36 -0000 1.13
@@ -21,7 +21,7 @@
* A shape painter which consists of multiple shape painters.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: CompositeShapePainter.java,v 1.12 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: CompositeShapePainter.java,v 1.13 2002/02/06 17:52:36 deweese Exp $
*/
public class CompositeShapePainter implements ShapePainter {
@@ -123,7 +123,7 @@
/**
* Returns the bounds of the area painted by this shape painter
*/
- public Rectangle2D getPaintedBounds(){
+ public Rectangle2D getPaintedBounds2D(){
if (painters != null) {
GeneralPath paintedArea = new GeneralPath();
for (int i=0; i < count; ++i) {
1.9 +2 -2 xml-batik/sources/org/apache/batik/gvt/FillShapePainter.java
Index: FillShapePainter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/FillShapePainter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FillShapePainter.java 6 Feb 2002 13:18:33 -0000 1.8
+++ FillShapePainter.java 6 Feb 2002 17:52:37 -0000 1.9
@@ -17,7 +17,7 @@
* A shape painter that can be used to fill a shape.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: FillShapePainter.java,v 1.8 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: FillShapePainter.java,v 1.9 2002/02/06 17:52:37 deweese Exp $
*/
public class FillShapePainter implements ShapePainter {
@@ -76,7 +76,7 @@
/**
* Returns the bounds of the area painted by this shape painter
*/
- public Rectangle2D getPaintedBounds(){
+ public Rectangle2D getPaintedBounds2D(){
if (shape != null){
return shape.getBounds2D();
} else {
1.7 +8 -8 xml-batik/sources/org/apache/batik/gvt/MarkerShapePainter.java
Index: MarkerShapePainter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/MarkerShapePainter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MarkerShapePainter.java 6 Feb 2002 13:18:33 -0000 1.6
+++ MarkerShapePainter.java 6 Feb 2002 17:52:37 -0000 1.7
@@ -23,7 +23,7 @@
* A shape painter that can be used to paint markers on a shape.
*
* @author <a href="[EMAIL PROTECTED]">Vincent Hardy</a>
- * @version $Id: MarkerShapePainter.java,v 1.6 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: MarkerShapePainter.java,v 1.7 2002/02/06 17:52:37 deweese Exp $
*/
public class MarkerShapePainter implements ShapePainter {
@@ -119,13 +119,13 @@
/**
* Returns the bounds of the area painted by this shape painter
*/
- public Rectangle2D getPaintedBounds(){
- Shape shape = getPaintedArea();
- if (shape != null){
- return shape.getBounds2D();
- } else {
- return null;
- }
+ public Rectangle2D getPaintedBounds2D(){
+ Shape shape = getPaintedArea();
+ if (shape != null){
+ return shape.getBounds2D();
+ } else {
+ return null;
+ }
}
/**
1.15 +2 -2 xml-batik/sources/org/apache/batik/gvt/ShapeNode.java
Index: ShapeNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/ShapeNode.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ShapeNode.java 6 Feb 2002 13:18:33 -0000 1.14
+++ ShapeNode.java 6 Feb 2002 17:52:37 -0000 1.15
@@ -20,7 +20,7 @@
* A graphics node that represents a shape.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: ShapeNode.java,v 1.14 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: ShapeNode.java,v 1.15 2002/02/06 17:52:37 deweese Exp $
*/
public class ShapeNode extends AbstractGraphicsNode {
@@ -221,7 +221,7 @@
}
// paintedArea = shapePainter.getPaintedArea();
// primitiveBounds = paintedArea.getBounds2D();
- primitiveBounds = shapePainter.getPaintedBounds();
+ primitiveBounds = shapePainter.getPaintedBounds2D();
// Make sure we haven't been interrupted
if (Thread.currentThread().isInterrupted()) {
1.10 +2 -2 xml-batik/sources/org/apache/batik/gvt/ShapePainter.java
Index: ShapePainter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/ShapePainter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ShapePainter.java 6 Feb 2002 13:18:33 -0000 1.9
+++ ShapePainter.java 6 Feb 2002 17:52:37 -0000 1.10
@@ -16,7 +16,7 @@
* Renders the shape of a <tt>ShapeNode</tt>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: ShapePainter.java,v 1.9 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: ShapePainter.java,v 1.10 2002/02/06 17:52:37 deweese Exp $
*/
public interface ShapePainter {
@@ -35,7 +35,7 @@
/**
* Returns the bounds of the area painted by this shape painter
*/
- Rectangle2D getPaintedBounds();
+ Rectangle2D getPaintedBounds2D();
/**
* Sets the Shape this shape painter is associated with.
1.10 +8 -8 xml-batik/sources/org/apache/batik/gvt/StrokeShapePainter.java
Index: StrokeShapePainter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/StrokeShapePainter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StrokeShapePainter.java 6 Feb 2002 13:18:33 -0000 1.9
+++ StrokeShapePainter.java 6 Feb 2002 17:52:37 -0000 1.10
@@ -18,7 +18,7 @@
* A shape painter that can be used to draw the outline of a shape.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thierry Kormann</a>
- * @version $Id: StrokeShapePainter.java,v 1.9 2002/02/06 13:18:33 vhardy Exp $
+ * @version $Id: StrokeShapePainter.java,v 1.10 2002/02/06 17:52:37 deweese Exp $
*/
public class StrokeShapePainter implements ShapePainter {
@@ -96,13 +96,13 @@
/**
* Returns the bounds of the area painted by this shape painter
*/
- public Rectangle2D getPaintedBounds(){
- Shape painted = getPaintedArea();
- if (painted != null){
- return painted.getBounds2D();
- } else {
- return null;
- }
+ public Rectangle2D getPaintedBounds2D(){
+ Shape painted = getPaintedArea();
+ if (painted != null){
+ return painted.getBounds2D();
+ } else {
+ return null;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
