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 ca...@apache.org on 2005/07/12 04:06:00 UTC
svn commit: r215909 [6/13] - in /xmlgraphics/batik/branches/svg12: ./
contrib/charts/xml/ contrib/charts/xsl/ contrib/fonts/gladiator/svg/
contrib/jsvg/ contrib/tiledTranscoder/
resources/org/apache/batik/apps/svgbrowser/resources/ resources/org/apache...
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java Mon Jul 11 19:05:44 2005
@@ -910,11 +910,10 @@
* img1 = op.filter(img, null);
* drawImage(img1, new AffineTransform(1f,0f,0f,1f,x,y), null);
* </pre>
- * @param op the filter to be applied to the image before rendering
* @param img the <code>BufferedImage</code> to be rendered
- * @param x, y the location in user space where the upper left
- * corner of the
- * image is rendered
+ * @param op the filter to be applied to the image before rendering
+ * @param x the x coordinate in user space where the image is rendered
+ * @param y the y coordinate in user space where the image is rendered
* @see #transform
* @see #setTransform
* @see #setComposite
@@ -944,8 +943,10 @@
* screen.
*
* @param g the <code>GlyphVector</code> to be rendered
- * @param x, y the position in User Space where the glyphs should
- * be rendered
+ * @param x the x position in user space where the glyphs should be
+ * rendered
+ * @param y the y position in user space where the glyphs should be
+ * rendered
*
* @see java.awt.Font#createGlyphVector
* @see java.awt.font.GlyphVector
@@ -1039,10 +1040,8 @@
* @param paint the <code>Paint</code> object to be used to generate
* color during the rendering process, or <code>null</code>
* @see java.awt.Graphics#setColor
- * @see GradientPaint
- * @see TexturePaint
*/
- public void setPaint( Paint paint ){
+ public void setPaint(Paint paint) {
gc.setPaint(paint);
}
@@ -1051,7 +1050,6 @@
* Sets the <code>Stroke</code> for the <code>Graphics2D</code> context.
* @param s the <code>Stroke</code> object to be used to stroke a
* <code>Shape</code> during the rendering process
- * @see BasicStroke
*/
public void setStroke(Stroke s){
gc.setStroke(s);
@@ -1202,7 +1200,8 @@
* Rotating with a positive angle theta rotates points on the positive
* x axis toward the positive y axis.
* @param theta the angle of rotation in radians
- * @param x, y coordinates of the origin of the rotation
+ * @param x the x coordinate of the origin of the rotation
+ * @param y the y coordinate of the origin of the rotation
*/
public void rotate(double theta, double x, double y){
gc.rotate(theta, x, y);
@@ -1382,9 +1381,9 @@
* The <i>user clip</i> modified by this method is independent of the
* clipping associated with device bounds and visibility. If no clip has
* previously been set, or if the clip has been cleared using
- * {@link Graphics#setClip(Shape) setClip} with a <code>null</code>
- * argument, the specified <code>Shape</code> becomes the new
- * user clip.
+ * {@link java.awt.Graphics#setClip(Shape) setClip} with a
+ * <code>null</code> argument, the specified <code>Shape</code> becomes
+ * the new user clip.
* @param s the <code>Shape</code> to be intersected with the current
* <code>Clip</code>. If <code>s</code> is <code>null</code>,
* this method clears the current <code>Clip</code>.
@@ -1417,5 +1416,12 @@
*/
public FontRenderContext getFontRenderContext(){
return gc.getFontRenderContext();
+ }
+
+ /**
+ * @return the {@link GraphicContext} of this <code>Graphics2D</code>.
+ */
+ public GraphicContext getGraphicContext() {
+ return gc;
}
}
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java Mon Jul 11 19:05:44 2005
@@ -264,8 +264,10 @@
* left, in which case the coordinate supplied is the location of the
* leftmost character on the baseline.
* @param s the <code>String</code> to be rendered
- * @param x, y the coordinates where the <code>String</code>
- * should be rendered
+ * @param x the x coordinate where the <code>String</code> should be
+ * rendered
+ * @param y the y coordinate where the <code>String</code> should be
+ * rendered
* @see #setPaint
* @see java.awt.Graphics#setColor
* @see java.awt.Graphics#setFont
@@ -292,8 +294,8 @@
* coordinate supplied is the location of the leftmost character
* on the baseline.
* @param iterator the iterator whose text is to be rendered
- * @param x, y the coordinates where the iterator's text is to be
- * rendered
+ * @param x the x coordinate where the iterator's text is to be rendered
+ * @param y the y coordinate where the iterator's text is to be rendered
* @see #setPaint
* @see java.awt.Graphics#setColor
* @see #setTransform
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java Mon Jul 11 19:05:44 2005
@@ -53,7 +53,7 @@
/**
* Default Transform to be used for creating FontRenderContext.
*/
- private AffineTransform defaultTransform = new AffineTransform();
+ protected AffineTransform defaultTransform = new AffineTransform();
/**
* Current AffineTransform. This is the concatenation
@@ -61,63 +61,63 @@
* invocation) and the following transform invocations,
* as captured by originalTransform and the transformStack.
*/
- private AffineTransform transform = new AffineTransform();
+ protected AffineTransform transform = new AffineTransform();
/**
* Transform stack
*/
- private Vector transformStack = new Vector();
+ protected Vector transformStack = new Vector();
/**
* Defines whether the transform stack is valide or not.
* This is for use by the class clients. The client should
* validate the stack every time it starts using it. The
* stack becomes invalid when a new transform is set.
- * @see #invalidatTransformStack
+ * @see #invalidateTransformStack()
* @see #isTransformStackValid
* @see #setTransform
*/
- private boolean transformStackValid = true;
+ protected boolean transformStackValid = true;
/**
* Current Paint
*/
- private Paint paint = Color.black;
+ protected Paint paint = Color.black;
/**
* Current Stroke
*/
- private Stroke stroke = new BasicStroke();
+ protected Stroke stroke = new BasicStroke();
/**
* Current Composite
*/
- private Composite composite = AlphaComposite.SrcOver;
+ protected Composite composite = AlphaComposite.SrcOver;
/**
* Current clip
*/
- private Shape clip = null;
+ protected Shape clip = null;
/**
* Current set of RenderingHints
*/
- private RenderingHints hints = new RenderingHints(null);
+ protected RenderingHints hints = new RenderingHints(null);
/**
* Current Font
*/
- private Font font = new Font("sanserif", Font.PLAIN, 12);
+ protected Font font = new Font("sanserif", Font.PLAIN, 12);
/**
* Current background color.
*/
- private Color background = new Color(0, 0, 0, 0);
+ protected Color background = new Color(0, 0, 0, 0);
/**
* Current foreground color
*/
- private Color foreground = Color.black;
+ protected Color foreground = Color.black;
/**
* Default constructor
@@ -397,8 +397,8 @@
* @param paint the <code>Paint</code> object to be used to generate
* color during the rendering process, or <code>null</code>
* @see java.awt.Graphics#setColor
- * @see GradientPaint
- * @see TexturePaint
+ * @see java.awt.GradientPaint
+ * @see java.awt.TexturePaint
*/
public void setPaint( Paint paint ){
if(paint == null)
@@ -583,7 +583,8 @@
* Rotating with a positive angle theta rotates points on the positive
* x axis toward the positive y axis.
* @param theta the angle of rotation in radians
- * @param x, y coordinates of the origin of the rotation
+ * @param x x coordinate of the origin of the rotation
+ * @param y y coordinate of the origin of the rotation
*/
public void rotate(double theta, double x, double y){
transform.rotate(theta, x, y);
@@ -709,7 +710,7 @@
* since it was last read. Only validateTransformStack
* can override this memento
*/
- void invalidateTransformStack(){
+ protected void invalidateTransformStack(){
transformStack.removeAllElements();
transformStackValid = false;
}
@@ -808,9 +809,9 @@
* The <i>user clip</i> modified by this method is independent of the
* clipping associated with device bounds and visibility. If no clip has
* previously been set, or if the clip has been cleared using
- * {@link Graphics#setClip(Shape) setClip} with a <code>null</code>
- * argument, the specified <code>Shape</code> becomes the new
- * user clip.
+ * {@link java.awt.Graphics#setClip(Shape) setClip} with a
+ * <code>null</code> argument, the specified <code>Shape</code> becomes
+ * the new user clip.
* @param s the <code>Shape</code> to be intersected with the current
* <code>Clip</code>. If <code>s</code> is <code>null</code>,
* this method clears the current <code>Clip</code>.
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/TransformType.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/TransformType.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/TransformType.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/g2d/TransformType.java Mon Jul 11 19:05:44 2005
@@ -82,11 +82,14 @@
}
/**
- * Convenience for enumeration switching
- * i.e. switch(transformType.toInt()){
+ * Convenience for enumeration switching.
+ * That is,
+ * <pre>
+ * switch(transformType.toInt()){
* case TransformType.TRANSFORM_TRANSLATE:
* ....
* case TransformType.TRANSFORM_ROTATE:
+ * </pre>
*/
public int toInt(){
return val;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java Mon Jul 11 19:05:44 2005
@@ -1,11 +1,20 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.util.Arrays;
@@ -15,13 +24,18 @@
import java.io.PrintStream;
import java.io.FileOutputStream;
+/**
+ * An abstract class for path segments.
+ *
+ * @version $Id$
+ */
public abstract class AbstractSegment implements Segment {
private static final double rt3 = 1.7320508075689;
protected abstract int findRoots(double y, double [] roots);
- public SplitResults split(double y) {
+ public Segment.SplitResults split(double y) {
double [] roots = { 0, 0, 0 };
int numSol = findRoots(y, roots);
if (numSol == 0) return null; // No split
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Cubic.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Cubic.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Cubic.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Cubic.java Mon Jul 11 19:05:44 2005
@@ -1,11 +1,20 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.awt.geom.CubicCurve2D;
@@ -13,6 +22,11 @@
import java.awt.geom.QuadCurve2D;
import java.awt.geom.Rectangle2D;
+/**
+ * A class representing a cubic path segment.
+ *
+ * @version $Id$
+ */
public class Cubic extends AbstractSegment {
public Point2D.Double p1, p2, p3, p4;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/ExtendedGeneralPath.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/ExtendedGeneralPath.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/ExtendedGeneralPath.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/ExtendedGeneralPath.java Mon Jul 11 19:05:44 2005
@@ -90,9 +90,10 @@
* indicate if we increase or decrease the angles and the final
* point of the arc.
*
- * @param rx, ry the radii of the ellipse
+ * @param rx the x radius of the ellipse
+ * @param ry the y radius of the ellipse
*
- * @param theta the angle from the x-axis of the current
+ * @param angle the angle from the x-axis of the current
* coordinate system to the x-axis of the ellipse in degrees.
*
* @param largeArcFlag the large arc flag. If true the arc
@@ -103,8 +104,8 @@
* center to arc sweeps through decreasing angles otherwise it
* sweeps through increasing angles
*
- * @param x, y the absolute coordinates of the final point of
- * the arc.
+ * @param x the absolute x coordinate of the final point of the arc.
+ * @param y the absolute y coordinate of the final point of the arc.
*/
public synchronized void arcTo(float rx, float ry,
float angle,
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Linear.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Linear.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Linear.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Linear.java Mon Jul 11 19:05:44 2005
@@ -1,11 +1,20 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.util.Arrays;
@@ -14,6 +23,11 @@
import java.io.PrintStream;
import java.io.FileOutputStream;
+/**
+ * A class representing a linear path segment.
+ *
+ * @version $Id$
+ */
public class Linear implements Segment {
public Point2D.Double p1, p2;
@@ -86,7 +100,7 @@
return new Point2D.Double(x, y);
}
- public SplitResults split(double y) {
+ public Segment.SplitResults split(double y) {
if ((y == p1.y) || (y == p2.y)) return null;
if ((y <= p1.y) && (y <= p2.y)) return null;
if ((y >= p1.y) && (y >= p2.y)) return null;
@@ -100,8 +114,8 @@
Segment [] t1 = {getSegment(t,1)};
if (p2.y < y)
- return new SplitResults(t0, t1);
- return new SplitResults(t1, t0);
+ return new Segment.SplitResults(t0, t1);
+ return new Segment.SplitResults(t1, t0);
}
public Segment getSegment(double t0, double t1) {
@@ -143,9 +157,9 @@
/**
* Subdivides this Cubic curve into two curves at t = 0.5.
- * can be done with getSegment but this is more efficent.
- * @param c0 if non-null contains portion of curve from 0->.5
- * @param c1 if non-null contains portion of curve from .5->1
+ * Can be done with getSegment but this is more efficent.
+ * @param l0 if non-null contains portion of curve from 0->.5
+ * @param l1 if non-null contains portion of curve from .5->1
*/
public void subdivide(Linear l0, Linear l1) {
if ((l0 == null) && (l1 == null)) return;
@@ -168,10 +182,11 @@
}
/**
- * Subdivides this Cubic curve into two curves at t = 0.5.
- * can be done with getSegment but this is more efficent.
- * @param c0 if non-null contains portion of curve from 0->.5
- * @param c1 if non-null contains portion of curve from .5->1
+ * Subdivides this Cubic curve into two curves.
+ * Can be done with getSegment but this is more efficent.
+ * @param t position to split the curve
+ * @param l0 if non-null contains portion of curve from 0->t
+ * @param l1 if non-null contains portion of curve from t->1
*/
public void subdivide(double t, Linear l0, Linear l1) {
if ((l0 == null) && (l1 == null)) return;
@@ -199,9 +214,7 @@
return Math.sqrt(dx*dx+dy*dy);
}
public double getLength(double maxErr) {
- double dx = p2.x-p1.x;
- double dy = p2.y-p1.y;
- return Math.sqrt(dx*dx+dy*dy);
+ return getLength();
}
public String toString() {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/PathLength.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/PathLength.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/PathLength.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/PathLength.java Mon Jul 11 19:05:44 2005
@@ -250,7 +250,7 @@
}
- private int findUpperIndex(float length) {
+ public int findUpperIndex(float length) {
if (!initialised)
initialise();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Quadradic.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Quadradic.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Quadradic.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Quadradic.java Mon Jul 11 19:05:44 2005
@@ -1,11 +1,20 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.awt.geom.CubicCurve2D;
@@ -13,6 +22,11 @@
import java.awt.geom.QuadCurve2D;
import java.awt.geom.Rectangle2D;
+/**
+ * A class representing a quadratic path segment.
+ *
+ * @version $Id$
+ */
public class Quadradic extends AbstractSegment {
public Point2D.Double p1, p2, p3;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Segment.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Segment.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Segment.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/Segment.java Mon Jul 11 19:05:44 2005
@@ -1,16 +1,30 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+/**
+ * An interface that path segments must implement.
+ *
+ * @version $Id$
+ */
public interface Segment extends Cloneable {
public double minX();
public double maxX();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/SegmentList.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/SegmentList.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/SegmentList.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/geom/SegmentList.java Mon Jul 11 19:05:44 2005
@@ -1,11 +1,20 @@
-/**************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved. *
- * ---------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software *
- * License version 1.1, a copy of which has been included with this *
- * distribution in the LICENSE file. *
- **************************************************************************/
+/*
+ Copyright 2003 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ */
package org.apache.batik.ext.awt.geom;
import java.awt.Shape;
@@ -16,6 +25,11 @@
import java.util.LinkedList;
import java.util.Iterator;
+/**
+ * A class representing a list of path segments.
+ *
+ * @version $Id$
+ */
public class SegmentList {
List segments = new LinkedList();
@@ -89,7 +103,7 @@
public int size() { return segments.size(); }
- public SplitResults split(double y) {
+ public SegmentList.SplitResults split(double y) {
Iterator iter = segments.iterator();
SegmentList above = null;
SegmentList below = null;
@@ -125,10 +139,10 @@
below.add(resBelow[i]);
}
}
- return new SplitResults(above, below);
+ return new SegmentList.SplitResults(above, below);
}
- public class SplitResults {
+ public static class SplitResults {
SegmentList above, below;
public SplitResults(SegmentList above, SegmentList below) {
this.above = above;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/AbstractLight.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/AbstractLight.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/AbstractLight.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/AbstractLight.java Mon Jul 11 19:05:44 2005
@@ -22,7 +22,7 @@
/**
* An abstract implementation of the Light interface.
*
- * @author <a href="mailto:deweese@apache.org>Thomas DeWeese</a>
+ * @author <a href="mailto:deweese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
public abstract class AbstractLight implements Light {
@@ -119,7 +119,7 @@
* @param dx delta x for computing light vectors in user space
* @param width number of samples to compute on the x axis
* @param z array containing the z elevation for all the points
- * @param lightRwo array to store the light info to, if null it will
+ * @param lightRow array to store the light info to, if null it will
* be allocated for you and returned.
*
* @return an array width columns where each element
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/DistantLight.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/DistantLight.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/DistantLight.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/DistantLight.java Mon Jul 11 19:05:44 2005
@@ -23,7 +23,7 @@
* A light source placed at the infinity, such that the light angle is
* constant over the whole surface.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class DistantLight extends AbstractLight {
@@ -100,7 +100,7 @@
* @param dx delta x for computing light vectors in user space
* @param width number of samples to compute on the x axis
* @param z array containing the z elevation for all the points
- * @param lightRwo array to store the light info to, if null it will
+ * @param lightRow array to store the light info to, if null it will
* be allocated for you and returned.
*
* @return an array width columns where each element
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/GraphicsUtil.java Mon Jul 11 19:05:44 2005
@@ -127,12 +127,15 @@
else
at.preConcatenate(g2dAt);
- ColorModel srcCM = cr.getColorModel();
- ColorSpace g2dCS = getDestinationColorSpace(g2d);
+ ColorModel srcCM = cr.getColorModel();
ColorModel g2dCM = getDestinationColorModel(g2d);
+ ColorSpace g2dCS = null;
+ if (g2dCM != null)
+ g2dCS = g2dCM.getColorSpace();
if (g2dCS == null)
// Assume device is sRGB
g2dCS = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+
ColorModel drawCM = g2dCM;
if ((g2dCM == null) || !g2dCM.hasAlpha()) {
// If we can't find out about our device or the device
@@ -513,6 +516,8 @@
return bi.getColorModel();
GraphicsConfiguration gc = g2d.getDeviceConfiguration();
+ if (gc == null)
+ return null; // Can't tell
// We are going to a BufferedImage but no hint was provided
// so we can't determine the destination Color Model.
@@ -1099,7 +1104,7 @@
* @param src The source
* @param srcRect The Rectangle of source data to be copied
* @param dst The destination
- * @param dstP The Place for the upper left corner of srcRect in dst.
+ * @param destP The Place for the upper left corner of srcRect in dst.
*/
public static void
copyData(BufferedImage src, Rectangle srcRect,
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/Light.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/Light.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/Light.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/Light.java Mon Jul 11 19:05:44 2005
@@ -25,7 +25,7 @@
* typically in a 3 dimensional space and the methods assumes the surface
* is at elevation 0.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public interface Light {
@@ -76,7 +76,7 @@
* @param dx delta x for computing light vectors in user space
* @param width number of samples to compute on the x axis
* @param z array containing the z elevation for all the points
- * @param lightRwo array to store the light info to, if null it will
+ * @param lightRow array to store the light info to, if null it will
* be allocated for you and returned.
*
* @return an array width columns where each element
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/PointLight.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/PointLight.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/PointLight.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/PointLight.java Mon Jul 11 19:05:44 2005
@@ -22,7 +22,7 @@
/**
* A light source which emits a light of constant intensity in all directions.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class PointLight extends AbstractLight {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/SpotLight.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/SpotLight.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/SpotLight.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/SpotLight.java Mon Jul 11 19:05:44 2005
@@ -22,7 +22,7 @@
/**
* A light source which emits a light of constant intensity in all directions.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class SpotLight extends AbstractLight {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/SingleTileRenderedImage.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/SingleTileRenderedImage.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/SingleTileRenderedImage.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/SingleTileRenderedImage.java Mon Jul 11 19:05:44 2005
@@ -34,8 +34,8 @@
* and a ColorModel.
*
* @param ras A Raster that will define tile (0, 0) of the image.
- * @param cm A ColorModel that will serve as the image's
- * ColorModel.
+ * @param colorModel A ColorModel that will serve as the image's
+ * ColorModel.
*/
public SingleTileRenderedImage(Raster ras, ColorModel colorModel) {
this.ras = ras;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFDirectory.java Mon Jul 11 19:05:44 2005
@@ -604,8 +604,8 @@
/**
* Returns a boolean indicating whether the byte order used in the
- * the TIFF file is big-endian (i.e. whether the byte order is from
- * the most significant to the least significant)
+ * the TIFF file is big-endian. That is, whether the byte order is from
+ * the most significant to the least significant.
*/
public boolean isBigEndian() {
return isBigEndian;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/AbstractRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/AbstractRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/AbstractRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/AbstractRable.java Mon Jul 11 19:05:44 2005
@@ -124,8 +124,6 @@
* can be called long after the object is constructed to reset the
* state of the Renderable.
* @param src will become the first (and only) member of the srcs Vector.
- * @param bounds defines the extent of this Rable in it's user
- * coordinate system.
*/
protected void init(Filter src) {
touch();
@@ -142,8 +140,6 @@
* state of the Renderable.
* @param src will also be set as the first (and only) member of
* the srcs Vector.
- * @param bounds defines the extent of this Rable in it's user
- * coordinate system.
* @param props use to set the properties on this renderable image.
* Always clears the current properties (even if null).
*/
@@ -159,8 +155,6 @@
* possibly a bounds. This can be called long after the object is
* constructed to reset the state of the Renderable.
* @param srcs Used the create a new srcs Vector (old sources are dropped).
- * @param bounds defines the new bounds of the object. If it is null
- * then the bounds become the union of the bounds of all sources.
*/
protected void init(List srcs) {
touch();
@@ -172,8 +166,6 @@
* possibly a bounds. This can be called long after the object is
* constructed to reset the state of the Renderable.
* @param srcs Used the create a new srcs Vector (old sources are dropped).
- * @param bounds defines the new bounds of the object. If it is null
- * then the bounds become the union of the bounds of all sources.
* @param props use to set the properties on this renderable image.
* Always clears the current properties (even if null).
*/
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable.java Mon Jul 11 19:05:44 2005
@@ -49,7 +49,7 @@
/**
* This returns the current image being clipped by the clip node.
- * @returns The image to clip
+ * @return The image to clip
*/
public Filter getSource();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -39,7 +39,7 @@
/**
* ClipRable implementation
*
- * @author <a href="mailto:Thomas.DeWeese@Kodak.com>Thomas DeWeese</a>
+ * @author <a href="mailto:Thomas.DeWeese@Kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
public class ClipRable8Bit
@@ -75,7 +75,7 @@
/**
* This returns the current image being masked by the mask node.
- * @returns The image to mask
+ * @return The image to mask
*/
public Filter getSource() {
return (Filter)getSources().get(0);
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable.java Mon Jul 11 19:05:44 2005
@@ -31,7 +31,7 @@
* This filter follows the specification of the feDiffuseLighting filter in
* the SVG 1.0 specification.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public interface DiffuseLightingRable extends FilterColorInterpolation {
@@ -51,7 +51,7 @@
public Light getLight();
/**
- * @param New Light object
+ * @param light New Light object
*/
public void setLight(Light light);
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DiffuseLightingRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -37,7 +37,7 @@
/**
* Implementation of the DiffuseLightRable interface.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class DiffuseLightingRable8Bit
@@ -126,7 +126,7 @@
}
/**
- * @param New Light object
+ * @param light New Light object
*/
public void setLight(Light light){
touch();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable.java Mon Jul 11 19:05:44 2005
@@ -25,7 +25,7 @@
* Implements a DisplacementMap operation, which takes pixel values from
* another image to spatially displace the input image
*
- * @author <a href="mailto:sheng.pei@eng.sun.com>Sheng Pei</a>
+ * @author <a href="mailto:sheng.pei@eng.sun.com">Sheng Pei</a>
* @version $Id$
*/
public interface DisplacementMapRable extends FilterColorInterpolation {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/DisplacementMapRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -35,7 +35,7 @@
* Implements a DisplacementMap operation, which takes pixel values from
* another image to spatially displace the input image
*
- * @author <a href="mailto:sheng.pei@eng.sun.com>Sheng Pei</a>
+ * @author <a href="mailto:sheng.pei@eng.sun.com">Sheng Pei</a>
* @version $Id$
*/
public class DisplacementMapRable8Bit
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAlphaRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAlphaRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAlphaRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAlphaRable.java Mon Jul 11 19:05:44 2005
@@ -37,7 +37,7 @@
* image according to the SVG SourceAlpha Filter description.
* This sets RGB to black and Alpha to the source image's alpha channel.
*
- * @author <a href="mailto:Thomas.DeWeese@Kodak.com>Thomas DeWeese</a>
+ * @author <a href="mailto:Thomas.DeWeese@Kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
public class FilterAlphaRable
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAsAlphaRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAsAlphaRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAsAlphaRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterAsAlphaRable.java Mon Jul 11 19:05:44 2005
@@ -36,7 +36,7 @@
* This will take any source Filter and convert it to an alpha channel
* according the the SVG Mask operation.
*
- * @author <a href="mailto:Thomas.DeWeese@Kodak.com>Thomas DeWeese</a>
+ * @author <a href="mailto:Thomas.DeWeese@Kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
public class FilterAsAlphaRable
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable.java Mon Jul 11 19:05:44 2005
@@ -22,7 +22,7 @@
/**
* Implements a filter operation.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public interface FilterChainRable extends Filter {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/FilterChainRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -40,7 +40,7 @@
* one of the axis, a <tt>AffineRable</tt>
* </ul>
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class FilterChainRable8Bit extends AbstractRable
@@ -206,7 +206,7 @@
/**
* Sets the source to be src.
- * @param src image to the chain.
+ * @param chainSource image to the chain.
*/
public void setSource(Filter chainSource) {
if(chainSource == null){
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable.java Mon Jul 11 19:05:44 2005
@@ -21,7 +21,7 @@
* Implements a GaussianBlur operation, where the blur size is
* defined by standard deviations along the x and y axis.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public interface GaussianBlurRable extends FilterColorInterpolation {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/GaussianBlurRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -35,7 +35,7 @@
/**
* GaussianBlurRable implementation
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class GaussianBlurRable8Bit
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/MorphologyRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/MorphologyRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/MorphologyRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/MorphologyRable.java Mon Jul 11 19:05:44 2005
@@ -21,7 +21,7 @@
* Implements a Morphology operation, where the kernel size is
* defined by radius along the x and y axis.
*
- * @author <a href="mailto:sheng.pei@eng.sun.com>Sheng Pei</a>
+ * @author <a href="mailto:sheng.pei@eng.sun.com">Sheng Pei</a>
* @version $Id$
*/
public interface MorphologyRable extends Filter {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable.java Mon Jul 11 19:05:44 2005
@@ -29,38 +29,38 @@
* @author <a href="mailto:Thomas.DeWeeese@Kodak.com">Thomas DeWeese</a>
* @version $Id$ */
public interface PadRable extends Filter {
- /**
- * Returns the source to be padded
- */
+ /**
+ * Returns the source to be padded
+ */
public Filter getSource();
- /**
- * Sets the source to be padded
- * @param src image to offset.
- */
+ /**
+ * Sets the source to be padded
+ * @param src image to offset.
+ */
public void setSource(Filter src);
- /**
- * Set the current rectangle for padding.
- * @param rect the new rectangle to use for pad.
- */
+ /**
+ * Set the current rectangle for padding.
+ * @param rect the new rectangle to use for pad.
+ */
public void setPadRect(Rectangle2D rect);
- /**
- * Get the current rectangle for padding
- * @returns Rectangle currently in use for pad.
- */
+ /**
+ * Get the current rectangle for padding
+ * @return Rectangle currently in use for pad.
+ */
public Rectangle2D getPadRect();
- /**
- * Set the current extension mode for pad
- * @param mode the new pad mode
- */
+ /**
+ * Set the current extension mode for pad
+ * @param mode the new pad mode
+ */
public void setPadMode(PadMode mode);
- /**
- * Get the current extension mode for pad
- * @returns Mode currently in use for pad
- */
+ /**
+ * Get the current extension mode for pad
+ * @return Mode currently in use for pad
+ */
public PadMode getPadMode();
}
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/PadRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -84,7 +84,7 @@
/**
* Get the current rectangle for padding
- * @returns Rectangle currently in use for pad.
+ * @return Rectangle currently in use for pad.
*/
public Rectangle2D getPadRect() {
return (Rectangle2D)padRect.clone();
@@ -92,7 +92,7 @@
/**
* Set the current extension mode for pad
- * @param mode the new pad mode
+ * @param padMode the new pad mode
*/
public void setPadMode(PadMode padMode) {
touch();
@@ -101,7 +101,7 @@
/**
* Get the current extension mode for pad
- * @returns Mode currently in use for pad
+ * @return Mode currently in use for pad
*/
public PadMode getPadMode() {
return padMode;
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/RedRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/RedRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/RedRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/RedRable.java Mon Jul 11 19:05:44 2005
@@ -33,7 +33,7 @@
* RasterRable This is used to wrap a Rendered Image back into the
* RenderableImage world.
*
- * @author <a href="mailto:Thomas.DeWeese@Kodak.com>Thomas DeWeese</a>
+ * @author <a href="mailto:Thomas.DeWeese@Kodak.com">Thomas DeWeese</a>
* @version $Id$
*/
public class RedRable
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable.java Mon Jul 11 19:05:44 2005
@@ -25,7 +25,7 @@
* This filter follows the specification of the feSpecularLighting filter in
* the SVG 1.0 specification.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public interface SpecularLightingRable extends FilterColorInterpolation {
@@ -45,7 +45,7 @@
public Light getLight();
/**
- * @param New Light object
+ * @param light New Light object
*/
public void setLight(Light light);
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/SpecularLightingRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -37,7 +37,7 @@
/**
* Implementation of the SpecularLightRable interface.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public class SpecularLightingRable8Bit
@@ -133,7 +133,7 @@
}
/**
- * @param New Light object
+ * @param light New Light object
*/
public void setLight(Light light){
touch();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable.java Mon Jul 11 19:05:44 2005
@@ -29,7 +29,7 @@
/**
* Sets the turbulence region
- * @param TurbulenceRable region to fill with turbulence function.
+ * @param turbulenceRegion region to fill with turbulence function.
*/
public void setTurbulenceRegion(Rectangle2D turbulenceRegion);
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable8Bit.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable8Bit.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable8Bit.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/renderable/TurbulenceRable8Bit.java Mon Jul 11 19:05:44 2005
@@ -136,7 +136,7 @@
/**
* Sets the turbulence region
- * @param TurbulenceRegion region to fill with turbulence function.
+ * @param turbulenceRegion region to fill with turbulence function.
*/
public void setTurbulenceRegion(Rectangle2D turbulenceRegion) {
touch();
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractRed.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractRed.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractRed.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractRed.java Mon Jul 11 19:05:44 2005
@@ -141,9 +141,9 @@
/**
* Construct an Abstract Rable from a bounds rect and props
* (may be null). The srcs Vector will be empty.
- * @param srcs This is used to initialize the srcs Vector. All
- * the members of srcs must be Filter otherwise an error
- * will be thrown.
+ * @param src will be the first (and only) member of the srcs
+ * Vector. Src is also used to set the ColorModel, SampleModel,
+ * and tile grid offsets.
* @param bounds this defines the extent of the rable in the
* user coordinate system.
* @param cm The ColorModel to use. If null it will default to
@@ -523,8 +523,8 @@
}
/**
- * Returns the x index of tile under xloc
- * @param yloc the x location (in pixels) to get tile for.
+ * Returns the x index of tile under xloc.
+ * @param xloc the x location (in pixels) to get tile for.
* @return The tile index under xloc (may be outside tile grid).
*/
public final int getXTile(int xloc) {
@@ -537,7 +537,7 @@
}
/**
- * Returns the y index of tile under yloc
+ * Returns the y index of tile under yloc.
* @param yloc the y location (in pixels) to get tile for.
* @return The tile index under yloc (may be outside tile grid).
*/
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java Mon Jul 11 19:05:44 2005
@@ -113,9 +113,9 @@
/**
* Construct an Abstract Rable from a bounds rect and props
* (may be null). The srcs Vector will be empty.
- * @param srcs This is used to initialize the srcs Vector. All
- * the members of srcs must be Filter otherwise an error
- * will be thrown.
+ * @param src will be the first (and only) member of the srcs
+ * Vector. Src is also used to set the ColorModel, SampleModel,
+ * and tile grid offsets.
* @param bounds this defines the extent of the rable in the
* user coordinate system.
* @param cm The ColorModel to use. If null it will default to
@@ -180,7 +180,7 @@
* and is the size of the whole image.
* @param tileGridXOff The x location of tile 0,0.
* @param tileGridYOff The y location of tile 0,0.
- * @param tileStore The tileStore to use (or null).
+ * @param tiles The tileStore to use (or null).
* @param props Any properties you want to associate with the image.
*/
protected void init(CachableRed src, Rectangle bounds,
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/BumpMap.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/BumpMap.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/BumpMap.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/BumpMap.java Mon Jul 11 19:05:44 2005
@@ -26,7 +26,7 @@
/**
* Default BumpMap implementation.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
public final class BumpMap {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/DisplacementMapRed.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/DisplacementMapRed.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/DisplacementMapRed.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/rendered/DisplacementMapRed.java Mon Jul 11 19:05:44 2005
@@ -114,16 +114,16 @@
}
/**
+ * @param image the image to distort
+ * @param offsets the displacement map
+ * @param xChannel defines the channel of off whose values will be
+ * on X-axis operation
+ * @param yChannel defines the channel of off whose values will be
* @param scaleX defines the scale factor of the filter operation
* on the X axis.
* @param scaleY defines the scale factor of the filter operation
* on the Y axis
- * @param xChannel defines the channel of off whose values will be
- * on X-axis operation
- * @param xChannel defines the channel of off whose values will be
- * on X-axis operation
- * @param off defines the input bufferedImage whose component
- * values will be used in displacment operation
+ * @param rh the rendering hints
*/
public DisplacementMapRed(CachableRed image,
CachableRed offsets,
@@ -650,7 +650,7 @@
/**
* Does displacement map using Nearest neighbor interpolation
*
- * @param img the Raster to be filtered
+ * @param off the displacement map
* @param dst stores the filtered image. If null, a destination will
* be created. img and dst can refer to the same Raster, in
* which situation the img will be modified.
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/ErrorConstants.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/ErrorConstants.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/ErrorConstants.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/ErrorConstants.java Mon Jul 11 19:05:44 2005
@@ -41,7 +41,9 @@
/**
* The error code when a url of a particular format is unreadable
* (corrupt).
+ * <pre>
* {0} = the format that couldn't be read.
+ * </pre>
*/
public static final String ERR_STREAM_FORMAT_UNREADABLE
= "stream.format.unreadable";
@@ -49,7 +51,9 @@
/**
* The error code when the data in the url is uninterpretable by this
* software (meaning it's corrupt or an unsupported format of some sort).
+ * <pre>
* {0} = the ParsedURL that couldn't be read.
+ * </pre>
*/
public static final String ERR_URL_UNINTERPRETABLE
= "url.uninterpretable";
@@ -57,7 +61,9 @@
/**
* The error code when a url is unreachable (ussually bad URL,
* or server is down).
+ * <pre>
* {0} = the ParsedURL that couldn't be read.
+ * </pre>
*/
public static final String ERR_URL_UNREACHABLE
= "url.unreachable";
@@ -66,8 +72,10 @@
/**
* The error code when a url of a particular format is unreadable
* (corrupt).
+ * <pre>
* {0} = the format that couldn't be read.
* {1} = the ParsedURL for file.
+ * </pre>
*/
public static final String ERR_URL_FORMAT_UNREADABLE
= "url.format.unreadable";
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JDKRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JDKRegistryEntry.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JDKRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JDKRegistryEntry.java Mon Jul 11 19:05:44 2005
@@ -79,7 +79,7 @@
/**
* Decode the URL into a RenderableImage
*
- * @param is The input stream that contains the image.
+ * @param purl URL of the image.
* @param needRawData If true the image returned should not have
* any default color correction the file may
* specify applied.
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JPEGRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JPEGRegistryEntry.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JPEGRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/JPEGRegistryEntry.java Mon Jul 11 19:05:44 2005
@@ -55,7 +55,7 @@
/**
* Decode the Stream into a RenderableImage
*
- * @param is The input stream that contains the image.
+ * @param inIS The input stream that contains the image.
* @param origURL The original URL, if any, for documentation
* purposes only. This may be null.
* @param needRawData If true the image returned should not have
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/PNGRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/PNGRegistryEntry.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/PNGRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/PNGRegistryEntry.java Mon Jul 11 19:05:44 2005
@@ -48,7 +48,7 @@
/**
* Decode the Stream into a RenderableImage
*
- * @param is The input stream that contains the image.
+ * @param inIS The input stream that contains the image.
* @param origURL The original URL, if any, for documentation
* purposes only. This may be null.
* @param needRawData If true the image returned should not have
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/TIFFRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/TIFFRegistryEntry.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/TIFFRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/awt/image/spi/TIFFRegistryEntry.java Mon Jul 11 19:05:44 2005
@@ -50,7 +50,7 @@
/**
* Decode the Stream into a RenderableImage
*
- * @param is The input stream that contains the image.
+ * @param inIS The input stream that contains the image.
* @param origURL The original URL, if any, for documentation
* purposes only. This may be null.
* @param needRawData If true the image returned should not have
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/DoubleDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/DoubleDocument.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/DoubleDocument.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/DoubleDocument.java Mon Jul 11 19:05:44 2005
@@ -14,7 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
- */package org.apache.batik.ext.swing;
+ */
+package org.apache.batik.ext.swing;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
@@ -27,11 +28,14 @@
* @version $Id$
*/
public class DoubleDocument extends PlainDocument {
+
/**
- * Strip all non digit characters. '-' and '+' are only allowed as the
- * first character. Only one '.' is allowed.
- **/
- public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+ * Strip all non digit characters. The first character must be '-' or '+'.
+ * Only one '.' is allowed.
+ */
+ public void insertString(int offs, String str, AttributeSet a)
+ throws BadLocationException {
+
if (str == null) {
return;
}
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/JGridBagPanel.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/JGridBagPanel.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/JGridBagPanel.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/ext/swing/JGridBagPanel.java Mon Jul 11 19:05:44 2005
@@ -27,7 +27,7 @@
/**
* An implementation of JPanel that uses the GridBagLayout.
*
- * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
+ * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @version $Id$
*/
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikDomExtension.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikDomExtension.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikDomExtension.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikDomExtension.java Mon Jul 11 19:05:44 2005
@@ -80,7 +80,8 @@
* be necessary to replace existing tag handlers, although this
* is discouraged.
*
- * @param ctx The DomContext instance to be updated
+ * @param di The ExtensibleDOMImplementation to register the
+ * extension elements with.
*/
public void registerTags(ExtensibleDOMImplementation di) {
di.registerCustomElementFactory
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/BatikFlowTextElementBridge.java Mon Jul 11 19:05:44 2005
@@ -53,7 +53,7 @@
/**
* Bridge class for the <flowText> element.
*
- * @author <a href="deweese@apache.org">Thomas DeWeese</a>
+ * @author <a href="mailto:deweese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
public class BatikFlowTextElementBridge extends SVGTextElementBridge
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java Mon Jul 11 19:05:44 2005
@@ -34,11 +34,9 @@
import org.apache.batik.gvt.TextNode;
/**
- * One line Class Desc
+ * A GlyphLayout class for SVG 1.2 flowing text.
*
- * Complete Class Desc
- *
- * @author <a href="mailto:deweese@apache.org>deweese</a>
+ * @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
public class FlowExtGlyphLayout extends GlyphLayout {
@@ -501,10 +499,9 @@
* over space in the flow rect and scaling that value by 1.0 to
* align to the bottom, 0.5 for middle and 0.0 for top.
*
- * @param verticalAlignOffset the {@link java.awt.geom.Point2D.Float} object that
- * is storing the alignment offset.
- * @param currentRegion the {@link RegionInfo} object that we
- * are rendering into.
+ * @param verticalAlignOffset the {@link java.awt.geom.Point2D.Float}
+ * object that is storing the alignment offset.
+ * @param region the {@link RegionInfo} object that we are rendering into.
* @param maxDescent the very lowest point this line reaches.
*/
public static void updateVerticalAlignOffset
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextLayoutFactory.java Mon Jul 11 19:05:44 2005
@@ -28,7 +28,7 @@
* FlowRoot instances.
*
* @see org.apache.batik.gvt.text.TextSpanLayout
- * @author <a href="dewese@apache.org">Thomas DeWeese</a>
+ * @author <a href="mailto:dewese@apache.org">Thomas DeWeese</a>
* @version $Id$
*/
public class FlowExtTextLayoutFactory implements TextLayoutFactory {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextNode.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextNode.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextNode.java Mon Jul 11 19:05:44 2005
@@ -29,7 +29,7 @@
*
* Complete Class Desc
*
- * @author <a href="mailto:deweese@apache.org>deweese</a>
+ * @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
public class FlowExtTextNode extends TextNode{
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/extension/svg/FlowExtTextPainter.java Mon Jul 11 19:05:44 2005
@@ -32,7 +32,7 @@
*
* Complete Class Desc
*
- * @author <a href="mailto:deweese@apache.org>deweese</a>
+ * @author <a href="mailto:deweese@apache.org">deweese</a>
* @version $Id$
*/
public class FlowExtTextPainter extends StrokingTextPainter {
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/AbstractGraphicsNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/AbstractGraphicsNode.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/AbstractGraphicsNode.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/AbstractGraphicsNode.java Mon Jul 11 19:05:44 2005
@@ -219,7 +219,7 @@
}
/**
- * Returns the concatenated transform of this node. i.e., this
+ * Returns the concatenated transform of this node. That is, this
* node's transform preconcatenated with it's parent's transforms.
*/
public AffineTransform getGlobalTransform(){
@@ -237,7 +237,7 @@
/**
* Sets the composite of this node.
*
- * @param composite the composite of this node
+ * @param newComposite the composite of this node
*/
public void setComposite(Composite newComposite) {
fireGraphicsNodeChangeStarted();
@@ -832,7 +832,7 @@
/**
* Returns the bounds of the area covered by this node, without
- * taking any of its rendering attribute into accoun. i.e.,
+ * taking any of its rendering attribute into accoun. That is,
* exclusive of any clipping, masking, filtering or stroking, for
* example. The returned value is transformed by the concatenation
* of the input transform and this node's transform.
Modified: xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/CompositeGraphicsNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/CompositeGraphicsNode.java?rev=215909&r1=215908&r2=215909&view=diff
==============================================================================
--- xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/CompositeGraphicsNode.java (original)
+++ xmlgraphics/batik/branches/svg12/sources/org/apache/batik/gvt/CompositeGraphicsNode.java Mon Jul 11 19:05:44 2005
@@ -196,7 +196,14 @@
Rectangle2D bounds = null;
while ((bounds == null) && i < count) {
bounds = children[i++].getTransformedBounds(IDENTITY);
+ if (((i & 0x0F) == 0) && HaltingThread.hasBeenHalted())
+ break; // check every 16 children if we have been interrupted.
}
+ if (HaltingThread.hasBeenHalted()) {
+ invalidateGeometryCache();
+ return null;
+ }
+
if (bounds == null) {
primitiveBounds = NULL_RECT;
return null;
@@ -215,6 +222,9 @@
primitiveBounds.add(ctb);
}
}
+
+ if (((i & 0x0F) == 0) && HaltingThread.hasBeenHalted())
+ break; // check every 16 children if we have been interrupted.
}
// Check If we should halt early.
@@ -294,13 +304,13 @@
/**
* Returns the bounds of the area covered by this node, without
- * taking any of its rendering attribute into account. i.e.,
+ * taking any of its rendering attribute into account. That is,
* exclusive of any clipping, masking, filtering or stroking, for
* example.
*/
public Rectangle2D getGeometryBounds() {
if (geometryBounds == null) {
- // System.out.println("geometryBounds are null");
+ // System.err.println("geometryBounds are null");
int i=0;
while(geometryBounds == null && i < count){
geometryBounds =
@@ -327,7 +337,7 @@
/**
* Returns the bounds of the area covered by this node, without taking any
- * of its rendering attribute into accoun. i.e., exclusive of any clipping,
+ * of its rendering attribute into accoun. That is, exclusive of any clipping,
* masking, filtering or stroking, for example. The returned value is
* transformed by the concatenation of the input transform and this node's
* transform.