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 dv...@apache.org on 2006/11/22 18:29:43 UTC
svn commit: r478249 [2/5] - in
/xmlgraphics/batik/trunk/sources/org/apache/batik: dom/ dom/anim/
dom/events/ dom/svg/ dom/svg12/ dom/traversal/ dom/util/ ext/awt/font/
ext/awt/g2d/ ext/awt/geom/ ext/awt/image/ ext/awt/image/codec/png/
ext/awt/image/cod...
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMDocument.java Wed Nov 22 09:29:37 2006
@@ -83,11 +83,11 @@
SVGConstants,
CSSNavigableDocument,
IdContainer {
-
+
/**
* The error messages bundle class name.
*/
- protected final static String RESOURCES =
+ protected static final String RESOURCES =
"org.apache.batik.dom.svg.resources.Messages";
/**
@@ -365,7 +365,7 @@
}
/**
- * Returns true if the given Attr node represents an 'id'
+ * Returns true if the given Attr node represents an 'id'
* for this document.
*/
public boolean isId(Attr node) {
@@ -754,11 +754,11 @@
/**
* Reads the object from the given stream.
*/
- private void readObject(ObjectInputStream s)
+ private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
s.defaultReadObject();
-
+
localizableSupport = new LocalizableSupport
(RESOURCES, getClass().getClassLoader());
- }
+ }
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEBlendElement.java Wed Nov 22 09:29:37 2006
@@ -40,7 +40,7 @@
/**
* The 'mode' attribute values.
*/
- protected final static String[] MODE_VALUES = {
+ protected static final String[] MODE_VALUES = {
"",
SVG_NORMAL_VALUE,
SVG_MULTIPLY_VALUE,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEColorMatrixElement.java Wed Nov 22 09:29:37 2006
@@ -41,7 +41,7 @@
/**
* The 'type' attribute values.
*/
- protected final static String[] TYPE_VALUES = {
+ protected static final String[] TYPE_VALUES = {
"",
SVG_MATRIX_VALUE,
SVG_SATURATE_VALUE,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFECompositeElement.java Wed Nov 22 09:29:37 2006
@@ -41,7 +41,7 @@
/**
* The 'operator' attribute values.
*/
- protected final static String[] OPERATOR_VALUES = {
+ protected static final String[] OPERATOR_VALUES = {
"",
SVG_OVER_VALUE,
SVG_IN_VALUE,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEConvolveMatrixElement.java Wed Nov 22 09:29:37 2006
@@ -45,7 +45,7 @@
/**
* The 'edgeMode' attribute values.
*/
- protected final static String[] EDGE_MODE_VALUES = {
+ protected static final String[] EDGE_MODE_VALUES = {
"",
SVG_DUPLICATE_VALUE,
SVG_WRAP_VALUE,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEDisplacementMapElement.java Wed Nov 22 09:29:37 2006
@@ -41,7 +41,7 @@
/**
* The 'xChannelSelector' and 'yChannelSelector' attributes values.
*/
- protected final static String[] CHANNEL_SELECTOR_VALUES = {
+ protected static final String[] CHANNEL_SELECTOR_VALUES = {
"",
SVG_R_VALUE,
SVG_G_VALUE,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEImageElement.java Wed Nov 22 09:29:37 2006
@@ -43,7 +43,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -96,7 +96,7 @@
}
// SVGLangSpace support //////////////////////////////////////////////////
-
+
/**
* <b>DOM</b>: Returns the xml:lang attribute value.
*/
@@ -110,7 +110,7 @@
public void setXMLlang(String lang) {
setAttributeNS(XML_NAMESPACE_URI, XML_LANG_QNAME, lang);
}
-
+
/**
* <b>DOM</b>: Returns the xml:space attribute value.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFEMorphologyElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The 'operator' attribute values.
*/
- protected final static String[] OPERATOR_VALUES = {
+ protected static final String[] OPERATOR_VALUES = {
"",
SVG_ERODE_VALUE,
SVG_DILATE_VALUE
@@ -91,7 +91,7 @@
public SVGAnimatedNumber getRadiusX() {
throw new UnsupportedOperationException
("SVGFEMorphologyElement.getRadiusX is not implemented"); // XXX
- }
+ }
/**
* <b>DOM</b>: Implements {@link SVGFEMorphologyElement#getRadiusY()}.
@@ -99,7 +99,7 @@
public SVGAnimatedNumber getRadiusY() {
throw new UnsupportedOperationException
("SVGFEMorphologyElement.getRadiusY is not implemented"); // XXX
- }
+ }
/**
* Returns a new uninitialized instance of this object's class.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFETurbulenceElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The 'stitchTiles' attribute values.
*/
- protected final static String[] STITCH_TILES_VALUES = {
+ protected static final String[] STITCH_TILES_VALUES = {
"",
SVG_STITCH_VALUE,
SVG_NO_STITCH_VALUE
@@ -51,7 +51,7 @@
/**
* The 'type' attribute values.
*/
- protected final static String[] TYPE_VALUES = {
+ protected static final String[] TYPE_VALUES = {
"",
SVG_FRACTAL_NOISE_VALUE,
SVG_TURBULENCE_VALUE
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMFilterElement.java Wed Nov 22 09:29:37 2006
@@ -46,7 +46,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -63,7 +63,7 @@
/**
* The units values.
*/
- protected final static String[] UNITS_VALUES = {
+ protected static final String[] UNITS_VALUES = {
"",
SVG_USER_SPACE_ON_USE_VALUE,
SVG_OBJECT_BOUNDING_BOX_VALUE
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGlyphRefElement.java Wed Nov 22 09:29:37 2006
@@ -35,11 +35,11 @@
public class SVGOMGlyphRefElement
extends SVGStylableElement
implements SVGGlyphRefElement {
-
+
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -149,7 +149,7 @@
* <b>DOM</b>: Implements {@link SVGGlyphRefElement#setDx(float)}.
*/
public void setDx(float dx) throws DOMException {
- setAttributeNS(null, SVG_DX_ATTRIBUTE, String.valueOf(dx));
+ setAttributeNS(null, SVG_DX_ATTRIBUTE, String.valueOf(dx));
}
/**
@@ -163,7 +163,7 @@
* <b>DOM</b>: Implements {@link SVGGlyphRefElement#setDy(float)}.
*/
public void setDy(float dy) throws DOMException {
- setAttributeNS(null, SVG_DY_ATTRIBUTE, String.valueOf(dy));
+ setAttributeNS(null, SVG_DY_ATTRIBUTE, String.valueOf(dy));
}
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMGradientElement.java Wed Nov 22 09:29:37 2006
@@ -44,7 +44,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -61,7 +61,7 @@
/**
* The units values.
*/
- protected final static String[] UNITS_VALUES = {
+ protected static final String[] UNITS_VALUES = {
"",
SVG_USER_SPACE_ON_USE_VALUE,
SVG_OBJECT_BOUNDING_BOX_VALUE
@@ -70,7 +70,7 @@
/**
* The 'spreadMethod' attribute values.
*/
- protected final static String[] SPREAD_METHOD_VALUES = {
+ protected static final String[] SPREAD_METHOD_VALUES = {
"",
SVG_PAD_VALUE,
SVG_REFLECT_VALUE,
@@ -110,7 +110,7 @@
(null, SVG_GRADIENT_UNITS_ATTRIBUTE, UNITS_VALUES,
(short)2);
}
-
+
/**
* <b>DOM</b>: Implements {@link
* org.w3c.dom.svg.SVGGradientElement#getSpreadMethod()}.
@@ -120,7 +120,7 @@
(null, SVG_SPREAD_METHOD_ATTRIBUTE, SPREAD_METHOD_VALUES,
(short)1);
}
-
+
/**
* <b>DOM</b>: Implements {@link
* org.w3c.dom.svg.SVGURIReference#getHref()}.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMImageElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(5);
attributeInitializer.addAttribute(null, null,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMPathElement.java Wed Nov 22 09:29:37 2006
@@ -41,7 +41,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMarkerElement.java Wed Nov 22 09:29:37 2006
@@ -43,11 +43,11 @@
public class SVGOMMarkerElement
extends SVGStylableElement
implements SVGMarkerElement {
-
+
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(1);
attributeInitializer.addAttribute(null,
@@ -59,7 +59,7 @@
/**
* The units values.
*/
- protected final static String[] UNITS_VALUES = {
+ protected static final String[] UNITS_VALUES = {
"",
SVG_USER_SPACE_ON_USE_VALUE,
SVG_STROKE_WIDTH_ATTRIBUTE
@@ -68,7 +68,7 @@
/**
* The orient type values.
*/
- protected final static String[] ORIENT_TYPE_VALUES = {
+ protected static final String[] ORIENT_TYPE_VALUES = {
"",
SVG_AUTO_VALUE,
""
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMMaskElement.java Wed Nov 22 09:29:37 2006
@@ -40,7 +40,7 @@
/**
* The units values.
*/
- protected final static String[] UNITS_VALUES = {
+ protected static final String[] UNITS_VALUES = {
"",
SVG_USER_SPACE_ON_USE_VALUE,
SVG_OBJECT_BOUNDING_BOX_VALUE
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMPatternElement.java Wed Nov 22 09:29:37 2006
@@ -48,7 +48,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(5);
attributeInitializer.addAttribute(null, null,
@@ -68,7 +68,7 @@
/**
* The units values.
*/
- protected final static String[] UNITS_VALUES = {
+ protected static final String[] UNITS_VALUES = {
"",
SVG_USER_SPACE_ON_USE_VALUE,
SVG_OBJECT_BOUNDING_BOX_VALUE
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSVGElement.java Wed Nov 22 09:29:37 2006
@@ -71,7 +71,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(7);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -195,9 +195,9 @@
*/
public SVGRect getViewport() {
SVGContext ctx = getSVGContext();
- return new SVGOMRect(0, 0, ctx.getViewportWidth(),
+ return new SVGOMRect(0, 0, ctx.getViewportWidth(),
ctx.getViewportHeight());
- }
+ }
/**
* <b>DOM</b>: Implements {@link SVGSVGElement#getPixelUnitToMillimeterX()}.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMScriptElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(1);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -85,7 +85,7 @@
public String getType() {
return getAttributeNS(null, SVG_TYPE_ATTRIBUTE);
}
-
+
/**
* <b>DOM</b>: Implements {@link SVGScriptElement#setType(String)}.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMSymbolElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(1);
attributeInitializer.addAttribute(null,
@@ -75,7 +75,7 @@
}
// SVGLangSpace support //////////////////////////////////////////////////
-
+
/**
* <b>DOM</b>: Returns the xml:lang attribute value.
*/
@@ -89,7 +89,7 @@
public void setXMLlang(String lang) {
setAttributeNS(XML_NAMESPACE_URI, XML_LANG_QNAME, lang);
}
-
+
/**
* <b>DOM</b>: Returns the xml:space attribute value.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextContentElement.java Wed Nov 22 09:29:37 2006
@@ -44,7 +44,7 @@
/**
* The 'lengthAdjust' attribute values.
*/
- protected final static String[] LENGTH_ADJUST_VALUES = {
+ protected static final String[] LENGTH_ADJUST_VALUES = {
"",
SVG_SPACING_ATTRIBUTE,
SVG_SPACING_AND_GLYPHS_VALUE
@@ -92,7 +92,7 @@
}
return baseVal;
}
-
+
class SVGTextLength extends BaseSVGLength {
public SVGTextLength(short direction) {
super(direction);
@@ -213,7 +213,7 @@
}
// SVGLangSpace support //////////////////////////////////////////////////
-
+
/**
* <b>DOM</b>: Returns the xml:lang attribute value.
*/
@@ -227,7 +227,7 @@
public void setXMLlang(String lang) {
setAttributeNS(XML_NAMESPACE_URI, XML_LANG_QNAME, lang);
}
-
+
/**
* <b>DOM</b>: Returns the xml:space attribute value.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMTextPathElement.java Wed Nov 22 09:29:37 2006
@@ -43,7 +43,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -60,7 +60,7 @@
/**
* The 'method' attribute values.
*/
- protected final static String[] METHOD_VALUES = {
+ protected static final String[] METHOD_VALUES = {
"",
SVG_ALIGN_VALUE,
SVG_STRETCH_VALUE
@@ -69,7 +69,7 @@
/**
* The 'spacing' attribute values.
*/
- protected final static String[] SPACING_VALUES = {
+ protected static final String[] SPACING_VALUES = {
"",
SVG_AUTO_VALUE,
SVG_EXACT_VALUE
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMUseElement.java Wed Nov 22 09:29:37 2006
@@ -42,7 +42,7 @@
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(4);
attributeInitializer.addAttribute(XMLSupport.XMLNS_NAMESPACE_URI,
@@ -108,7 +108,7 @@
return getAnimatedLengthAttribute
(null, SVG_WIDTH_ATTRIBUTE, SVG_USE_WIDTH_DEFAULT_VALUE,
SVGOMAnimatedLength.HORIZONTAL_LENGTH, true);
- }
+ }
/**
* <b>DOM</b>: Implements {@link SVGUseElement#getHeight()}.
@@ -117,7 +117,7 @@
return getAnimatedLengthAttribute
(null, SVG_HEIGHT_ATTRIBUTE, SVG_USE_HEIGHT_DEFAULT_VALUE,
SVGOMAnimatedLength.VERTICAL_LENGTH, true);
- }
+ }
/**
* <b>DOM</b>: Implements {@link SVGUseElement#getInstanceRoot()}.
@@ -126,7 +126,7 @@
throw new UnsupportedOperationException
("SVGUseElement.getInstanceRoot is not implemented"); // XXX
}
-
+
/**
* <b>DOM</b>: Implements {@link SVGUseElement#getAnimatedInstanceRoot()}.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGOMViewElement.java Wed Nov 22 09:29:37 2006
@@ -38,11 +38,11 @@
public class SVGOMViewElement
extends SVGOMElement
implements SVGViewElement {
-
+
/**
* The attribute initializer.
*/
- protected final static AttributeInitializer attributeInitializer;
+ protected static final AttributeInitializer attributeInitializer;
static {
attributeInitializer = new AttributeInitializer(2);
attributeInitializer.addAttribute(null,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPathSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPathSupport.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPathSupport.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGPathSupport.java Wed Nov 22 09:29:37 2006
@@ -84,4 +84,4 @@
}
};
}
-};
+}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextContent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextContent.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextContent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextContent.java Wed Nov 22 09:29:37 2006
@@ -31,119 +31,119 @@
public interface SVGTextContent
{
/**
- * Returns the total number of characters to be
- * rendered within the current element.
- * Includes characters which are included
- * via a <tref> reference.
+ * Returns the total number of characters to be
+ * rendered within the current element.
+ * Includes characters which are included
+ * via a <tref> reference.
*
* @return Total number of characters.
*/
- public int getNumberOfChars();
+ int getNumberOfChars();
/**
- * Returns a tightest rectangle which defines the
- * minimum and maximum X and Y values in the user
- * coordinate system for rendering the glyph(s)
- * that correspond to the specified character.
- * The calculations assume that all glyphs occupy
- * the full standard glyph cell for the font. If
- * multiple consecutive characters are rendered
- * inseparably (e.g., as a single glyph or a
- * sequence of glyphs), then each of the inseparable
- * characters will return the same extent.
- *
- * @param charnum The index of the character, where the
+ * Returns a tightest rectangle which defines the
+ * minimum and maximum X and Y values in the user
+ * coordinate system for rendering the glyph(s)
+ * that correspond to the specified character.
+ * The calculations assume that all glyphs occupy
+ * the full standard glyph cell for the font. If
+ * multiple consecutive characters are rendered
+ * inseparably (e.g., as a single glyph or a
+ * sequence of glyphs), then each of the inseparable
+ * characters will return the same extent.
+ *
+ * @param charnum The index of the character, where the
* first character has an index of 0.
- * @return The rectangle which encloses all of
+ * @return The rectangle which encloses all of
* the rendered glyph(s).
*/
- public Rectangle2D getExtentOfChar(int charnum );
+ Rectangle2D getExtentOfChar(int charnum );
/**
- * Returns the current text position before rendering
- * the character in the user coordinate system for
- * rendering the glyph(s) that correspond to the
- * specified character. The current text position has
- * already taken into account the effects of any inter-
- * character adjustments due to properties 'kerning',
- * 'letter-spacing' and 'word-spacing' and adjustments
- * due to attributes x, y, dx and dy. If multiple
- * consecutive characters are rendered inseparably
- * (e.g., as a single glyph or a sequence of glyphs),
+ * Returns the current text position before rendering
+ * the character in the user coordinate system for
+ * rendering the glyph(s) that correspond to the
+ * specified character. The current text position has
+ * already taken into account the effects of any inter-
+ * character adjustments due to properties 'kerning',
+ * 'letter-spacing' and 'word-spacing' and adjustments
+ * due to attributes x, y, dx and dy. If multiple
+ * consecutive characters are rendered inseparably
+ * (e.g., as a single glyph or a sequence of glyphs),
* then each of the inseparable characters will return
- * the start position for the first glyph.
- *
- * @param charnum The index of the character, where the
+ * the start position for the first glyph.
+ *
+ * @param charnum The index of the character, where the
* first character has an index of 0.
* @return The character's start position.
*/
- public Point2D getStartPositionOfChar(int charnum);
+ Point2D getStartPositionOfChar(int charnum);
/**
- * Returns the current text position after rendering
- * the character in the user coordinate system for
- * rendering the glyph(s) that correspond to the
- * specified character. This current text position
+ * Returns the current text position after rendering
+ * the character in the user coordinate system for
+ * rendering the glyph(s) that correspond to the
+ * specified character. This current text position
* does not take into account the effects of any inter-
- * character adjustments to prepare for the next
- * character, such as properties 'kerning',
- * 'letter-spacing' and 'word-spacing' and adjustments
- * due to attributes x, y, dx and dy. If multiple
- * consecutive characters are rendered inseparably
- * (e.g., as a single glyph or a sequence of glyphs),
- * then each of the inseparable characters will return
- * the end position for the last glyph.
- *
- * @param charnum The index of the character, where the
+ * character adjustments to prepare for the next
+ * character, such as properties 'kerning',
+ * 'letter-spacing' and 'word-spacing' and adjustments
+ * due to attributes x, y, dx and dy. If multiple
+ * consecutive characters are rendered inseparably
+ * (e.g., as a single glyph or a sequence of glyphs),
+ * then each of the inseparable characters will return
+ * the end position for the last glyph.
+ *
+ * @param charnum The index of the character, where the
* first character has an index of 0.
* @return The character's end position.
*/
- public Point2D getEndPositionOfChar(int charnum);
+ Point2D getEndPositionOfChar(int charnum);
/**
- * Returns the rotation value relative to the current
- * user coordinate system used to render the glyph(s)
- * corresponding to the specified character. If
- * multiple glyph(s) are used to render the given
- * character and the glyphs each have different
- * rotations (e.g., due to text-on-a-path), the user
- * agent shall return an average value (e.g., the
- * rotation angle at the midpoint along the path for
- * all glyphs used to render this character). The
- * rotation value represents the rotation that is
- * supplemental to any rotation due to properties
- * 'glyph-orientation-horizontal' and
- * 'glyph-orientation-vertical'; thus, any glyph
- * rotations due to these properties are not included
- * into the returned rotation value. If multiple
- * consecutive characters are rendered inseparably
- * (e.g., as a single glyph or a sequence of glyphs),
- * then each of the inseparable characters will
- * return the same rotation value.
+ * Returns the rotation value relative to the current
+ * user coordinate system used to render the glyph(s)
+ * corresponding to the specified character. If
+ * multiple glyph(s) are used to render the given
+ * character and the glyphs each have different
+ * rotations (e.g., due to text-on-a-path), the user
+ * agent shall return an average value (e.g., the
+ * rotation angle at the midpoint along the path for
+ * all glyphs used to render this character). The
+ * rotation value represents the rotation that is
+ * supplemental to any rotation due to properties
+ * 'glyph-orientation-horizontal' and
+ * 'glyph-orientation-vertical'; thus, any glyph
+ * rotations due to these properties are not included
+ * into the returned rotation value. If multiple
+ * consecutive characters are rendered inseparably
+ * (e.g., as a single glyph or a sequence of glyphs),
+ * then each of the inseparable characters will
+ * return the same rotation value.
*
- * @param charnum The index of the character, where the
+ * @param charnum The index of the character, where the
* first character has an index of 0.
* @return The character's rotation angle.
*/
- public float getRotationOfChar(int charnum);
+ float getRotationOfChar(int charnum);
/**
- * Causes the specified substring to be selected
- * just as if the user selected the substring interactively.
+ * Causes the specified substring to be selected
+ * just as if the user selected the substring interactively.
*
- * @param charnum : The index of the start character
- * which is at the given point, where the first
+ * @param charnum : The index of the start character
+ * which is at the given point, where the first
* character has an index of 0.
- * @param nchars : The number of characters in the
- * substring. If nchars specifies more characters
- * than are available, then the substring will
- * consist of all characters starting with charnum
+ * @param nchars : The number of characters in the
+ * substring. If nchars specifies more characters
+ * than are available, then the substring will
+ * consist of all characters starting with charnum
* until the end of the list of characters.
*/
- public void selectSubString(int charnum, int nchars);
+ void selectSubString(int charnum, int nchars);
- public float getComputedTextLength();
+ float getComputedTextLength();
- public float getSubStringLength(int charnum, int nchars);
+ float getSubStringLength(int charnum, int nchars);
- public int getCharNumAtPosition(float x, float y);
+ int getCharNumAtPosition(float x, float y);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextPositioningElementSupport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextPositioningElementSupport.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextPositioningElementSupport.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg/SVGTextPositioningElementSupport.java Wed Nov 22 09:29:37 2006
@@ -23,7 +23,7 @@
import org.w3c.dom.svg.SVGAnimatedNumberList;
/**
- * This class provide support for the SVGTextPositionningElement
+ * This class provide support for the SVGTextPositionningElement
* interface.
*
* @author <a href="mailto:nicolas.socheleau@bitflash.com">Nicolas Socheleau</a>
@@ -31,15 +31,15 @@
*/
public class SVGTextPositioningElementSupport {
- public final static String X_DEFAULT_VALUE
+ public static final String X_DEFAULT_VALUE
= "";
- public final static String Y_DEFAULT_VALUE
+ public static final String Y_DEFAULT_VALUE
= "";
- public final static String DX_DEFAULT_VALUE
+ public static final String DX_DEFAULT_VALUE
= "";
- public final static String DY_DEFAULT_VALUE
+ public static final String DY_DEFAULT_VALUE
= "";
- public final static String ROTATE_DEFAULT_VALUE
+ public static final String ROTATE_DEFAULT_VALUE
= "";
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/svg12/SVG12DOMImplementation.java Wed Nov 22 09:29:37 2006
@@ -56,7 +56,7 @@
*/
public class SVG12DOMImplementation
extends SVGDOMImplementation {
-
+
/**
* Creates a new SVGDOMImplementation object.
*/
@@ -68,10 +68,10 @@
registerFeature("SVGEvents", new String[] {"1.0", "1.1", "1.2"});
}
- public CSSEngine createCSSEngine(AbstractStylableDocument doc,
+ public CSSEngine createCSSEngine(AbstractStylableDocument doc,
CSSContext ctx,
ExtendedParser ep,
- ValueManager [] vms,
+ ValueManager [] vms,
ShorthandManager [] sms) {
URL durl = ((SVGOMDocument)doc).getURLObject();
CSSEngine result = new SVG12CSSEngine(doc, durl, ep, vms, sms, ctx);
@@ -110,7 +110,7 @@
public Element createElementNS(AbstractDocument document,
String namespaceURI,
String qualifiedName) {
- if (namespaceURI == null)
+ if (namespaceURI == null)
return new GenericElement(qualifiedName.intern(), document);
String name = DOMUtilities.getLocalName(qualifiedName);
@@ -218,7 +218,7 @@
/**
* To create a 'flowDiv' element.
*/
- protected static class FlowDivElementFactory
+ protected static class FlowDivElementFactory
implements ElementFactory {
public FlowDivElementFactory() {
}
@@ -233,7 +233,7 @@
/**
* To create a 'flowLine' element.
*/
- protected static class FlowLineElementFactory
+ protected static class FlowLineElementFactory
implements ElementFactory {
public FlowLineElementFactory() {
}
@@ -248,7 +248,7 @@
/**
* To create a 'flowPara' element.
*/
- protected static class FlowParaElementFactory
+ protected static class FlowParaElementFactory
implements ElementFactory {
public FlowParaElementFactory() {
}
@@ -263,7 +263,7 @@
/**
* To create a 'flowRegionBreak' element.
*/
- protected static class FlowRegionBreakElementFactory
+ protected static class FlowRegionBreakElementFactory
implements ElementFactory {
public FlowRegionBreakElementFactory() {
}
@@ -278,7 +278,7 @@
/**
* To create a 'flowRegion' element.
*/
- protected static class FlowRegionElementFactory
+ protected static class FlowRegionElementFactory
implements ElementFactory {
public FlowRegionElementFactory() {
}
@@ -293,7 +293,7 @@
/**
* To create a 'flowRegion' element.
*/
- protected static class FlowRegionExcludeElementFactory
+ protected static class FlowRegionExcludeElementFactory
implements ElementFactory {
public FlowRegionExcludeElementFactory() {
}
@@ -308,7 +308,7 @@
/**
* To create a 'flowRoot' element.
*/
- protected static class FlowRootElementFactory
+ protected static class FlowRootElementFactory
implements ElementFactory {
public FlowRootElementFactory() {
}
@@ -323,7 +323,7 @@
/**
* To create a 'flowSpan' element.
*/
- protected static class FlowSpanElementFactory
+ protected static class FlowSpanElementFactory
implements ElementFactory {
public FlowSpanElementFactory() {
}
@@ -338,7 +338,7 @@
/**
* To create a 'handler' element.
*/
- protected static class HandlerElementFactory
+ protected static class HandlerElementFactory
implements ElementFactory {
public HandlerElementFactory() {
}
@@ -353,7 +353,7 @@
/**
* To create a 'multiImage' element.
*/
- protected static class MultiImageElementFactory
+ protected static class MultiImageElementFactory
implements ElementFactory {
public MultiImageElementFactory() {}
/**
@@ -368,7 +368,7 @@
/**
* To create a 'solidColor' element.
*/
- protected static class SolidColorElementFactory
+ protected static class SolidColorElementFactory
implements ElementFactory {
public SolidColorElementFactory() {
}
@@ -383,7 +383,7 @@
/**
* To create a 'subImage' element.
*/
- protected static class SubImageElementFactory
+ protected static class SubImageElementFactory
implements ElementFactory {
public SubImageElementFactory() {}
/**
@@ -397,7 +397,7 @@
/**
* To create a 'SubImageRef' element.
*/
- protected static class SubImageRefElementFactory
+ protected static class SubImageRefElementFactory
implements ElementFactory {
public SubImageRefElementFactory() {}
/**
@@ -536,7 +536,7 @@
/**
* The default instance of this class.
*/
- protected final static DOMImplementation DOM_IMPLEMENTATION =
+ protected static final DOMImplementation DOM_IMPLEMENTATION =
new SVG12DOMImplementation();
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/traversal/DOMNodeIterator.java Wed Nov 22 09:29:37 2006
@@ -36,22 +36,22 @@
/**
* The initial state.
*/
- protected final static short INITIAL = 0;
+ protected static final short INITIAL = 0;
/**
* The invalid state.
*/
- protected final static short INVALID = 1;
+ protected static final short INVALID = 1;
/**
* The forward state.
*/
- protected final static short FORWARD = 2;
+ protected static final short FORWARD = 2;
/**
* The backward state.
*/
- protected final static short BACKWARD = 3;
+ protected static final short BACKWARD = 3;
/**
* The document which created the iterator.
@@ -166,7 +166,7 @@
}
}
}
-
+
/**
* <b>DOM</b>: Implements {@link NodeIterator#previousNode()}.
*/
@@ -326,7 +326,7 @@
referenceNode = null;
return;
}
-
+
Node n = referenceNode.getPreviousSibling();
// Go to the parent of a first child
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/ListNodeList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/ListNodeList.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/ListNodeList.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/dom/util/ListNodeList.java Wed Nov 22 09:29:37 2006
@@ -53,4 +53,4 @@
public int getLength() {
return list.size();
}
-};
+}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/font/TextPathLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/font/TextPathLayout.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/font/TextPathLayout.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/font/TextPathLayout.java Wed Nov 22 09:29:37 2006
@@ -49,24 +49,24 @@
/**
* Align the text at the start of the path.
*/
- static public final int ALIGN_START = 0;
+ public static final int ALIGN_START = 0;
/**
* Align the text at the middle of the path.
*/
- static public final int ALIGN_MIDDLE = 1;
+ public static final int ALIGN_MIDDLE = 1;
/**
* Align the text at the end of the path.
*/
- static public final int ALIGN_END = 2;
+ public static final int ALIGN_END = 2;
/**
* Use the spacing between the glyphs to adjust for textLength.
*/
- static public final int ADJUST_SPACING = 0;
+ public static final int ADJUST_SPACING = 0;
/**
* Use the entire glyph to adjust for textLength.
*/
- static public final int ADJUST_GLYPHS = 1;
+ public static final int ADJUST_GLYPHS = 1;
/**
* Wraps the GlyphVector around the given path. The results
@@ -74,7 +74,7 @@
* the size of the font that created the GlyphVector, as
* well as the "curvyness" of the path (really dynamic curves
* don't look so great, abrupt changes/vertices look worse).
- *
+ *
* @param glyphs The GlyphVector to layout.
* @param path The path (or shape) to wrap around
* @param align The text alignment to use. Should be one
@@ -89,7 +89,7 @@
*/
- static public Shape layoutGlyphVector(GlyphVector glyphs,
+ public static Shape layoutGlyphVector(GlyphVector glyphs,
Shape path, int align,
float startOffset,
float textLength,
@@ -116,7 +116,7 @@
float currentPosition = startOffset;
// if align is START then a currentPosition of 0f
- // is correct.
+ // is correct.
// if align is END then the currentPosition should
// be enough to place the last character on the end
// of the path
@@ -132,7 +132,7 @@
// iterate through the GlyphVector placing each glyph
for (int i = 0; i < glyphs.getNumGlyphs(); i++) {
-
+
GlyphMetrics gm = glyphs.getGlyphMetrics(i);
float charAdvance = gm.getAdvance();
@@ -151,10 +151,10 @@
}
float glyphWidth = (float) glyph.getBounds2D().getWidth();
-
+
// Use either of these to calculate the mid point
// of the character along the path.
- // If you change this, you must also change the
+ // If you change this, you must also change the
// transform on the glyph down below
// In some case this gives better layout, but
// the way it is at the moment is a closer match
@@ -182,7 +182,7 @@
// rotate midline of glyph to be normal to path
glyphTrans.rotate(angle);
- // translate glyph backwards so we rotate about the
+ // translate glyph backwards so we rotate about the
// center of the glyph
// Choose one of these translations - see the comments
// in the charMidPos calculation above
@@ -193,7 +193,7 @@
newPath.append(glyph, false);
}
-
+
// move along by the advance value
// if the lengthAdjustMode was SPACING then
// we have to take this into account here
@@ -202,15 +202,15 @@
} else {
currentPosition += charAdvance;
}
-
+
}
return newPath;
}
/**
- * Wraps the GlyphVector around the given path.
- *
+ * Wraps the GlyphVector around the given path.
+ *
* @param glyphs The GlyphVector to layout.
* @param path The path (or shape) to wrap around
* @param align The text alignment to use. Should be one
@@ -219,7 +219,7 @@
* wrapped along the path
*/
- static public Shape layoutGlyphVector(GlyphVector glyphs,
+ public static Shape layoutGlyphVector(GlyphVector glyphs,
Shape path, int align) {
return layoutGlyphVector(glyphs, path, align, 0f,
@@ -228,15 +228,15 @@
}
/**
- * Wraps the GlyphVector around the given path.
- *
+ * Wraps the GlyphVector around the given path.
+ *
* @param glyphs The GlyphVector to layout.
* @param path The path (or shape) to wrap around
* @return A shape that is the outline of the glyph vector
* wrapped along the path
*/
- static public Shape layoutGlyphVector(GlyphVector glyphs,
+ public static Shape layoutGlyphVector(GlyphVector glyphs,
Shape path) {
return layoutGlyphVector(glyphs, path, ALIGN_START);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java Wed Nov 22 09:29:37 2006
@@ -529,7 +529,7 @@
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
* @since JDK1.1
*/
- public void drawPolyline(int xPoints[], int yPoints[],
+ public void drawPolyline(int[] xPoints, int[] yPoints,
int nPoints){
if(nPoints > 0){
GeneralPath path = new GeneralPath();
@@ -560,7 +560,7 @@
* @see java.awt.Graphics#fillPolygon(int[],int[],int)
* @see java.awt.Graphics#drawPolyline
*/
- public void drawPolygon(int xPoints[], int yPoints[],
+ public void drawPolygon(int[] xPoints, int[] yPoints,
int nPoints){
Polygon polygon = new Polygon(xPoints, yPoints, nPoints);
draw(polygon);
@@ -587,7 +587,7 @@
* @param nPoints a the total number of points.
* @see java.awt.Graphics#drawPolygon(int[], int[], int)
*/
- public void fillPolygon(int xPoints[], int yPoints[],
+ public void fillPolygon(int[] xPoints, int[] yPoints,
int nPoints){
Polygon polygon = new Polygon(xPoints, yPoints, nPoints);
fill(polygon);
@@ -1420,7 +1420,7 @@
/**
* @return the {@link GraphicContext} of this <code>Graphics2D</code>.
- */
+ */
public GraphicContext getGraphicContext() {
return gc;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java Wed Nov 22 09:29:37 2006
@@ -374,7 +374,7 @@
* there is a security manager, its <code>checkPermission</code>
* method is called with an <code>AWTPermission("readDisplayPixels")</code>
* permission.
- *
+ *
* @param comp the <code>Composite</code> object to be used for rendering
* @throws SecurityException
* if a custom <code>Composite</code> object is being
@@ -701,7 +701,7 @@
* were concatenated with the original one.
*/
public TransformStackElement[] getTransformStack(){
- TransformStackElement stack[] = new TransformStackElement[transformStack.size()];
+ TransformStackElement[] stack = new TransformStackElement[transformStack.size()];
transformStack.copyInto(stack);
return stack;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/g2d/TransformStackElement.java Wed Nov 22 09:29:37 2006
@@ -39,18 +39,18 @@
/**
* Value
*/
- private double transformParameters[];
+ private double[] transformParameters;
/**
* @param type transform type
* @param transformParameters parameters for transform
*/
protected TransformStackElement(TransformType type,
- double transformParameters[]){
+ double[] transformParameters){
this.type = type;
this.transformParameters = transformParameters;
}
-
+
/**
* @return an object which is a deep copy of this one
*/
@@ -63,7 +63,7 @@
} catch(java.lang.CloneNotSupportedException ex) {}
// now deep copy the parameter array
- double transformParameters[] = new double[this.transformParameters.length];
+ double[] transformParameters = new double[this.transformParameters.length];
System.arraycopy(this.transformParameters, 0, transformParameters, 0, transformParameters.length);
newElement.transformParameters = transformParameters;
return newElement;
@@ -73,9 +73,9 @@
* Factory methods
*/
- public static TransformStackElement createTranslateElement(double tx,
+ public static TransformStackElement createTranslateElement(double tx,
double ty){
- return new TransformStackElement(TransformType.TRANSLATE,
+ return new TransformStackElement(TransformType.TRANSLATE,
new double[]{ tx, ty }) {
boolean isIdentity(double[] parameters) {
return parameters[0] == 0 && parameters[1] == 0;
@@ -84,7 +84,7 @@
}
public static TransformStackElement createRotateElement(double theta){
- return new TransformStackElement(TransformType.ROTATE,
+ return new TransformStackElement(TransformType.ROTATE,
new double[]{ theta }) {
boolean isIdentity(double[] parameters) {
return Math.cos(parameters[0]) == 1;
@@ -92,19 +92,19 @@
};
}
- public static TransformStackElement createScaleElement(double scaleX,
+ public static TransformStackElement createScaleElement(double scaleX,
double scaleY){
- return new TransformStackElement(TransformType.SCALE,
+ return new TransformStackElement(TransformType.SCALE,
new double[]{ scaleX, scaleY }) {
boolean isIdentity(double[] parameters) {
return parameters[0] == 1 && parameters[1] == 1;
}
};
}
-
- public static TransformStackElement createShearElement(double shearX,
+
+ public static TransformStackElement createShearElement(double shearX,
double shearY){
- return new TransformStackElement(TransformType.SHEAR,
+ return new TransformStackElement(TransformType.SHEAR,
new double[]{ shearX, shearY }) {
boolean isIdentity(double[] parameters) {
return parameters[0] == 0 && parameters[1] == 0;
@@ -114,7 +114,7 @@
public static TransformStackElement createGeneralTransformElement
(AffineTransform txf){
- double matrix[] = new double[6];
+ double[] matrix = new double[6];
txf.getMatrix(matrix);
return new TransformStackElement(TransformType.GENERAL, matrix) {
boolean isIdentity(double[] m) {
@@ -123,13 +123,13 @@
}
};
}
-
+
/**
* Implementation should determine if the parameter list represents
* an identity transform, for the instance transform type.
*/
abstract boolean isIdentity(double[] parameters);
-
+
/**
* @return true iff this transform is the identity transform
*/
@@ -180,8 +180,8 @@
transformParameters[1] *= stackElement.transformParameters[1];
break;
case TransformType.TRANSFORM_GENERAL:
- transformParameters
- = matrixMultiply(transformParameters,
+ transformParameters
+ = matrixMultiply(transformParameters,
stackElement.transformParameters);
break;
default:
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java Wed Nov 22 09:29:37 2006
@@ -49,7 +49,7 @@
segs[numSegments++] = 1.0;
if (numSegments == 2) return null;
- // System.err.println("Y: " + y + "#Seg: " + numSegments +
+ // System.err.println("Y: " + y + "#Seg: " + numSegments +
// " Seg: " + this);
Segment [] parts = new Segment[numSegments];
@@ -61,17 +61,17 @@
parts[pIdx] = getSegment(segs[i-1], segs[i]);
Point2D.Double pt = parts[pIdx].eval(0.5);
// System.err.println("Pt: " + pt);
- if (pIdx == 0) {
- pIdx++;
+ if (pIdx == 0) {
+ pIdx++;
firstAbove = prevAbove = (pt.y < y);
- continue;
+ continue;
}
boolean above = (pt.y < y);
if (prevAbove == above) {
// Merge segments
parts[pIdx-1] = getSegment(pT, segs[i]);
} else {
- pIdx++;
+ pIdx++;
pT=segs[i-1];
prevAbove = above;
}
@@ -95,25 +95,25 @@
}
public Segment splitBefore(double t) {
- return getSegment(0.0, t);
+ return getSegment(0.0, t);
}
- public Segment splitAfter(double t) {
- return getSegment(t, 1.0);
+ public Segment splitAfter(double t) {
+ return getSegment(t, 1.0);
}
// Doubles have 48bit precision
- static final double eps = 1/(double)(1l<<48);
+ static final double eps = 1/(double)(1L<<48);
static final double tol = 4.0*eps;
public static int solveLine(double a, double b,
double [] roots) {
if (a == 0) {
- if (b != 0)
+ if (b != 0)
// No intersection.
return 0;
// All pts intersect just return 0.
- roots[0] = 0;
+ roots[0] = 0;
return 1;
}
@@ -134,11 +134,11 @@
if (Math.abs(det) <= tol*b*b) {
// one real root (det doesn't contain any useful info)
- roots[0] = -b/(2*a);
+ roots[0] = -b/(2*a);
return 1;
}
- if (det < 0)
+ if (det < 0)
return 0; // No real roots
// Two real roots
@@ -256,21 +256,21 @@
Segment [] below = sr.getBelow();
for (int i=0; i<above.length; i++) {
ps.println("<path fill=\"none\" stroke=\"blue\" " +
- " stroke-width=\"2.5\" " +
+ " stroke-width=\"2.5\" " +
" d=\"" + above[i] + "\"/>");
}
for (int i=0; i<below.length; i++) {
ps.println("<path fill=\"none\" stroke=\"red\" " +
- " stroke-width=\"2\" " +
+ " stroke-width=\"2\" " +
"d=\"" + below[i] + "\"/>");
}
}
public static void main(String [] args) {
PrintStream ps;
double [] roots = { 0, 0, 0 };
- int n = solveCubic (-0.10000991821289062, 9.600013732910156,
+ int n = solveCubic (-0.10000991821289062, 9.600013732910156,
-35.70000457763672, 58.0, roots);
- for (int i=0; i<n; i++)
+ for (int i=0; i<n; i++)
System.err.println("Root: " + roots[i]);
Cubic c;
c = new Cubic(new Point2D.Double(153.6999969482422,5.099999904632568),
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Cubic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Cubic.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Cubic.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Cubic.java Wed Nov 22 09:29:37 2006
@@ -37,7 +37,7 @@
p3 = new Point2D.Double();
p4 = new Point2D.Double();
}
- public Cubic(double x1, double y1, double x2, double y2,
+ public Cubic(double x1, double y1, double x2, double y2,
double x3, double y3, double x4, double y4) {
p1 = new Point2D.Double(x1, y1);
p2 = new Point2D.Double(x2, y2);
@@ -45,7 +45,7 @@
p4 = new Point2D.Double(x4, y4);
}
- public Cubic(Point2D.Double p1, Point2D.Double p2,
+ public Cubic(Point2D.Double p1, Point2D.Double p2,
Point2D.Double p3, Point2D.Double p4) {
this.p1 = p1;
this.p2 = p2;
@@ -54,20 +54,20 @@
}
public Object clone() {
- return new Cubic(new Point2D.Double(p1.x, p1.y),
- new Point2D.Double(p2.x, p2.y),
- new Point2D.Double(p3.x, p3.y),
+ return new Cubic(new Point2D.Double(p1.x, p1.y),
+ new Point2D.Double(p2.x, p2.y),
+ new Point2D.Double(p3.x, p3.y),
new Point2D.Double(p4.x, p4.y));
}
public Segment reverse() {
- return new Cubic(new Point2D.Double(p4.x, p4.y),
- new Point2D.Double(p3.x, p3.y),
- new Point2D.Double(p2.x, p2.y),
+ return new Cubic(new Point2D.Double(p4.x, p4.y),
+ new Point2D.Double(p3.x, p3.y),
+ new Point2D.Double(p2.x, p2.y),
new Point2D.Double(p1.x, p1.y));
}
- private void getMinMax(double p1, double p2,
+ private void getMinMax(double p1, double p2,
double p3, double p4,
double [] minMax) {
if (p4 > p1){
@@ -84,7 +84,7 @@
for (int r=0; r<roots; r++) {
double tv = eqn[r];
if ((tv <= 0) || (tv >= 1)) continue;
- tv = ((1-tv)*(1-tv)*(1-tv)*p1 +
+ tv = ((1-tv)*(1-tv)*(1-tv)*p1 +
3*tv*(1-tv)*(1-tv)*p2 +
3*tv*tv*(1-tv)*p3 +
tv*tv*tv*p4);
@@ -132,10 +132,10 @@
}
public Point2D.Double evalDt(double t) {
- double x = 3*( (p2.x-p1.x)*(1-t)*(1-t) +
+ double x = 3*( (p2.x-p1.x)*(1-t)*(1-t) +
2*(p3.x-p2.x)*(1-t)*t +
(p4.x-p3.x)*t*t);
- double y = 3*( (p2.y-p1.y)*(1-t)*(1-t) +
+ double y = 3*( (p2.y-p1.y)*(1-t)*(1-t) +
2*(p3.y-p2.y)*(1-t)*t +
(p4.y-p3.y)*t*t);
return new Point2D.Double(x, y);
@@ -143,11 +143,11 @@
public Point2D.Double eval(double t) {
- double x = ((1-t)*(1-t)*(1-t)*p1.x +
+ double x = ((1-t)*(1-t)*(1-t)*p1.x +
3*(t* (1-t)*(1-t)*p2.x +
t* t* (1-t)*p3.x) +
t*t*t *p4.x);
- double y = ((1-t)*(1-t)*(1-t)*p1.y +
+ double y = ((1-t)*(1-t)*(1-t)*p1.y +
3*(t* (1-t)*(1-t)*p2.y +
t* t* (1-t)*p3.y) +
t*t*t *p4.y);
@@ -191,15 +191,15 @@
double npX = (p1.x+3*(p2.x+p3.x)+p4.x)*0.125;
double npY = (p1.y+3*(p2.y+p3.y)+p4.y)*0.125;
- double npdx = ((p2.x-p1.x)+2*(p3.x-p2.x)+(p4.x-p3.x))*.125;
- double npdy = ((p2.y-p1.y)+2*(p3.y-p2.y)+(p4.y-p3.y))*.125;
+ double npdx = ((p2.x-p1.x)+2*(p3.x-p2.x)+(p4.x-p3.x))*0.125;
+ double npdy = ((p2.y-p1.y)+2*(p3.y-p2.y)+(p4.y-p3.y))*0.125;
if (c0 != null) {
c0.p1.x = p1.x;
c0.p1.y = p1.y;
- c0.p2.x = (p2.x+p1.x)*.5;
- c0.p2.y = (p2.y+p1.y)*.5;
-
+ c0.p2.x = (p2.x+p1.x)*0.5;
+ c0.p2.y = (p2.y+p1.y)*0.5;
+
c0.p3.x = npX-npdx;
c0.p3.y = npY-npdy;
c0.p4.x = npX;
@@ -211,9 +211,9 @@
c1.p1.y = npY;
c1.p2.x = npX+npdx;
c1.p2.y = npY+npdy;
-
- c1.p3.x = (p4.x+p3.x)*.5;
- c1.p3.y = (p4.y+p3.y)*.5;
+
+ c1.p3.x = (p4.x+p3.x)*0.5;
+ c1.p3.y = (p4.y+p3.y)*0.5;
c1.p4.x = p4.x;
c1.p4.y = p4.y;
}
@@ -235,7 +235,7 @@
c0.p1.y = p1.y;
c0.p2.x = (p2.x+p1.x)*t;
c0.p2.y = (p2.y+p1.y)*t;
-
+
c0.p3.x = np.x-(npd.x*t/3);
c0.p3.y = np.y-(npd.y*t/3);
c0.p4.x = np.x;
@@ -247,7 +247,7 @@
c1.p1.y = np.y;
c1.p2.x = np.x+(npd.x*(1-t)/3);
c1.p2.y = np.y+(npd.y*(1-t)/3);
-
+
c1.p3.x = (p4.x+p3.x)*(1-t);
c1.p3.y = (p4.y+p3.y)*(1-t);
c1.p4.x = p4.x;
@@ -261,7 +261,7 @@
Point2D.Double dp1 = evalDt(t0);
Point2D.Double np2 = new Point2D.Double(np1.x+dt*dp1.x/3,
np1.y+dt*dp1.y/3);
-
+
Point2D.Double np4 = eval(t1);
Point2D.Double dp4 = evalDt(t1);
@@ -288,7 +288,7 @@
if (hullLen < maxErr) return (hullLen+cordLen)/2;
double err = (hullLen-cordLen);
- if (err < maxErr)
+ if (err < maxErr)
return (hullLen+cordLen)/2;
Cubic c = new Cubic();
@@ -297,17 +297,17 @@
double npdx = (cldx + cdx)*.125;
double npdy = (cldy + cdy)*.125;
-
+
c.p1.x = p1.x;
c.p1.y = p1.y;
c.p2.x = (p2.x+p1.x)*.5;
c.p2.y = (p2.y+p1.y)*.5;
-
+
c.p3.x = npX-npdx;
c.p3.y = npY-npdy;
c.p4.x = npX;
c.p4.y = npY;
-
+
double midLen = Math.sqrt(npdx*npdx+npdy*npdy);
double len = c.subLength(leftLegLen/2, midLen, maxErr/2);
@@ -315,7 +315,7 @@
c.p1.y = npY;
c.p2.x = npX+npdx;
c.p2.y = npY+npdy;
-
+
c.p3.x = (p4.x+p3.x)*.5;
c.p3.y = (p4.y+p3.y)*.5;
c.p4.x = p4.x;
@@ -340,17 +340,17 @@
dx = p3.x-p2.x;
dy = p3.y-p2.y;
double crossLegLen = Math.sqrt(dx*dx+dy*dy);
-
+
double eps = maxErr*(leftLegLen+rightLegLen+crossLegLen);
return subLength(leftLegLen, rightLegLen, eps);
}
- public String toString() {
- return ("M" + p1.x + "," + p1.y +
- "C" + p2.x + "," + p2.y + " " +
- p3.x + "," + p3.y + " " +
- p4.x + "," + p4.y);
+ public String toString() {
+ return "M" + p1.x + ',' + p1.y +
+ 'C' + p2.x + ',' + p2.y + ' ' +
+ p3.x + ',' + p3.y + ' ' +
+ p4.x + ',' + p4.y;
}
/*
public static boolean epsEq(double a, double b) {
@@ -358,7 +358,7 @@
return (((a + eps) > b) && ((a-eps) < b));
}
- public static void sub(Cubic orig, Cubic curr,
+ public static void sub(Cubic orig, Cubic curr,
double t, double inc, int lev) {
Cubic left=new Cubic();
Cubic right=new Cubic();
@@ -400,7 +400,7 @@
len += Math.sqrt(dx*dx + dy*dy);
oldP = newP;
}
- System.err.println("Length(.1): " + c.getLength(.001) +
+ System.err.println("Length(.1): " + c.getLength(.001) +
" x " + count); count = 0;
System.err.println("Length : " + c.getLength() +
" x " + count); count = 0;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/ExtendedShape.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/ExtendedShape.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/ExtendedShape.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/ExtendedShape.java Wed Nov 22 09:29:37 2006
@@ -31,6 +31,6 @@
/**
* Get an extended Path iterator that may return SEG_ARCTO commands
*/
- public ExtendedPathIterator getExtendedPathIterator();
+ ExtendedPathIterator getExtendedPathIterator();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Linear.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Linear.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Linear.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Linear.java Wed Nov 22 09:29:37 2006
@@ -34,7 +34,7 @@
p2 = new Point2D.Double();
}
- public Linear(double x1, double y1,
+ public Linear(double x1, double y1,
double x2, double y2) {
p1 = new Point2D.Double(x1, y1);
p2 = new Point2D.Double(x2, y2);
@@ -46,28 +46,28 @@
}
public Object clone() {
- return new Linear(new Point2D.Double(p1.x, p1.y),
+ return new Linear(new Point2D.Double(p1.x, p1.y),
new Point2D.Double(p2.x, p2.y));
}
public Segment reverse() {
- return new Linear(new Point2D.Double(p2.x, p2.y),
+ return new Linear(new Point2D.Double(p2.x, p2.y),
new Point2D.Double(p1.x, p1.y));
}
- public double minX() {
+ public double minX() {
if (p1.x < p2.x) return p1.x;
return p2.x;
}
- public double maxX() {
+ public double maxX() {
if (p1.x > p2.x) return p1.x;
return p2.x;
}
- public double minY() {
+ public double minY() {
if (p1.y < p2.y) return p1.y;
return p2.y;
}
- public double maxY() {
+ public double maxY() {
if (p1.y > p2.y) return p2.y;
return p1.y;
}
@@ -215,9 +215,9 @@
return getLength();
}
- public String toString() {
- return ("M" + p1.x + "," + p1.y +
- "L" + p2.x + "," + p2.y);
+ public String toString() {
+ return "M" + p1.x + ',' + p1.y +
+ 'L' + p2.x + ',' + p2.y;
}
/*
@@ -226,7 +226,7 @@
return (((a + eps) > b) && ((a-eps) < b));
}
- public static void sub(Linear orig, Linear curr,
+ public static void sub(Linear orig, Linear curr,
double t, double inc, int lev) {
Linear left=new Linear();
Linear right=new Linear();
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polygon2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polygon2D.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polygon2D.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polygon2D.java Wed Nov 22 09:29:37 2006
@@ -47,14 +47,14 @@
* number of points in this <code>Polygon2D</code>.
*
*/
- public float xpoints[];
+ public float[] xpoints;
/**
* The array of <i>x</i> coordinates. The value of {@link #npoints npoints} is equal to the
* number of points in this <code>Polygon2D</code>.
*
*/
- public float ypoints[];
+ public float[] ypoints;
/**
* Bounds of the Polygon2D.
@@ -131,7 +131,7 @@
* @exception NullPointerException if <code>xpoints</code> or
* <code>ypoints</code> is <code>null</code>.
*/
- public Polygon2D(float xpoints[], float ypoints[], int npoints) {
+ public Polygon2D(float[] xpoints, float[] ypoints, int npoints) {
if (npoints > xpoints.length || npoints > ypoints.length) {
throw new IndexOutOfBoundsException("npoints > xpoints.length || npoints > ypoints.length");
}
@@ -157,7 +157,7 @@
* @exception NullPointerException if <code>xpoints</code> or
* <code>ypoints</code> is <code>null</code>.
*/
- public Polygon2D(int xpoints[], int ypoints[], int npoints) {
+ public Polygon2D(int[] xpoints, int[] ypoints, int npoints) {
if (npoints > xpoints.length || npoints > ypoints.length) {
throw new IndexOutOfBoundsException("npoints > xpoints.length || npoints > ypoints.length");
}
@@ -235,7 +235,7 @@
int[] _xpoints = new int[npoints];
int[] _ypoints = new int[npoints];
for (int i = 0; i < npoints; i++) {
- _xpoints[i] = (int)xpoints[i];
+ _xpoints[i] = (int)xpoints[i]; // todo maybe rounding is better ?
_ypoints[i] = (int)ypoints[i];
}
@@ -253,7 +253,7 @@
*/
public void addPoint(float x, float y) {
if (npoints == xpoints.length) {
- float tmp[];
+ float[] tmp;
tmp = new float[npoints * 2];
System.arraycopy(xpoints, 0, tmp, 0, npoints);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polyline2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polyline2D.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polyline2D.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Polyline2D.java Wed Nov 22 09:29:37 2006
@@ -48,14 +48,14 @@
* number of points in this <code>Polyline2D</code>.
*
*/
- public float xpoints[];
+ public float[] xpoints;
/**
* The array of <i>x</i> coordinates. The value of {@link #npoints npoints} is equal to the
* number of points in this <code>Polyline2D</code>.
*
*/
- public float ypoints[];
+ public float[] ypoints;
/**
* Bounds of the Polyline2D.
@@ -115,7 +115,7 @@
* @exception NullPointerException if <code>xpoints</code> or
* <code>ypoints</code> is <code>null</code>.
*/
- public Polyline2D(int xpoints[], int ypoints[], int npoints) {
+ public Polyline2D(int[] xpoints, int[] ypoints, int npoints) {
if (npoints > xpoints.length || npoints > ypoints.length) {
throw new IndexOutOfBoundsException("npoints > xpoints.length || npoints > ypoints.length");
}
@@ -218,7 +218,7 @@
*/
public void addPoint(float x, float y) {
if (npoints == xpoints.length) {
- float tmp[];
+ float[] tmp;
tmp = new float[npoints * 2];
System.arraycopy(xpoints, 0, tmp, 0, npoints);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Quadradic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Quadradic.java?view=diff&rev=478249&r1=478248&r2=478249
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Quadradic.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/ext/awt/geom/Quadradic.java Wed Nov 22 09:29:37 2006
@@ -36,16 +36,16 @@
p3 = new Point2D.Double();
}
- public Quadradic(double x1, double y1,
- double x2, double y2,
+ public Quadradic(double x1, double y1,
+ double x2, double y2,
double x3, double y3) {
p1 = new Point2D.Double(x1, y1);
p2 = new Point2D.Double(x2, y2);
p3 = new Point2D.Double(x3, y3);
}
- public Quadradic(Point2D.Double p1,
- Point2D.Double p2,
+ public Quadradic(Point2D.Double p1,
+ Point2D.Double p2,
Point2D.Double p3) {
this.p1 = p1;
this.p2 = p2;
@@ -53,18 +53,18 @@
}
public Object clone() {
- return new Quadradic(new Point2D.Double(p1.x, p1.y),
- new Point2D.Double(p2.x, p2.y),
+ return new Quadradic(new Point2D.Double(p1.x, p1.y),
+ new Point2D.Double(p2.x, p2.y),
new Point2D.Double(p3.x, p3.y));
}
public Segment reverse() {
- return new Quadradic(new Point2D.Double(p3.x, p3.y),
- new Point2D.Double(p2.x, p2.y),
+ return new Quadradic(new Point2D.Double(p3.x, p3.y),
+ new Point2D.Double(p2.x, p2.y),
new Point2D.Double(p1.x, p1.y));
}
- private void getMinMax(double p1, double p2,
+ private void getMinMax(double p1, double p2,
double p3, double [] minMax) {
if (p3 > p1){
minMax[0] = p1; minMax[1] = p3;
@@ -85,27 +85,27 @@
else if (tv > minMax[1]) minMax[1] = tv;
}
- public double minX() {
+ public double minX() {
double [] minMax = {0, 0};
getMinMax(p1.x, p2.x, p3.x, minMax);
return minMax[0];
}
- public double maxX() {
+ public double maxX() {
double [] minMax = {0, 0};
getMinMax(p1.x, p2.x, p3.x, minMax);
return minMax[1];
}
- public double minY() {
+ public double minY() {
double [] minMax = {0, 0};
getMinMax(p1.y, p2.y, p3.y, minMax);
return minMax[0];
}
- public double maxY() {
+ public double maxY() {
double [] minMax = {0, 0};
getMinMax(p1.y, p2.y, p3.y, minMax);
return minMax[1];
}
- public Rectangle2D getBounds2D() {
+ public Rectangle2D getBounds2D() {
double [] minMaxX = {0, 0};
getMinMax(p1.x, p2.x, p3.x, minMaxX);
double [] minMaxY = {0, 0};
@@ -122,7 +122,7 @@
// return solveQuad(eqn[2], eqn[1], eqn[0], roots);
}
- public Point2D.Double evalDt(double t) {
+ public Point2D.Double evalDt(double t) {
double x = 2*(p1.x-2*p2.x+p3.x)*t + 2*(p2.x-p1.x);
double y = 2*(p1.y-2*p2.y+p3.y)*t + 2*(p2.y-p1.y);
return new Point2D.Double(x, y);
@@ -140,7 +140,7 @@
Point2D.Double np2 = new Point2D.Double
(np1.x+.5*dt*dp1.x, np1.y+.5*dt*dp1.y);
-
+
Point2D.Double np3 = eval(t1);
return new Quadradic(np1, np2, np3);
}
@@ -246,7 +246,7 @@
if (hullLen < maxErr) return (hullLen+cordLen)*.5;
double err = (hullLen-cordLen);
- if (err < maxErr)
+ if (err < maxErr)
return (hullLen+cordLen)*.5;
Quadradic q = new Quadradic();
@@ -255,14 +255,14 @@
dx = .25*dx;
dy = .25*dy;
-
+
q.p1.x = p1.x;
q.p1.y = p1.y;
q.p2.x = x-dx;
q.p2.y = y-dy;
q.p3.x = x;
q.p3.y = y;
-
+
double midLen = .25*cordLen;
double len = q.subLength(leftLegLen*.5, midLen, maxErr*.5);
@@ -289,16 +289,16 @@
dx = p3.x-p2.x;
dy = p3.y-p2.y;
double rightLegLen = Math.sqrt(dx*dx+dy*dy);
-
+
double eps = maxErr*(leftLegLen+rightLegLen);
return subLength(leftLegLen, rightLegLen, eps);
}
- public String toString() {
- return ("M" + p1.x + "," + p1.y +
- "Q" + p2.x + "," + p2.y + " " +
- p3.x + "," + p3.y );
+ public String toString() {
+ return "M" + p1.x + ',' + p1.y +
+ 'Q' + p2.x + ',' + p2.y + ' ' +
+ p3.x + ',' + p3.y;
}
/*
@@ -307,7 +307,7 @@
return (((a + eps) > b) && ((a-eps) < b));
}
- public static void sub(Quadradic orig, Quadradic curr,
+ public static void sub(Quadradic orig, Quadradic curr,
double t, double inc, int lev) {
Quadradic left=new Quadradic();
Quadradic right=new Quadradic();
@@ -349,7 +349,7 @@
len += Math.sqrt(dx*dx + dy*dy);
oldP = newP;
}
- System.err.println("Length(.1): " + q.getLength(.001) +
+ System.err.println("Length(.1): " + q.getLength(.001) +
" x " + count); count = 0;
System.err.println("Length : " + q.getLength() +
" x " + count); count = 0;
@@ -367,7 +367,7 @@
sub(q, q, .5, .25, 3);
evalQuad(q);
-
+
}
*/
}