You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@locus.apache.org on 2000/10/25 03:52:44 UTC
cvs commit: xml-fop/src/org/apache/fop/dom/svg SVGGradientElementImpl.java SVGLengthImpl.java
keiron 00/10/24 18:52:44
Modified: src/org/apache/fop/dom/svg SVGGradientElementImpl.java
SVGLengthImpl.java
Log:
added spreadMethod, gradientUnits
Revision Changes Path
1.4 +58 -63 xml-fop/src/org/apache/fop/dom/svg/SVGGradientElementImpl.java
Index: SVGGradientElementImpl.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/dom/svg/SVGGradientElementImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SVGGradientElementImpl.java 2000/09/22 05:23:59 1.3
+++ SVGGradientElementImpl.java 2000/10/25 01:52:44 1.4
@@ -1,36 +1,36 @@
-/*-- $Id: SVGGradientElementImpl.java,v 1.3 2000/09/22 05:23:59 keiron Exp $ --
+/*-- $Id: SVGGradientElementImpl.java,v 1.4 2000/10/25 01:52:44 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
+
4. The names "FOP" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,12 +41,12 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- James Tauber <jt...@jtauber.com>. For more information on the Apache
+ James Tauber <jt...@jtauber.com>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.fop.dom.svg;
@@ -57,55 +57,50 @@
*
*/
public class SVGGradientElementImpl extends SVGURIReferenceImpl implements SVGGradientElement {
-/*
-SVG_SPREADMETHOD_UNKNOWN;
-SVG_SPREADMETHOD_PAD;
-SVG_SPREADMETHOD_REFLECT;
-SVG_SPREADMETHOD_REPEAT;
-*/
- SVGAnimatedEnumeration spreadMethod = new SVGAnimatedEnumerationImpl(SVG_SPREADMETHOD_UNKNOWN);
- SVGAnimatedEnumeration units = new SVGAnimatedEnumerationImpl(SVG_UNIT_TYPE_UNKNOWN);
-
-
- public SVGGradientElementImpl()
- {
- }
-
- public SVGAnimatedEnumeration getGradientUnits( )
- {
- return units;
- }
-
- public void setGradientUnits(SVGAnimatedEnumeration gradientUnits)
- {
- units = gradientUnits;
- }
-
- public SVGAnimatedTransformList getGradientTransform()
- {
- return null;
- }
-
- public void setGradientTransform(SVGAnimatedTransformList gradientTransform)
- {
- }
-
- public SVGAnimatedEnumeration getSpreadMethod( )
- {
- return spreadMethod;
- }
-
- public void setSpreadMethod( SVGAnimatedEnumeration spreadMethod )
- {
- this.spreadMethod = spreadMethod;
- }
-
- public SVGAnimatedBoolean getExternalResourcesRequired( )
- {
- return null;
- }
-
- public void setExternalResourcesRequired( SVGAnimatedBoolean externalResourcesRequired )
- {
- }
+ /*
+ SVG_SPREADMETHOD_UNKNOWN;
+ SVG_SPREADMETHOD_PAD;
+ SVG_SPREADMETHOD_REFLECT;
+ SVG_SPREADMETHOD_REPEAT;
+ */
+ SVGAnimatedEnumeration spreadMethod =
+ new SVGAnimatedEnumerationImpl(SVG_SPREADMETHOD_UNKNOWN);
+ SVGAnimatedEnumeration units =
+ new SVGAnimatedEnumerationImpl(SVG_UNIT_TYPE_UNKNOWN);
+
+
+ public SVGGradientElementImpl() {
+ }
+
+ public SVGAnimatedEnumeration getGradientUnits() {
+ return units;
+ }
+
+ public void setGradientUnits(SVGAnimatedEnumeration gradientUnits) {
+ units = gradientUnits;
+ }
+
+ public SVGAnimatedTransformList getGradientTransform() {
+ return null;
+ }
+
+ public void setGradientTransform(
+ SVGAnimatedTransformList gradientTransform) {
+ }
+
+ public SVGAnimatedEnumeration getSpreadMethod() {
+ return spreadMethod;
+ }
+
+ public void setSpreadMethod(SVGAnimatedEnumeration spreadMethod) {
+ this.spreadMethod = spreadMethod;
+ }
+
+ public SVGAnimatedBoolean getExternalResourcesRequired() {
+ return null;
+ }
+
+ public void setExternalResourcesRequired(
+ SVGAnimatedBoolean externalResourcesRequired) {
+ }
}
1.3 +139 -152 xml-fop/src/org/apache/fop/dom/svg/SVGLengthImpl.java
Index: SVGLengthImpl.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/dom/svg/SVGLengthImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SVGLengthImpl.java 2000/07/24 06:49:42 1.2
+++ SVGLengthImpl.java 2000/10/25 01:52:44 1.3
@@ -1,36 +1,36 @@
-/*-- $Id: SVGLengthImpl.java,v 1.2 2000/07/24 06:49:42 keiron Exp $ --
+/*-- $Id: SVGLengthImpl.java,v 1.3 2000/10/25 01:52:44 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
+
4. The names "Fop" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,12 +41,12 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- James Tauber <jt...@jtauber.com>. For more information on the Apache
+ James Tauber <jt...@jtauber.com>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.fop.dom.svg;
@@ -61,144 +61,131 @@
* a length quantity in SVG
*/
public class SVGLengthImpl implements SVGLength {
- short unitType = SVG_LENGTHTYPE_UNKNOWN;
- protected float millipoints = 0;
- protected float fontsize = 12; //??
-
- public short getUnitType( )
- {
- return unitType;
- }
-
- public float getValue( )
- {
- return millipoints;
- }
-
- public void setValue( float value )
- {
- millipoints = value;
- }
-
- public float getValueInSpecifiedUnits()
- {
- return 0;
- }
-
- public void setValueInSpecifiedUnits(float valueInSpecifiedUnits)
- {
- }
-
- public String getValueAsString()
- {
- return null;
- }
-
- public void setValueAsString( String valueAsString )
- {
- convert(valueAsString);
- }
-
- public float getAnimatedValue( )
- {
- return 0;
- }
-
- public void newValueSpecifiedUnits(short unitType, float valueInSpecifiedUnits) throws SVGException
- {
- }
-
- public void convertToSpecifiedUnits(short unitType) throws SVGException
- {
- }
-
- /**
- * set the length given a particular String specifying length and units
- */
- public SVGLengthImpl (String len)
- {
- convert(len);
- }
-
- public SVGLengthImpl()
- {
- }
-
- /**
- * set the length given a particular String specifying length and units,
- * and the font-size (necessary for an em)
- *
- public SVGLengthImpl(String len/*, int fontsize*)
- {
-// this.fontsize = fontsize;
- convert(len);
- }*/
-
- protected void convert(String len)
- {
- int l = len.length();
-
- if (l == 0) {
- System.err.println("WARNING: empty length");
- this.millipoints = 0;
- } else {
- float dvalue = getFloatValue(len, l);
- this.millipoints = dvalue;
- }
- }
-
- protected float getFloatValue(String len, int l)
- {
- int assumed_resolution = 1; // points/pixel
-
- float dvalue;
- try {
- if(len.endsWith("in")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * 72;
- unitType = SVG_LENGTHTYPE_IN;
- } else if(len.endsWith("cm")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * 28.35f;
- unitType = SVG_LENGTHTYPE_CM;
- } else if(len.endsWith("mm")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * 2.84f;
- unitType = SVG_LENGTHTYPE_MM;
- } else if(len.endsWith("pt")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
-// dvalue = dvalue;
- unitType = SVG_LENGTHTYPE_PT;
- } else if(len.endsWith("pc")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * 12;
- unitType = SVG_LENGTHTYPE_PC;
- } else if(len.endsWith("em")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * fontsize;
- unitType = SVG_LENGTHTYPE_EMS;
- } else if(len.endsWith("px")) {
- dvalue = Float.valueOf(len.substring(0,(l-2))).floatValue();
- dvalue = dvalue * assumed_resolution;
- unitType = SVG_LENGTHTYPE_PX;
- } else if(len.endsWith("%")) {
- dvalue = Float.valueOf(len.substring(0,(l-1))).floatValue() / 100f;
- unitType = SVG_LENGTHTYPE_PERCENTAGE;
- } else {
- dvalue = Float.valueOf(len).floatValue();
- unitType = SVG_LENGTHTYPE_NUMBER;
- }
- } catch (Exception e) {
- dvalue = 0;
- unitType = SVG_LENGTHTYPE_UNKNOWN;
- MessageHandler.errorln("ERROR: unknown length units in " + len);
- }
- return dvalue;
- }
-
- public String toString()
- {
- String s = millipoints + "mpt";
- return s;
- }
+ short unitType = SVG_LENGTHTYPE_UNKNOWN;
+ protected float millipoints = 0;
+ protected float fontsize = 12; //??
+
+ public short getUnitType() {
+ return unitType;
+ }
+
+ public float getValue() {
+ return millipoints;
+ }
+
+ public void setValue(float value) {
+ millipoints = value;
+ }
+
+ public float getValueInSpecifiedUnits() {
+ return 0;
+ }
+
+ public void setValueInSpecifiedUnits(float valueInSpecifiedUnits) {
+ }
+
+ public String getValueAsString() {
+ return null;
+ }
+
+ public void setValueAsString(String valueAsString) {
+ convert(valueAsString);
+ }
+
+ public float getAnimatedValue() {
+ return 0;
+ }
+
+ public void newValueSpecifiedUnits(short unitType,
+ float valueInSpecifiedUnits) throws SVGException {
+ this.unitType = unitType;
+ millipoints = valueInSpecifiedUnits;
+ }
+
+ public void convertToSpecifiedUnits(short unitType)
+ throws SVGException {
+ }
+
+ /**
+ * set the length given a particular String specifying length and units
+ */
+ public SVGLengthImpl (String len) {
+ convert(len);
+ }
+
+ public SVGLengthImpl() {
+ }
+
+ protected void convert(String len) {
+ int l = len.length();
+
+ if (l == 0) {
+ System.err.println("WARNING: empty length");
+ this.millipoints = 0;
+ } else {
+ float dvalue = getFloatValue(len, l);
+ this.millipoints = dvalue;
+ }
+ }
+
+ protected float getFloatValue(String len, int l) {
+ int assumed_resolution = 1; // points/pixel
+
+ float dvalue;
+ try {
+ if (len.endsWith("in")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * 72;
+ unitType = SVG_LENGTHTYPE_IN;
+ } else if (len.endsWith("cm")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * 28.35f;
+ unitType = SVG_LENGTHTYPE_CM;
+ } else if (len.endsWith("mm")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * 2.84f;
+ unitType = SVG_LENGTHTYPE_MM;
+ } else if (len.endsWith("pt")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ // dvalue = dvalue;
+ unitType = SVG_LENGTHTYPE_PT;
+ } else if (len.endsWith("pc")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * 12;
+ unitType = SVG_LENGTHTYPE_PC;
+ } else if (len.endsWith("em")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * fontsize;
+ unitType = SVG_LENGTHTYPE_EMS;
+ } else if (len.endsWith("px")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 2))).floatValue();
+ dvalue = dvalue * assumed_resolution;
+ unitType = SVG_LENGTHTYPE_PX;
+ } else if (len.endsWith("%")) {
+ dvalue = Float.valueOf(
+ len.substring(0, (l - 1))).floatValue() / 100f;
+ unitType = SVG_LENGTHTYPE_PERCENTAGE;
+ } else {
+ dvalue = Float.valueOf(len).floatValue();
+ unitType = SVG_LENGTHTYPE_NUMBER;
+ }
+ } catch (Exception e) {
+ dvalue = 0;
+ unitType = SVG_LENGTHTYPE_UNKNOWN;
+ MessageHandler.errorln("ERROR: unknown length units in " + len);
+ }
+ return dvalue;
+ }
+
+ public String toString() {
+ String s = millipoints + "mpt";
+ return s;
+ }
}