You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ga...@apache.org on 2015/04/01 16:35:46 UTC
svn commit: r1670661 [5/5] - in /xmlgraphics/batik/branches/text-background:
./ lib/ resources/META-INF/services/ resources/org/apache/batik/anim/dom/
resources/org/apache/batik/apps/rasterizer/resources/
resources/org/apache/batik/apps/svgbrowser/reso...
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPathSegList.java Wed Apr 1 14:35:42 2015
@@ -26,7 +26,6 @@ import org.w3c.dom.svg.SVGException;
import org.w3c.dom.svg.SVGPathSeg;
import org.w3c.dom.svg.SVGPathSegArcAbs;
import org.w3c.dom.svg.SVGPathSegArcRel;
-import org.w3c.dom.svg.SVGPathSegClosePath;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicAbs;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicRel;
import org.w3c.dom.svg.SVGPathSegCurvetoCubicSmoothAbs;
@@ -225,60 +224,6 @@ public abstract class AbstractSVGPathSeg
return pathSegItem;
}
- /**
- * Internal representation of the item SVGPathSeg.
- */
- protected class SVGPathSegItem extends AbstractSVGItem
- implements SVGPathSeg,
- SVGPathSegClosePath {
-
- protected short type;
-
- protected String letter;
-
- protected float x;
- protected float y;
- protected float x1;
- protected float y1;
- protected float x2;
- protected float y2;
- protected float r1;
- protected float r2;
- protected float angle;
- protected boolean largeArcFlag;
- protected boolean sweepFlag;
-
- protected SVGPathSegItem(){}
-
- public SVGPathSegItem(short type,String letter){
- this.type = type;
- this.letter = letter;
- }
-
- public SVGPathSegItem(SVGPathSeg pathSeg){
- type = pathSeg.getPathSegType();
- switch(type){
- case SVGPathSeg.PATHSEG_CLOSEPATH:
- letter = PATHSEG_CLOSEPATH_LETTER;
- break;
- default:
- }
- }
- protected String getStringValue(){
- return letter;
- }
-
- public short getPathSegType() {
- return type;
- }
-
-
- public String getPathSegTypeAsLetter(){
- return letter;
- }
-
- }
-
public class SVGPathSegMovetoLinetoItem extends SVGPathSegItem
implements SVGPathSegMovetoAbs,
SVGPathSegMovetoRel,
@@ -288,8 +233,8 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegMovetoLinetoItem(short type, String letter,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
+ this.setX(x);
+ this.setY(y);
}
public SVGPathSegMovetoLinetoItem(SVGPathSeg pathSeg){
@@ -297,50 +242,43 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_LINETO_REL:
letter = PATHSEG_LINETO_REL_LETTER;
- x = ((SVGPathSegLinetoRel)pathSeg).getX();
- y = ((SVGPathSegLinetoRel)pathSeg).getY();
+ setX(((SVGPathSegLinetoRel)pathSeg).getX());
+ setY(((SVGPathSegLinetoRel)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_LINETO_ABS:
letter = PATHSEG_LINETO_ABS_LETTER;
- x = ((SVGPathSegLinetoAbs)pathSeg).getX();
- y = ((SVGPathSegLinetoAbs)pathSeg).getY();
+ setX(((SVGPathSegLinetoAbs)pathSeg).getX());
+ setY(((SVGPathSegLinetoAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_MOVETO_REL:
letter = PATHSEG_MOVETO_REL_LETTER;
- x = ((SVGPathSegMovetoRel)pathSeg).getX();
- y = ((SVGPathSegMovetoRel)pathSeg).getY();
+ setX(((SVGPathSegMovetoRel)pathSeg).getX());
+ setY(((SVGPathSegMovetoRel)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_MOVETO_ABS:
letter = PATHSEG_MOVETO_ABS_LETTER;
- x = ((SVGPathSegMovetoAbs)pathSeg).getX();
- y = ((SVGPathSegMovetoAbs)pathSeg).getY();
+ setX(((SVGPathSegMovetoAbs)pathSeg).getX());
+ setY(((SVGPathSegMovetoAbs)pathSeg).getY());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -352,12 +290,12 @@ public abstract class AbstractSVGPathSeg
float x1,float y1,float x2, float y2,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x1 = x1;
- this.y1 = y1;
- this.x2 = x2;
- this.y2 = y2;
+ this.setX(x);
+ this.setY(y);
+ this.setX1(x1);
+ this.setY1(y1);
+ this.setX2(x2);
+ this.setY2(y2);
}
public SVGPathSegCurvetoCubicItem(SVGPathSeg pathSeg){
@@ -365,88 +303,67 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS:
letter = PATHSEG_CURVETO_CUBIC_ABS_LETTER;
- x = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX1();
- y1 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY1();
- x2 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicAbs)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicAbs)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoCubicAbs)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoCubicAbs)pathSeg).getY1());
+ setX2(((SVGPathSegCurvetoCubicAbs)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicAbs)pathSeg).getY2());
break;
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL:
letter = PATHSEG_CURVETO_CUBIC_REL_LETTER;
- x = ((SVGPathSegCurvetoCubicRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicRel)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoCubicRel)pathSeg).getX1();
- y1 = ((SVGPathSegCurvetoCubicRel)pathSeg).getY1();
- x2 = ((SVGPathSegCurvetoCubicRel)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicRel)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicRel)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoCubicRel)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoCubicRel)pathSeg).getY1());
+ setX2(((SVGPathSegCurvetoCubicRel)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicRel)pathSeg).getY2());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX1(){
- return x1;
- }
- public float getY1(){
- return y1;
- }
-
public void setX1(float x1){
- this.x1 = x1;
+ super.setX1(x1);
resetAttribute();
}
public void setY1(float y1){
- this.y1 = y1;
+ super.setY1(y1);
resetAttribute();
}
- public float getX2(){
- return x2;
- }
- public float getY2(){
- return y2;
- }
-
public void setX2(float x2){
- this.x2 = x2;
+ super.setX2(x2);
resetAttribute();
}
public void setY2(float y2){
- this.y2 = y2;
+ super.setY2(y2);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x1)
+ + Float.toString(getX1())
+ ' '
- + Float.toString(y1)
+ + Float.toString(getY1())
+ ' '
- + Float.toString(x2)
+ + Float.toString(getX2())
+ ' '
- + Float.toString(y2)
+ + Float.toString(getY2())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -457,10 +374,10 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoQuadraticItem(short type,String letter,
float x1,float y1,float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x1 = x1;
- this.y1 = y1;
+ this.setX(x);
+ this.setY(y);
+ this.setX1(x1);
+ this.setY1(y1);
}
public SVGPathSegCurvetoQuadraticItem(SVGPathSeg pathSeg){
@@ -468,52 +385,38 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_ABS:
letter = PATHSEG_CURVETO_QUADRATIC_ABS_LETTER;
- x = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX1();
- y1= ((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY1();
+ setX(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoQuadraticAbs)pathSeg).getY1());
break;
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_REL:
letter = PATHSEG_CURVETO_QUADRATIC_REL_LETTER;
- x = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getY();
- x1 = ((SVGPathSegCurvetoQuadraticRel)pathSeg).getX1();
- y1= ((SVGPathSegCurvetoQuadraticRel)pathSeg).getY1();
+ setX(((SVGPathSegCurvetoQuadraticRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticRel)pathSeg).getY());
+ setX1(((SVGPathSegCurvetoQuadraticRel)pathSeg).getX1());
+ setY1(((SVGPathSegCurvetoQuadraticRel)pathSeg).getY1());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX1(){
- return x1;
- }
- public float getY1(){
- return y1;
- }
-
public void setX1(float x1){
- this.x1 = x1;
+ super.setX1(x1);
resetAttribute();
}
public void setY1(float y1){
- this.y1 = y1;
+ super.setY1(y1);
resetAttribute();
}
@@ -521,13 +424,13 @@ public abstract class AbstractSVGPathSeg
return letter
+ ' '
- + Float.toString(x1)
+ + Float.toString(getX1())
+ ' '
- + Float.toString(y1)
+ + Float.toString(getY1())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -540,13 +443,13 @@ public abstract class AbstractSVGPathSeg
boolean largeArcFlag, boolean sweepFlag,
float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.r1 = r1;
- this.r2 = r2;
- this.angle = angle;
- this.largeArcFlag = largeArcFlag;
- this.sweepFlag = sweepFlag;
+ this.setX(x);
+ this.setY(y);
+ this.setR1(r1);
+ this.setR2(r2);
+ this.setAngle(angle);
+ this.setLargeArcFlag(largeArcFlag);
+ this.setSweepFlag(sweepFlag);
}
public SVGPathSegArcItem(SVGPathSeg pathSeg){
@@ -554,103 +457,85 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_ARC_ABS:
letter = PATHSEG_ARC_ABS_LETTER;
- x = ((SVGPathSegArcAbs)pathSeg).getX();
- y = ((SVGPathSegArcAbs)pathSeg).getY();
- r1 = ((SVGPathSegArcAbs)pathSeg).getR1();
- r2 = ((SVGPathSegArcAbs)pathSeg).getR2();
- angle = ((SVGPathSegArcAbs)pathSeg).getAngle();
- largeArcFlag = ((SVGPathSegArcAbs)pathSeg).getLargeArcFlag();
- sweepFlag = ((SVGPathSegArcAbs)pathSeg).getSweepFlag();
+ setX(((SVGPathSegArcAbs)pathSeg).getX());
+ setY(((SVGPathSegArcAbs)pathSeg).getY());
+ setR1(((SVGPathSegArcAbs)pathSeg).getR1());
+ setR2(((SVGPathSegArcAbs)pathSeg).getR2());
+ setAngle(((SVGPathSegArcAbs)pathSeg).getAngle());
+ setLargeArcFlag(((SVGPathSegArcAbs)pathSeg).getLargeArcFlag());
+ setSweepFlag(((SVGPathSegArcAbs)pathSeg).getSweepFlag());
break;
case SVGPathSeg.PATHSEG_ARC_REL:
letter = PATHSEG_ARC_REL_LETTER;
- x = ((SVGPathSegArcRel)pathSeg).getX();
- y = ((SVGPathSegArcRel)pathSeg).getY();
- r1 = ((SVGPathSegArcRel)pathSeg).getR1();
- r2 = ((SVGPathSegArcRel)pathSeg).getR2();
- angle = ((SVGPathSegArcRel)pathSeg).getAngle();
- largeArcFlag = ((SVGPathSegArcRel)pathSeg).getLargeArcFlag();
- sweepFlag = ((SVGPathSegArcRel)pathSeg).getSweepFlag();
+ setX(((SVGPathSegArcRel)pathSeg).getX());
+ setY(((SVGPathSegArcRel)pathSeg).getY());
+ setR1(((SVGPathSegArcRel)pathSeg).getR1());
+ setR2(((SVGPathSegArcRel)pathSeg).getR2());
+ setAngle(((SVGPathSegArcRel)pathSeg).getAngle());
+ setLargeArcFlag(((SVGPathSegArcRel)pathSeg).getLargeArcFlag());
+ setSweepFlag(((SVGPathSegArcRel)pathSeg).getSweepFlag());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getR1(){
- return r1;
- }
- public float getR2(){
- return r2;
- }
-
public void setR1(float r1){
- this.r1 = r1;
+ super.setR1(r1);
resetAttribute();
}
public void setR2(float r2){
- this.r2 = r2;
+ super.setR2(r2);
resetAttribute();
}
- public float getAngle(){
- return angle;
- }
-
public void setAngle(float angle){
- this.angle = angle;
+ super.setAngle(angle);
resetAttribute();
}
public boolean getSweepFlag(){
- return sweepFlag;
+ return isSweepFlag();
}
public void setSweepFlag(boolean sweepFlag){
- this.sweepFlag = sweepFlag;
+ super.setSweepFlag(sweepFlag);
resetAttribute();
}
public boolean getLargeArcFlag(){
- return largeArcFlag;
+ return isLargeArcFlag();
}
public void setLargeArcFlag(boolean largeArcFlag){
- this.largeArcFlag = largeArcFlag;
+ super.setLargeArcFlag(largeArcFlag);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(r1)
+ + Float.toString(getR1())
+ ' '
- + Float.toString(r2)
+ + Float.toString(getR2())
+ ' '
- + Float.toString(angle)
+ + Float.toString(getAngle())
+ ' '
- + ((largeArcFlag?"1":"0"))
+ + ((isLargeArcFlag()?"1":"0"))
+ ' '
- + ((sweepFlag?"1":"0"))
+ + ((isSweepFlag()?"1":"0"))
+ (' ')
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -662,36 +547,32 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegLinetoHorizontalItem(short type, String letter,
float value){
super(type,letter);
- this.x = value;
+ this.setX(value);
}
public SVGPathSegLinetoHorizontalItem(SVGPathSeg pathSeg){
this.type = pathSeg.getPathSegType();
switch(type){
case SVGPathSeg.PATHSEG_LINETO_HORIZONTAL_ABS:
letter = PATHSEG_LINETO_HORIZONTAL_ABS_LETTER;
- x = ((SVGPathSegLinetoHorizontalAbs)pathSeg).getX();
+ setX(((SVGPathSegLinetoHorizontalAbs)pathSeg).getX());
break;
case SVGPathSeg.PATHSEG_LINETO_HORIZONTAL_REL:
letter = PATHSEG_LINETO_HORIZONTAL_REL_LETTER;
- x = ((SVGPathSegLinetoHorizontalRel)pathSeg).getX();
+ setX(((SVGPathSegLinetoHorizontalRel)pathSeg).getX());
break;
default:
}
}
- public float getX(){
- return x;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x);
+ + Float.toString(getX());
}
}
@@ -703,7 +584,7 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegLinetoVerticalItem(short type, String letter,
float value){
super(type,letter);
- this.y = value;
+ this.setY(value);
}
public SVGPathSegLinetoVerticalItem(SVGPathSeg pathSeg){
@@ -711,29 +592,25 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_LINETO_VERTICAL_ABS:
letter = PATHSEG_LINETO_VERTICAL_ABS_LETTER;
- y = ((SVGPathSegLinetoVerticalAbs)pathSeg).getY();
+ setY(((SVGPathSegLinetoVerticalAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_LINETO_VERTICAL_REL:
letter = PATHSEG_LINETO_VERTICAL_REL_LETTER;
- y = ((SVGPathSegLinetoVerticalRel)pathSeg).getY();
+ setY(((SVGPathSegLinetoVerticalRel)pathSeg).getY());
break;
default:
}
}
- public float getY(){
- return y;
- }
-
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -744,10 +621,10 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoCubicSmoothItem(short type,String letter,
float x2,float y2,float x, float y ){
super(type,letter);
- this.x = x;
- this.y = y;
- this.x2 = x2;
- this.y2 = y2;
+ this.setX(x);
+ this.setY(y);
+ this.setX2(x2);
+ this.setY2(y2);
}
public SVGPathSegCurvetoCubicSmoothItem(SVGPathSeg pathSeg){
@@ -755,64 +632,50 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
letter = PATHSEG_CURVETO_CUBIC_SMOOTH_ABS_LETTER;
- x = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY();
- x2 = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY());
+ setX2(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicSmoothAbs)pathSeg).getY2());
break;
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
letter = PATHSEG_CURVETO_CUBIC_SMOOTH_REL_LETTER;
- x = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY();
- x2 = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX2();
- y2 = ((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY2();
+ setX(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY());
+ setX2(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getX2());
+ setY2(((SVGPathSegCurvetoCubicSmoothRel)pathSeg).getY2());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
- public float getX2(){
- return x2;
- }
- public float getY2(){
- return y2;
- }
-
public void setX2(float x2){
- this.x2 = x2;
+ super.setX2(x2);
resetAttribute();
}
public void setY2(float y2){
- this.y2 = y2;
+ super.setY2(y2);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x2)
+ + Float.toString(getX2())
+ ' '
- + Float.toString(y2)
+ + Float.toString(getY2())
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
@@ -823,8 +686,8 @@ public abstract class AbstractSVGPathSeg
public SVGPathSegCurvetoQuadraticSmoothItem(short type, String letter,
float x, float y){
super(type,letter);
- this.x = x;
- this.y = y;
+ this.setX(x);
+ this.setY(y);
}
public SVGPathSegCurvetoQuadraticSmoothItem(SVGPathSeg pathSeg){
@@ -832,40 +695,33 @@ public abstract class AbstractSVGPathSeg
switch(type){
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
letter = PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS_LETTER;
- x = ((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getY();
+ setX(((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticSmoothAbs)pathSeg).getY());
break;
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
letter = PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL_LETTER;
- x = ((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getX();
- y = ((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getY();
+ setX(((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getX());
+ setY(((SVGPathSegCurvetoQuadraticSmoothRel)pathSeg).getY());
break;
default:
}
}
- public float getX(){
- return x;
- }
- public float getY(){
- return y;
- }
-
public void setX(float x){
- this.x = x;
+ super.setX(x);
resetAttribute();
}
public void setY(float y){
- this.y = y;
+ super.setY(y);
resetAttribute();
}
protected String getStringValue(){
return letter
+ ' '
- + Float.toString(x)
+ + Float.toString(getX())
+ ' '
- + Float.toString(y);
+ + Float.toString(getY());
}
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPointList.java Wed Apr 1 14:35:42 2015
@@ -23,7 +23,6 @@ import org.apache.batik.parser.PointsHan
import org.apache.batik.parser.PointsParser;
import org.w3c.dom.DOMException;
import org.w3c.dom.svg.SVGException;
-import org.w3c.dom.svg.SVGMatrix;
import org.w3c.dom.svg.SVGPoint;
import org.w3c.dom.svg.SVGPointList;
@@ -138,76 +137,6 @@ public abstract class AbstractSVGPointLi
}
}
- /**
- * An {@link SVGPoint} in the list.
- */
- protected class SVGPointItem extends AbstractSVGItem implements SVGPoint {
-
- /**
- * The x value.
- */
- protected float x;
-
- /**
- * The y value.
- */
- protected float y;
-
- /**
- * Creates a new SVGPointItem.
- */
- public SVGPointItem(float x, float y) {
- this.x = x;
- this.y = y;
- }
-
- /**
- * Return a String representation of this SVGPoint.
- */
- protected String getStringValue() {
- return Float.toString( x )
- + ','
- + Float.toString( y );
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#getX()}.
- */
- public float getX() {
- return x;
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#getY()}.
- */
- public float getY() {
- return y;
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#setX(float)}.
- */
- public void setX(float x) {
- this.x = x;
- resetAttribute();
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#setY(float)}.
- */
- public void setY(float y) {
- this.y = y;
- resetAttribute();
- }
-
- /**
- * <b>DOM</b>: Implements {@link SVGPoint#matrixTransform(SVGMatrix)}.
- */
- public SVGPoint matrixTransform(SVGMatrix matrix) {
- return SVGOMPoint.matrixTransform(this, matrix);
- }
- }
-
/**
* Helper class to interface the {@link PointsParser} and the
* {@link PointsHandler}.
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java Wed Apr 1 14:35:42 2015
@@ -152,7 +152,7 @@ public abstract class AbstractSVGPreserv
/**
* Returns the string representation of the preserve aspect ratio value.
*/
- protected String getValueAsString() {
+ public String getValueAsString() {
if (align < 1 || align > 10) {
throw createDOMException
(DOMException.INVALID_MODIFICATION_ERR,
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransform.java Wed Apr 1 14:35:42 2015
@@ -71,7 +71,7 @@ public abstract class AbstractSVGTransfo
/**
* Sets the type of transformation.
*/
- protected void setType(short type) {
+ public void setType(short type) {
this.type = type;
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/AbstractSVGTransformList.java Wed Apr 1 14:35:42 2015
@@ -192,7 +192,7 @@ public abstract class AbstractSVGTransfo
/**
* An {@link SVGTransform} in the list.
*/
- protected class SVGTransformItem
+ public class SVGTransformItem
extends AbstractSVGTransform
implements SVGItem {
@@ -222,13 +222,13 @@ public abstract class AbstractSVGTransfo
/**
* Creates a new, uninitialized SVGTransformItem.
*/
- protected SVGTransformItem() {
+ public SVGTransformItem() {
}
/**
* Creates a new SVGTransformItem from the given {@link SVGTransform}.
*/
- protected SVGTransformItem(SVGTransform transform) {
+ public SVGTransformItem(SVGTransform transform) {
assign(transform);
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/SVGOMAngle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/SVGOMAngle.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/SVGOMAngle.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/svg/SVGOMAngle.java Wed Apr 1 14:35:42 2015
@@ -36,7 +36,7 @@ public class SVGOMAngle implements SVGAn
/**
* The type of this angle.
*/
- protected short unitType;
+ private short unitType;
/**
* The value of this angle.
@@ -63,7 +63,7 @@ public class SVGOMAngle implements SVGAn
*/
public float getValue() {
revalidate();
- return toUnit(unitType, value, SVG_ANGLETYPE_DEG);
+ return toUnit(getUnitType(), value, SVG_ANGLETYPE_DEG);
}
/**
@@ -71,7 +71,7 @@ public class SVGOMAngle implements SVGAn
*/
public void setValue(float value) throws DOMException {
revalidate();
- this.unitType = SVG_ANGLETYPE_DEG;
+ this.setUnitType(SVG_ANGLETYPE_DEG);
this.value = value;
reset();
}
@@ -99,7 +99,7 @@ public class SVGOMAngle implements SVGAn
*/
public String getValueAsString() {
revalidate();
- return Float.toString(value) + UNITS[unitType];
+ return Float.toString(value) + UNITS[getUnitType()];
}
/**
@@ -115,7 +115,7 @@ public class SVGOMAngle implements SVGAn
* SVGAngle#newValueSpecifiedUnits(short,float)}.
*/
public void newValueSpecifiedUnits(short unit, float value) {
- unitType = unit;
+ setUnitType(unit);
this.value = value;
reset();
}
@@ -125,8 +125,8 @@ public class SVGOMAngle implements SVGAn
* SVGAngle#convertToSpecifiedUnits(short)}.
*/
public void convertToSpecifiedUnits(short unit) {
- value = toUnit(unitType, value, unit);
- unitType = unit;
+ value = toUnit(getUnitType(), value, unit);
+ setUnitType(unit);
}
/**
@@ -156,19 +156,19 @@ public class SVGOMAngle implements SVGAn
value = v;
}
public void deg() throws ParseException {
- unitType = SVG_ANGLETYPE_DEG;
+ setUnitType(SVG_ANGLETYPE_DEG);
}
public void rad() throws ParseException {
- unitType = SVG_ANGLETYPE_RAD;
+ setUnitType(SVG_ANGLETYPE_RAD);
}
public void grad() throws ParseException {
- unitType = SVG_ANGLETYPE_GRAD;
+ setUnitType(SVG_ANGLETYPE_GRAD);
}
});
- unitType = SVG_ANGLETYPE_UNSPECIFIED;
+ setUnitType(SVG_ANGLETYPE_UNSPECIFIED);
angleParser.parse(s);
} catch (ParseException e) {
- unitType = SVG_ANGLETYPE_UNKNOWN;
+ setUnitType(SVG_ANGLETYPE_UNKNOWN);
value = 0;
}
}
@@ -194,4 +194,8 @@ public class SVGOMAngle implements SVGAn
}
return (float) (K[fromUnit - 2][toUnit - 2] * value);
}
+
+ public void setUnitType(short unitType) {
+ this.unitType = unitType;
+ }
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/util/SAXDocumentFactory.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/util/SAXDocumentFactory.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/dom/util/SAXDocumentFactory.java Wed Apr 1 14:35:42 2015
@@ -30,26 +30,26 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.batik.util.HaltingThread;
-import org.apache.batik.util.XMLConstants;
-
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import org.apache.batik.util.HaltingThread;
+import org.apache.batik.util.XMLConstants;
/**
* This class contains methods for creating Document instances
@@ -399,6 +399,16 @@ public class SAXDocumentFactory
static SAXParserFactory saxFactory;
static {
saxFactory = SAXParserFactory.newInstance();
+ try {
+ saxFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ saxFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ } catch (SAXNotRecognizedException e) {
+ e.printStackTrace();
+ } catch (SAXNotSupportedException e) {
+ e.printStackTrace();
+ } catch (ParserConfigurationException e) {
+ e.printStackTrace();
+ }
}
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/ExtensionElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/ExtensionElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/ExtensionElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/ExtensionElement.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
/**
* This class implements the basic features an element must have in order
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/GraphicsExtensionElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/GraphicsExtensionElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/GraphicsExtensionElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/GraphicsExtensionElement.java Wed Apr 1 14:35:42 2015
@@ -18,12 +18,12 @@
*/
package org.apache.batik.extension;
+import org.apache.batik.anim.dom.SVGLocatableSupport;
+import org.apache.batik.anim.dom.SVGOMAnimatedBoolean;
+import org.apache.batik.anim.dom.SVGOMAnimatedTransformList;
+import org.apache.batik.anim.dom.TraitInformation;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGLocatableSupport;
-import org.apache.batik.dom.svg.SVGOMAnimatedBoolean;
-import org.apache.batik.dom.svg.SVGOMAnimatedTransformList;
import org.apache.batik.dom.svg.SVGTestsSupport;
-import org.apache.batik.dom.svg.TraitInformation;
import org.apache.batik.dom.util.XMLSupport;
import org.apache.batik.util.DoublyIndexedTable;
import org.apache.batik.util.SVGTypes;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikDomExtension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikDomExtension.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikDomExtension.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikDomExtension.java Wed Apr 1 14:35:42 2015
@@ -18,10 +18,10 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.DomExtension;
import org.apache.batik.dom.ExtensibleDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java Wed Apr 1 14:35:42 2015
@@ -31,6 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.bridge.Bridge;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -39,15 +40,14 @@ import org.apache.batik.bridge.CursorMan
import org.apache.batik.bridge.SVGAElementBridge;
import org.apache.batik.bridge.SVGTextElementBridge;
import org.apache.batik.bridge.SVGUtilities;
+import org.apache.batik.bridge.TextNode;
import org.apache.batik.bridge.TextUtilities;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.util.XMLSupport;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.TextPath;
import org.apache.batik.gvt.text.TextPaintInfo;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java Wed Apr 1 14:35:42 2015
@@ -26,9 +26,9 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.batik.bridge.GlyphLayout;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.font.MultiGlyphVector;
-import org.apache.batik.gvt.text.GlyphLayout;
/**
* A GlyphLayout class for SVG 1.2 flowing text.
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java Wed Apr 1 14:35:42 2015
@@ -22,13 +22,13 @@ import java.awt.font.FontRenderContext;
import java.awt.geom.Point2D;
import java.text.AttributedCharacterIterator;
-import org.apache.batik.gvt.text.TextLayoutFactory;
-import org.apache.batik.gvt.text.TextSpanLayout;
+import org.apache.batik.bridge.TextLayoutFactory;
+import org.apache.batik.bridge.TextSpanLayout;
/**
* Factory instance that returns TextSpanLayouts appropriate to
* FlowRoot instances.
*
- * @see org.apache.batik.gvt.text.TextSpanLayout
+ * @see org.apache.batik.bridge.TextSpanLayout
* @author <a href="mailto:dewese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextNode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextNode.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextNode.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextNode.java Wed Apr 1 14:35:42 2015
@@ -19,8 +19,8 @@
package org.apache.batik.extension.svg;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java Wed Apr 1 14:35:42 2015
@@ -24,9 +24,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
+import org.apache.batik.bridge.StrokingTextPainter;
+import org.apache.batik.bridge.TextNode;
+import org.apache.batik.bridge.TextPainter;
/**
* One line Class Desc
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowLineElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowLineElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowLineElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowLineElement.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowParaElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowParaElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowParaElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowParaElement.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowRegionBreakElement.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowSpanElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowSpanElement.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowSpanElement.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/extension/svg/FlowSpanElement.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,8 @@
*/
package org.apache.batik.extension.svg;
+import org.apache.batik.anim.dom.SVGOMTextPositioningElement;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGOMTextPositioningElement;
import org.w3c.dom.Node;
/**
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/GlyphGroupInfo.java Wed Apr 1 14:35:42 2015
@@ -29,7 +29,7 @@ import org.apache.batik.gvt.font.GVTGlyp
* @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
-class GlyphGroupInfo {
+public class GlyphGroupInfo {
int start, end;
int glyphCount, lastGlyphCount;
boolean hideLast;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/WordInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/WordInfo.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/WordInfo.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/flow/WordInfo.java Wed Apr 1 14:35:42 2015
@@ -30,13 +30,13 @@ import org.apache.batik.gvt.font.GVTLine
* @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
-class WordInfo {
+public class WordInfo {
int index = -1;
float ascent=-1, descent=-1, lineHeight=-1;
GlyphGroupInfo [] glyphGroups=null;
Object flowLine=null;
- WordInfo(int index) {
+ public WordInfo(int index) {
this.index = index;
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/TextPaintInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/TextPaintInfo.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/TextPaintInfo.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/TextPaintInfo.java Wed Apr 1 14:35:42 2015
@@ -22,7 +22,7 @@ import java.awt.Composite;
import java.awt.Paint;
import java.awt.Stroke;
-import org.apache.batik.gvt.TextNode.BackgroundMode;
+import org.apache.batik.bridge.TextNode.BackgroundMode;
/**
* One line Class Desc
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/script/InterpreterPool.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/script/InterpreterPool.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/script/InterpreterPool.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/script/InterpreterPool.java Wed Apr 1 14:35:42 2015
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.batik.dom.svg.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.Service;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/JGVTComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/JGVTComponent.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/JGVTComponent.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/JGVTComponent.java Wed Apr 1 14:35:42 2015
@@ -51,6 +51,7 @@ import java.util.List;
import javax.swing.JComponent;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.event.AWTEventDispatcher;
import org.apache.batik.gvt.event.EventDispatcher;
@@ -59,7 +60,6 @@ import org.apache.batik.gvt.event.Select
import org.apache.batik.gvt.renderer.ConcreteImageRendererFactory;
import org.apache.batik.gvt.renderer.ImageRenderer;
import org.apache.batik.gvt.renderer.ImageRendererFactory;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.util.HaltingThread;
import org.apache.batik.util.Platform;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/TextSelectionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/TextSelectionManager.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/TextSelectionManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/gvt/TextSelectionManager.java Wed Apr 1 14:35:42 2015
@@ -28,14 +28,14 @@ import java.awt.Shape;
import java.awt.BasicStroke;
import java.awt.geom.AffineTransform;
+import org.apache.batik.bridge.ConcreteTextSelector;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.gvt.Selectable;
import org.apache.batik.gvt.event.EventDispatcher;
import org.apache.batik.gvt.event.GraphicsNodeMouseEvent;
import org.apache.batik.gvt.event.GraphicsNodeMouseListener;
import org.apache.batik.gvt.event.SelectionEvent;
import org.apache.batik.gvt.event.SelectionListener;
-import org.apache.batik.gvt.text.ConcreteTextSelector;
-import org.apache.batik.gvt.text.Mark;
/**
* This class represents an object which manage GVT text nodes selection.
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/svg/JSVGComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/svg/JSVGComponent.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/svg/JSVGComponent.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/swing/svg/JSVGComponent.java Wed Apr 1 14:35:42 2015
@@ -44,13 +44,18 @@ import java.util.Set;
import javax.swing.JOptionPane;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.BridgeExtension;
+import org.apache.batik.bridge.DefaultFontFamilyResolver;
import org.apache.batik.bridge.DefaultScriptSecurity;
import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.ErrorConstants;
import org.apache.batik.bridge.ExternalResourceSecurity;
+import org.apache.batik.bridge.FontFamilyResolver;
+import org.apache.batik.bridge.Mark;
import org.apache.batik.bridge.RelaxedExternalResourceSecurity;
import org.apache.batik.bridge.ScriptSecurity;
import org.apache.batik.bridge.UpdateManager;
@@ -59,8 +64,6 @@ import org.apache.batik.bridge.UpdateMan
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.ext.awt.image.spi.ImageTagRegistry;
@@ -68,10 +71,7 @@ import org.apache.batik.gvt.CanvasGraphi
import org.apache.batik.gvt.CompositeGraphicsNode;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.gvt.event.EventDispatcher;
-import org.apache.batik.gvt.font.DefaultFontFamilyResolver;
-import org.apache.batik.gvt.font.FontFamilyResolver;
import org.apache.batik.gvt.renderer.ImageRenderer;
-import org.apache.batik.gvt.text.Mark;
import org.apache.batik.script.Interpreter;
import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
import org.apache.batik.swing.gvt.JGVTComponent;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java Wed Apr 1 14:35:42 2015
@@ -26,6 +26,9 @@ import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -39,9 +42,6 @@ import org.apache.batik.bridge.UserAgent
import org.apache.batik.bridge.UserAgentAdapter;
import org.apache.batik.bridge.ViewBox;
import org.apache.batik.bridge.svg12.SVG12BridgeContext;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.DocumentFactory;
import org.apache.batik.gvt.CanvasGraphicsNode;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java Wed Apr 1 14:35:42 2015
@@ -26,7 +26,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.batik.transcoder.keys.BooleanKey;
import org.apache.batik.transcoder.keys.FloatKey;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/wmf/tosvg/WMFRecordStore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/wmf/tosvg/WMFRecordStore.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/wmf/tosvg/WMFRecordStore.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/transcoder/wmf/tosvg/WMFRecordStore.java Wed Apr 1 14:35:42 2015
@@ -252,15 +252,12 @@ public class WMFRecordStore extends Abst
ySign = -1;
}
- mr.addElement((int)(width * scaleXY));
- mr.addElement( height );
- records.add( mr );
-
if (_bext && functionId == WMFConstants.META_SETWINDOWEXT) {
vpW = width;
vpH = height;
- if (! isotropic) scaleXY = (float)vpW / (float)vpH;
- vpW = (int)(vpW * scaleXY);
+ // two lines below commented out due to bug BATIK-1096
+ // if (! isotropic) scaleXY = (float)vpW / (float)vpH;
+ // vpW = (int)(vpW * scaleXY);
_bext = false;
}
// sets the width, height of the image if the file does not have an APM (in this case it is retrieved
@@ -269,6 +266,10 @@ public class WMFRecordStore extends Abst
this.width = vpW;
this.height = vpH;
}
+
+ mr.addElement((int)(width * scaleXY));
+ mr.addElement( height );
+ records.add( mr );
}
break;
Modified: xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoaded.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoaded.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoaded.java (original)
+++ xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoaded.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,6 @@
*/package org.apache.batik.bridge;
import org.w3c.dom.*;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
/**
* If this script is loaded by jarCheckNoLoad.svg, it will mark
Modified: xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoadedToo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoadedToo.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoadedToo.java (original)
+++ xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/IWasLoadedToo.java Wed Apr 1 14:35:42 2015
@@ -18,8 +18,6 @@
*/package org.apache.batik.bridge;
import org.w3c.dom.*;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
/**
* If this script is loaded by jarCheckLoad.svg, it will mark
Modified: xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java (original)
+++ xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java Wed Apr 1 14:35:42 2015
@@ -38,9 +38,7 @@ import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.ParsedURL;
/**
Modified: xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java (original)
+++ xmlgraphics/batik/branches/text-background/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java Wed Apr 1 14:35:42 2015
@@ -38,9 +38,7 @@ import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
import org.w3c.dom.events.EventTarget;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.script.ScriptHandler;
-import org.apache.batik.script.Window;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.util.ParsedURL;
/**
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java Wed Apr 1 14:35:42 2015
@@ -30,7 +30,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOM3Test.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOM3Test.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOM3Test.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOM3Test.java Wed Apr 1 14:35:42 2015
@@ -19,8 +19,8 @@
package org.apache.batik.dom;
import org.apache.batik.test.AbstractTest;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGOMDocument;
import org.w3c.dom.Document;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java Wed Apr 1 14:35:42 2015
@@ -22,9 +22,9 @@ import org.apache.batik.test.AbstractTes
import org.apache.batik.test.TestReport;
import org.apache.batik.util.SVGConstants;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.util.XMLResourceDescriptor;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/CloneNodeTest.java Wed Apr 1 14:35:42 2015
@@ -26,6 +26,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/dom/svg/ImportNodeTest.java Wed Apr 1 14:35:42 2015
@@ -27,6 +27,8 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/Bug21259.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/Bug21259.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/Bug21259.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/Bug21259.java Wed Apr 1 14:35:42 2015
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java Wed Apr 1 14:35:42 2015
@@ -21,7 +21,7 @@ package org.apache.batik.svggen;
import org.w3c.dom.Document;
import org.w3c.dom.DOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.test.PerformanceTest;
/**
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/GeneratorContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/GeneratorContext.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/GeneratorContext.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/GeneratorContext.java Wed Apr 1 14:35:42 2015
@@ -28,7 +28,7 @@ import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGeneratorContext.GraphicContextDefaults;
import org.apache.batik.util.SVGConstants;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/JPainterCompare.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/JPainterCompare.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/JPainterCompare.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/JPainterCompare.java Wed Apr 1 14:35:42 2015
@@ -31,7 +31,7 @@ import javax.swing.JPanel;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.swing.JSVGCanvas;
import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/svggen/ShowGraphics2DOutput.java Wed Apr 1 14:35:42 2015
@@ -27,11 +27,11 @@ import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Element;
import org.w3c.dom.svg.SVGDocument;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java Wed Apr 1 14:35:42 2015
@@ -27,11 +27,11 @@ import javax.swing.SwingUtilities;
import org.w3c.dom.Element;
+import org.apache.batik.anim.dom.SVGOMDocument;
+import org.apache.batik.anim.dom.SVGOMElement;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.UpdateManager;
import org.apache.batik.dom.svg.SVGContext;
-import org.apache.batik.dom.svg.SVGOMDocument;
-import org.apache.batik.dom.svg.SVGOMElement;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.MemoryLeakTest;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java Wed Apr 1 14:35:42 2015
@@ -349,7 +349,11 @@ public abstract class AbstractRenderingA
if (this.variationURLs == null) {
this.variationURLs = new LinkedList();
}
- this.variationURLs.add(resolveURL(variationURL));
+ try {
+ this.variationURLs.add(resolveURL(variationURL));
+ } catch (IllegalArgumentException iae) {
+ // no worries
+ }
}
/**
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java Wed Apr 1 14:35:42 2015
@@ -35,6 +35,7 @@ import java.security.ProtectionDomain;
import java.security.cert.Certificate;
import java.util.Enumeration;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
@@ -50,7 +51,6 @@ import org.apache.batik.bridge.RelaxedEx
import org.apache.batik.bridge.RelaxedScriptSecurity;
import org.apache.batik.bridge.ScriptSecurity;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
import org.apache.batik.util.ApplicationSecurityEnforcer;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/test/svg/SelfContainedSVGOnLoadTest.java Wed Apr 1 14:35:42 2015
@@ -27,13 +27,13 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeException;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java Wed Apr 1 14:35:42 2015
@@ -28,9 +28,9 @@ import java.net.URL;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/BackgroundColorTest.java Wed Apr 1 14:35:42 2015
@@ -30,7 +30,7 @@ import java.util.HashMap;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/DOMTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/DOMTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/DOMTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/DOMTest.java Wed Apr 1 14:35:42 2015
@@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java?rev=1670661&r1=1670660&r2=1670661&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java (original)
+++ xmlgraphics/batik/branches/text-background/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java Wed Apr 1 14:35:42 2015
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.w3c.dom.Document;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.util.XMLResourceDescriptor;