You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by tk...@apache.org on 2001/09/13 10:42:50 UTC
cvs commit: xml-batik/sources/org/apache/batik/util Base64EncoderStream.java
tkormann 01/09/13 01:42:50
Modified: sources/org/apache/batik/ext/awt/g2d AbstractGraphics2D.java
GraphicContext.java
sources/org/apache/batik/ext/awt/image DiscreteTransfer.java
GammaTransfer.java IdentityTransfer.java
LinearTransfer.java TableTransfer.java
TransferFunction.java
sources/org/apache/batik/ext/awt/image/codec
SeekableStream.java
sources/org/apache/batik/ext/awt/image/spi
RegistryEntry.java
sources/org/apache/batik/gvt AbstractGraphicsNode.java
CompositeGraphicsNode.java GraphicsNode.java
Marker.java
sources/org/apache/batik/gvt/renderer
StrokingTextPainter.java
sources/org/apache/batik/gvt/text GlyphLayout.java
TextHit.java TextLayoutAdapter.java
TextLayoutFactory.java TextSpanLayout.java
sources/org/apache/batik/svggen SVGGeneratorContext.java
sources/org/apache/batik/util Base64EncoderStream.java
Log:
Fix tons of javadoc warnings.
Revision Changes Path
1.4 +1 -2 xml-batik/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java
Index: AbstractGraphics2D.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractGraphics2D.java 2001/03/21 09:37:15 1.3
+++ AbstractGraphics2D.java 2001/09/13 08:42:49 1.4
@@ -33,7 +33,7 @@
* are implemented by <tt>AbstractGraphics2D</tt>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: AbstractGraphics2D.java,v 1.3 2001/03/21 09:37:15 cjolif Exp $
+ * @version $Id: AbstractGraphics2D.java,v 1.4 2001/09/13 08:42:49 tkormann Exp $
* @see org.apache.batik.ext.awt.g2d.GraphicContext
*/
public abstract class AbstractGraphics2D extends Graphics2D implements Cloneable {
@@ -997,7 +997,6 @@
* @see java.awt.Graphics#setXORMode
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
- * @see java.lang.SecurityManager#checkPermission(java.awt.Permission)
*/
public void setComposite(Composite comp){
gc.setComposite(comp);
1.4 +1 -2 xml-batik/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java
Index: GraphicContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GraphicContext.java 2001/07/03 09:41:09 1.3
+++ GraphicContext.java 2001/09/13 08:42:49 1.4
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:cjolif@ilog.fr">Christophe Jolif</a>
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: GraphicContext.java,v 1.3 2001/07/03 09:41:09 cjolif Exp $
+ * @version $Id: GraphicContext.java,v 1.4 2001/09/13 08:42:49 tkormann Exp $
*/
public class GraphicContext implements Cloneable{
/**
@@ -360,7 +360,6 @@
* @see java.awt.Graphics#setXORMode
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
- * @see java.lang.SecurityManager#checkPermission(java.awt.Permission)
*/
public void setComposite(Composite comp){
this.composite = comp;
1.2 +1 -3 xml-batik/sources/org/apache/batik/ext/awt/image/DiscreteTransfer.java
Index: DiscreteTransfer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/DiscreteTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DiscreteTransfer.java 2001/03/26 21:27:28 1.1
+++ DiscreteTransfer.java 2001/09/13 08:42:49 1.2
@@ -16,9 +16,7 @@
* of the SVG specification.
*
* @author <a href="mailto:sheng.pei@sun.com">Sheng Pei</a>
- * @version $Id: DiscreteTransfer.java,v 1.1 2001/03/26 21:27:28 deweese Exp $
- *
- * @see org.apache.batik.gvt.filter.ComponentTransferOp
+ * @version $Id: DiscreteTransfer.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public class DiscreteTransfer implements TransferFunction {
/**
1.2 +3 -5 xml-batik/sources/org/apache/batik/ext/awt/image/GammaTransfer.java
Index: GammaTransfer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/GammaTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GammaTransfer.java 2001/03/26 21:27:29 1.1
+++ GammaTransfer.java 2001/09/13 08:42:49 1.2
@@ -14,13 +14,11 @@
* GammaTransfer.java
*
* This class defines the Gamma type transfer function for the
- * feComponentTransfer filter, as defined in chapter 15, section 11
- * of the SVG specification.
+ * feComponentTransfer filter, as defined in chapter 15, section 11 of the SVG
+ * specification.
*
* @author <a href="mailto:sheng.pei@sun.com">Sheng Pei</a>
- * @version $Id: GammaTransfer.java,v 1.1 2001/03/26 21:27:29 deweese Exp $
- *
- * @see org.apache.batik.gvt.filter.ComponentTransferOp
+ * @version $Id: GammaTransfer.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public class GammaTransfer implements TransferFunction {
/**
1.2 +3 -5 xml-batik/sources/org/apache/batik/ext/awt/image/IdentityTransfer.java
Index: IdentityTransfer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/IdentityTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdentityTransfer.java 2001/03/26 21:27:29 1.1
+++ IdentityTransfer.java 2001/09/13 08:42:49 1.2
@@ -12,13 +12,11 @@
* IdentityTransfer.java
*
* This class defines the Identity type transfer function for the
- * feComponentTransfer filter, as defined in chapter 15, section 11
- * of the SVG specification.
+ * feComponentTransfer filter, as defined in chapter 15, section 11 of the SVG
+ * specification.
*
* @author <a href="mailto:sheng.pei@sun.com">Sheng Pei</a>
- * @version $Id: IdentityTransfer.java,v 1.1 2001/03/26 21:27:29 deweese Exp $
- *
- * @see org.apache.batik.gvt.filter.ComponentTransferOp
+ * @version $Id: IdentityTransfer.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public class IdentityTransfer implements TransferFunction {
/**
1.2 +3 -6 xml-batik/sources/org/apache/batik/ext/awt/image/LinearTransfer.java
Index: LinearTransfer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/LinearTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinearTransfer.java 2001/03/26 21:27:29 1.1
+++ LinearTransfer.java 2001/09/13 08:42:49 1.2
@@ -12,15 +12,12 @@
* LinearTransfer.java
*
* This class defines the Linear type transfer function for the
- * feComponentTransfer filter, as defined in chapter 15, section 11
- * of the SVG specification.
+ * feComponentTransfer filter, as defined in chapter 15, section 11 of the SVG
+ * specification.
*
* @author <a href="mailto:sheng.pei@sun.com">Sheng Pei</a>
- * @version $Id: LinearTransfer.java,v 1.1 2001/03/26 21:27:29 deweese Exp $
- *
- * @see org.apache.batik.gvt.filter.ComponentTransferOp
+ * @version $Id: LinearTransfer.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
-
public class LinearTransfer implements TransferFunction {
/**
* This byte array stores the lookuptable data
1.2 +3 -5 xml-batik/sources/org/apache/batik/ext/awt/image/TableTransfer.java
Index: TableTransfer.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/TableTransfer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableTransfer.java 2001/03/26 21:27:29 1.1
+++ TableTransfer.java 2001/09/13 08:42:49 1.2
@@ -14,13 +14,11 @@
* TableTransfer.java
*
* This class defines the Table type transfer function for the
- * feComponentTransfer filter, as defined in chapter 15, section 11
- * of the SVG specification.
+ * feComponentTransfer filter, as defined in chapter 15, section 11 of the SVG
+ * specification.
*
* @author <a href="mailto:sheng.pei@sun.com">Sheng Pei</a>
- * @version $Id: TableTransfer.java,v 1.1 2001/03/26 21:27:29 deweese Exp $
- *
- * @see org.apache.batik.gvt.filter.ComponentTransferOp
+ * @version $Id: TableTransfer.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public class TableTransfer implements TransferFunction {
/**
1.2 +8 -3 xml-batik/sources/org/apache/batik/ext/awt/image/TransferFunction.java
Index: TransferFunction.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/TransferFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransferFunction.java 2001/03/26 21:27:29 1.1
+++ TransferFunction.java 2001/09/13 08:42:49 1.2
@@ -8,12 +8,17 @@
package org.apache.batik.ext.awt.image;
/**
- * Defines the interface for all the <tt>ComponentTransferOp</tt>
- * transfer functions, which can all be converted to a lookup table
+ * Defines the interface for all the <tt>ComponentTransferOp</tt> transfer
+ * functions, which can all be converted to a lookup table
*
* @author <a href="mailto:sheng.pei@eng.sun.com">Sheng Pei</a>
- * @version $Id: TransferFunction.java,v 1.1 2001/03/26 21:27:29 deweese Exp $
+ * @version $Id: TransferFunction.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public interface TransferFunction {
+
+ /**
+ * Returns the lookup table.
+ */
byte [] getLookupTable();
+
}
1.2 +51 -74 xml-batik/sources/org/apache/batik/ext/awt/image/codec/SeekableStream.java
Index: SeekableStream.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/codec/SeekableStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SeekableStream.java 2001/02/02 01:34:21 1.1
+++ SeekableStream.java 2001/09/13 08:42:49 1.2
@@ -15,87 +15,64 @@
import java.io.IOException;
/**
- * An abstract subclass of <code>java.io.InputStream</code> that
- * allows seeking within the input, similar to the
- * <code>RandomAccessFile</code> class. Additionally, the
- * <code>DataInput</code> interface is supported and extended to
- * include support for little-endian representations of fundamental
- * data types.
- *
- * <p> In addition to the familiar methods from
- * <code>InputStream</code>, the methods
- * <code>getFilePointer()</code>, <code>seek()</code>, are defined as
- * in the <code>RandomAccessFile</code> class. The
- * <code>canSeekBackwards()</code> method will return
- * <code>true</code> if it is permissible to seek to a position
- * earlier in the stream than the current value of
+ * An abstract subclass of <code>java.io.InputStream</code> that allows seeking
+ * within the input, similar to the <code>RandomAccessFile</code> class.
+ * Additionally, the <code>DataInput</code> interface is supported and extended
+ * to include support for little-endian representations of fundamental data
+ * types.
+ *
+ * <p> In addition to the familiar methods from <code>InputStream</code>, the
+ * methods <code>getFilePointer()</code>, <code>seek()</code>, are defined as in
+ * the <code>RandomAccessFile</code> class. The <code>canSeekBackwards()</code>
+ * method will return <code>true</code> if it is permissible to seek to a
+ * position earlier in the stream than the current value of
* <code>getFilePointer()</code>. Some subclasses of
- * <code>SeekableStream</code> guarantee the ability to seek backwards
- * while others may not offer this feature in the interest of
- * providing greater efficiency for those users who do not require it.
+ * <code>SeekableStream</code> guarantee the ability to seek backwards while
+ * others may not offer this feature in the interest of providing greater
+ * efficiency for those users who do not require it.
*
- * <p> The <code>DataInput</code> interface is supported as well.
- * This included the <code>skipBytes()</code> and
- * <code>readFully()</code> methods and a variety of <code>read</code>
- * methods for various data types.
+ * <p> The <code>DataInput</code> interface is supported as well. This included
+ * the <code>skipBytes()</code> and <code>readFully()</code> methods and a
+ * variety of <code>read</code> methods for various data types.
*
- * <p> A number of concrete subclasses of <code>SeekableStream</code>
- * are supplied in the <code>com.sun.media.jai.codec</code> package.
+ * <p> A number of concrete subclasses of <code>SeekableStream</code> are
+ * supplied in the <code>com.sun.media.jai.codec</code> package.
*
- * <p> Three classes are provided for the purpose of adapting a
- * standard <code>InputStream</code> to the
- * <code>SeekableStream</code> interface.
- * <code>ForwardSeekableStream</code> does not allows seeking
- * backwards, but is inexpensive to use.
- * <code>FileCacheSeekableStream</code> maintains a copy of all of the
- * data read from the input in a temporary file; this file will be
+ * <p> Three classes are provided for the purpose of adapting a standard
+ * <code>InputStream</code> to the <code>SeekableStream</code> interface.
+ * <code>ForwardSeekableStream</code> does not allows seeking backwards, but is
+ * inexpensive to use. <code>FileCacheSeekableStream</code> maintains a copy of
+ * all of the data read from the input in a temporary file; this file will be
* discarded automatically when the <code>FileSeekableStream</code> is
* finalized, or when the JVM exits normally.
- * <code>FileCacheSeekableStream</code> is intended to be reasonably
- * efficient apart from the unavoidable use of disk space. In
- * circumstances where the creation of a temporary file is not
- * possible, <code>MemoryCacheSeekableStream</code> may be used.
- * <code>MemoryCacheSeekableStream</code> creates a potentially large
- * in-memory buffer to store the stream data and so should be
- * avoided when possible.
- *
- * <p> The <code>FileSeekableStream</code> class wraps a
- * <code>File</code> or <code>RandomAccessFile</code>. It forwards
- * requests to the real underlying file. It performs a limited amount
- * of caching in order to avoid excessive I/O costs.
- *
- * <p> The <code>SegmentedSeekableStream</code> class performs a
- * different sort of function. It creates a
- * <code>SeekableStream</code> from another
- * <code>SeekableStream</code> by selecting a series of portions or
- * "segments". Each segment starts at a specified location within the
- * source <code>SeekableStream</code> and extends for a specified
- * number of bytes. The <code>StreamSegmentMapper</code> interface
- * and <code>StreamSegment</code> class may be
- * used to compute the segment positions dynamically.
- *
- * <p> A convenience methods, <code>wrapInputStream</code> is provided
- * to construct a suitable <code>SeekableStream</code> instance whose
- * data is supplied by a given <code>InputStream</code>. The caller,
- * by means of the <code>canSeekBackwards</code> parameter, determines
- * whether support for seeking backwards is required.
- *
- * @see java.io.DataInput
- * @see java.io.InputStream
- * @see java.io.RandomAccessFile
- * @see ByteArraySeekableStream
- * @see FileCacheSeekableStream
- * @see FileSeekableStream
- * @see ForwardSeekableStream
- * @see MemoryCacheSeekableStream
- * @see SegmentedSeekableStream
- * @see StreamSegment
- * @see StreamSegmentMapper
- *
+ * <code>FileCacheSeekableStream</code> is intended to be reasonably efficient
+ * apart from the unavoidable use of disk space. In circumstances where the
+ * creation of a temporary file is not possible,
+ * <code>MemoryCacheSeekableStream</code> may be used.
+ * <code>MemoryCacheSeekableStream</code> creates a potentially large in-memory
+ * buffer to store the stream data and so should be avoided when possible.
+ *
+ * <p> The <code>FileSeekableStream</code> class wraps a <code>File</code> or
+ * <code>RandomAccessFile</code>. It forwards requests to the real underlying
+ * file. It performs a limited amount of caching in order to avoid excessive
+ * I/O costs.
+ *
+ * <p> The <code>SegmentedSeekableStream</code> class performs a different sort
+ * of function. It creates a <code>SeekableStream</code> from another
+ * <code>SeekableStream</code> by selecting a series of portions or "segments".
+ * Each segment starts at a specified location within the source
+ * <code>SeekableStream</code> and extends for a specified number of bytes. The
+ * <code>StreamSegmentMapper</code> interface and <code>StreamSegment</code>
+ * class may be used to compute the segment positions dynamically.
+ *
+ * <p> A convenience methods, <code>wrapInputStream</code> is provided to
+ * construct a suitable <code>SeekableStream</code> instance whose data is
+ * supplied by a given <code>InputStream</code>. The caller, by means of the
+ * <code>canSeekBackwards</code> parameter, determines whether support for
+ * seeking backwards is required.
+ *
*/
-public abstract class SeekableStream
- extends InputStream
- implements DataInput {
+public abstract class SeekableStream extends InputStream implements DataInput {
/**
* Returns a <code>SeekableStream</code> that will read from a
1.3 +16 -20 xml-batik/sources/org/apache/batik/ext/awt/image/spi/RegistryEntry.java
Index: RegistryEntry.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/spi/RegistryEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegistryEntry.java 2001/07/18 22:04:54 1.2
+++ RegistryEntry.java 2001/09/13 08:42:49 1.3
@@ -11,38 +11,34 @@
import java.util.List;
/**
- * The base interface for all image tag registry entries. To be
- * useful you probably need to implement on of the flavors of registry
- * entries (such as @see StreamRegistryEntry or
- * @see URLRegistryEntry).
+ * The base interface for all image tag registry entries. To be useful you
+ * probably need to implement on of the flavors of registry entries (such as
+ * StreamRegistryEntry or URLRegistryEntry).
*/
public interface RegistryEntry {
/**
- * Return a List of the common extensions for this file format.
- * The first entry in the list may be used as the default
- * extension for writing files in this format (when we add support
- * for writing that is). This may also be used to build a
- * selection expression for finding files of this type.
+ * Return a List of the common extensions for this file format. The first
+ * entry in the list may be used as the default extension for writing files
+ * in this format (when we add support for writing that is). This may also
+ * be used to build a selection expression for finding files of this type.
*/
- public List getStandardExtensions();
+ List getStandardExtensions();
/**
- * Return a List of mime types for this file format.
- * The first entry in the list may be used as the default
- * mime type.
- */
- public List getMimeTypes();
+ * Return a List of mime types for this file format. The first entry in the
+ * list may be used as the default mime type. */
+ List getMimeTypes();
/**
* Returns the name of the format. For example "JPEG", "PNG", ...
*/
- public String getFormatName();
+ String getFormatName();
/**
- * Returns a search priority for this entry. For most formats
- * this is not important, but in some cases it is important that
- * some entries occure before or after others.
+ * Returns a search priority for this entry. For most formats this is not
+ * important, but in some cases it is important that some entries occure
+ * before or after others.
*/
- public float getPriority();
+ float getPriority();
}
1.23 +2 -18 xml-batik/sources/org/apache/batik/gvt/AbstractGraphicsNode.java
Index: AbstractGraphicsNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/AbstractGraphicsNode.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AbstractGraphicsNode.java 2001/07/25 14:44:49 1.22
+++ AbstractGraphicsNode.java 2001/09/13 08:42:49 1.23
@@ -48,9 +48,9 @@
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:etissandier@ilog.fr">Emmanuel Tissandier</a>
* @author <a href="mailto:Thomas.DeWeeese@Kodak.com">Thomas DeWeese</a>
- * @version $Id: AbstractGraphicsNode.java,v 1.22 2001/07/25 14:44:49 deweese Exp $
+ * @version $Id: AbstractGraphicsNode.java,v 1.23 2001/09/13 08:42:49 tkormann Exp $
*/
-public abstract class AbstractGraphicsNode implements GraphicsNode, Cloneable {
+public abstract class AbstractGraphicsNode implements GraphicsNode {
/**
* The listeners list.
@@ -933,21 +933,5 @@
*/
public boolean intersects(Rectangle2D r, GraphicsNodeRenderContext rc) {
return getBounds(rc).intersects(r);
- }
-
- /**
- * Returns a deep clone of this graphics node.
- *
- * <b>Warning</b>: All attributes of this graphics node are shared
- * between the original node and its copy. This method does not
- * perform any synchronization.
- */
- public GraphicsNode renderingClone() {
- try {
- return (GraphicsNode)clone();
- } catch(CloneNotSupportedException ex) {
- ex.printStackTrace();
- return null;
- }
}
}
1.21 +1 -20 xml-batik/sources/org/apache/batik/gvt/CompositeGraphicsNode.java
Index: CompositeGraphicsNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/CompositeGraphicsNode.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CompositeGraphicsNode.java 2001/06/12 23:49:39 1.20
+++ CompositeGraphicsNode.java 2001/09/13 08:42:49 1.21
@@ -33,7 +33,7 @@
* A CompositeGraphicsNode is a graphics node that can contain graphics nodes.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: CompositeGraphicsNode.java,v 1.20 2001/06/12 23:49:39 bella Exp $
+ * @version $Id: CompositeGraphicsNode.java,v 1.21 2001/09/13 08:42:49 tkormann Exp $
*/
public class CompositeGraphicsNode extends AbstractGraphicsNode
implements List {
@@ -449,25 +449,6 @@
GraphicsNode node = children[i];
((AbstractGraphicsNode)node).setRoot(newRoot);
}
- }
-
- /**
- * Returns a deep clone of this graphics node. This method clones
- * this node and its children.
- *
- * <b>Warning</b>: All attributes of this graphics node are shared
- * between the original node and its copy. This method does not
- * perform any synchronization.
- */
- public GraphicsNode renderingClone() {
- CompositeGraphicsNode n =
- (CompositeGraphicsNode)super.renderingClone();
- n.children = new GraphicsNode[count];
- for (int i = 0; i < count; ++i) {
- n.children[i] = children[i].renderingClone();
- }
- n.count = count;
- return n;
}
//
1.25 +66 -89 xml-batik/sources/org/apache/batik/gvt/GraphicsNode.java
Index: GraphicsNode.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/GraphicsNode.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- GraphicsNode.java 2001/03/26 21:27:36 1.24
+++ GraphicsNode.java 2001/09/13 08:42:49 1.25
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
* @author <a href="mailto:etissandier@ilog.fr">Emmanuel Tissandier</a>
- * @version $Id: GraphicsNode.java,v 1.24 2001/03/26 21:27:36 deweese Exp $
+ * @version $Id: GraphicsNode.java,v 1.25 2001/09/13 08:42:49 tkormann Exp $
*/
public interface GraphicsNode {
@@ -48,12 +48,13 @@
/**
* Sets the transform of this node.
+ *
* @param newTransform the new transform of this node
*/
void setTransform(AffineTransform newTransform);
/**
- * Returns the transform of this node.
+ * Returns the transform of this node or null if any.
*/
AffineTransform getTransform();
@@ -70,30 +71,31 @@
/**
* Sets the composite of this node.
+ *
* @param composite the composite of this node
*/
void setComposite(Composite newComposite);
/**
- * Returns the composite of this node.
+ * Returns the composite of this node or null if any.
*/
Composite getComposite();
/**
* Sets if this node is visible or not depending on the specified value.
+ *
* @param isVisible If true this node is visible
*/
void setVisible(boolean isVisible);
/**
- * Determines whether or not this node is visible when its parent
- * is visible. Nodes are initially visible.
- * @return true if this node is visible, false otherwise
+ * Returns true if this node is visible, false otherwise.
*/
boolean isVisible();
/**
- * Sets the clipping filter for this node.
+ * Sets the clipping filter of this node.
+ *
* @param newClipper the new clipping filter of this node
*/
void setClip(ClipRable newClipper);
@@ -104,23 +106,26 @@
ClipRable getClip();
/**
- * Maps the specified key to the specified value in the rendering
- * hints of this node.
+ * Maps the specified key to the specified value in the rendering hints of
+ * this node.
+ *
* @param key the key of the hint to be set
* @param value the value indicating preferences for the specified
- * hint category.
+ * hint category.
*/
void setRenderingHint(RenderingHints.Key key, Object value);
/**
* Copies all of the mappings from the specified Map to the
* rendering hints of this node.
+ *
* @param hints the rendering hints to be set
*/
void setRenderingHints(Map hints);
/**
* Sets the rendering hints of this node.
+ *
* @param newHints the new rendering hints of this node
*/
void setRenderingHints(RenderingHints newHints);
@@ -132,6 +137,7 @@
/**
* Sets the mask of this node.
+ *
* @param newMask the new mask of this node
*/
void setMask(Mask newMask);
@@ -143,6 +149,7 @@
/**
* Sets the filter of this node.
+ *
* @param newFilter the new filter of this node
*/
void setFilter(Filter newFilter);
@@ -160,13 +167,14 @@
* Paints this node.
*
* @param g2d the Graphics2D to use
- * @param rc the GraphicsNodeRenderContext to use
- * was interrupted during paint
+ * @param rc the GraphicsNodeRenderContext to use was interrupted during
+ * paint
*/
void paint(Graphics2D g2d, GraphicsNodeRenderContext rc);
/**
- * Paints this node without applying Filter, Mask, Composite and clip.
+ * Paints this node without applying Filter, Mask, Composite, and clip.
+ *
* @param g2d the Graphics2D to use
* @param rc the GraphicsNodeRenderContext to use
*/
@@ -183,35 +191,40 @@
void dispatchEvent(GraphicsNodeEvent evt);
/**
- * Adds the specified graphics node mouse listener to receive
- * graphics node mouse events from this node.
- * @param l the graphics node mouse listener to add
+ * Adds the specified graphics node mouse listener to receive graphics node
+ * mouse events from this node.
+ *
+ * @param l the graphics node mouse listener to add
*/
void addGraphicsNodeMouseListener(GraphicsNodeMouseListener l);
/**
- * Removes the specified graphics node mouse listener so that it
- * no longer receives graphics node mouse events from this node.
- * @param l the graphics node mouse listener to remove
+ * Removes the specified graphics node mouse listener so that it no longer
+ * receives graphics node mouse events from this node.
+ *
+ * @param l the graphics node mouse listener to remove
*/
void removeGraphicsNodeMouseListener(GraphicsNodeMouseListener l);
/**
- * Adds the specified graphics node key listener to receive
- * graphics node key events from this node.
- * @param l the graphics node key listener to add
+ * Adds the specified graphics node key listener to receive graphics node
+ * key events from this node.
+ *
+ * @param l the graphics node key listener to add
*/
void addGraphicsNodeKeyListener(GraphicsNodeKeyListener l);
/**
- * Removes the specified graphics node key listener so that it
- * no longer receives graphics node key events from this node.
- * @param l the graphics node key listener to remove
+ * Removes the specified graphics node key listener so that it no longer
+ * receives graphics node key events from this node.
+ *
+ * @param l the graphics node key listener to remove
*/
void removeGraphicsNodeKeyListener(GraphicsNodeKeyListener l);
/**
* Sets the hit detector for this node.
+ *
* @param hitDetector the new hit detector
*/
void setGraphicsNodeHitDetector(GraphicsNodeHitDetector hitDetector);
@@ -223,20 +236,23 @@
/**
* Dispatches a graphics node mouse event to this node or one of its child.
+ *
* @param evt the evt to dispatch
*/
void processMouseEvent(GraphicsNodeMouseEvent evt);
/**
* Dispatches a graphics node key event to this node or one of its child.
+ *
* @param evt the evt to dispatch
*/
void processKeyEvent(GraphicsNodeKeyEvent evt);
/**
- * Returns an array of listeners that were added to this node and
- * of the specified type.
- * @param listenerType the type of the listeners to return
+ * Returns an array of listeners that were added to this node and of the
+ * specified type.
+ *
+ * @param listenerType the type of the listeners to return
*/
EventListener [] getListeners(Class listenerType);
@@ -250,8 +266,8 @@
CompositeGraphicsNode getParent();
/**
- * Returns the root of the GVT tree or <code>null</code> if
- * the node is not part of a GVT tree.
+ * Returns the root of the GVT tree or null if the node is not part of a GVT
+ * tree.
*/
RootGraphicsNode getRoot();
@@ -260,11 +276,8 @@
//
/**
- * Returns the bounds of this node in user space. This includes
- * primitive paint, filtering, clipping and masking.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns the bounds of this node in user space. This includes primitive
+ * paint, filtering, clipping and masking.
*
* @param rc the GraphicsNodeRenderContext for which this dimension applies
*/
@@ -279,22 +292,18 @@
* @param rc the GraphicsNodeRenderContext
*/
Rectangle2D getTransformedBounds(AffineTransform txf,
- GraphicsNodeRenderContext rc);
+ GraphicsNodeRenderContext rc);
/**
- * Returns the bounds of the area covered by this node's
- * primitive paint.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns the bounds of the area covered by this node's primitive paint.
*
* @param rc the GraphicsNodeRenderContext for which this dimension applies
*/
Rectangle2D getPrimitiveBounds(GraphicsNodeRenderContext rc);
/**
- * Returns the bounds of this node's primitivePaint after applying the input transform
- * (if any), concatenated with this node's transform (if any).
+ * Returns the bounds of this node's primitivePaint after applying the input
+ * transform (if any), concatenated with this node's transform (if any).
*
* @param txf the affine transform with which this node's transform should
* be concatenated. Should not be null.
@@ -304,27 +313,20 @@
GraphicsNodeRenderContext rc);
/**
- * Returns the bounds of the area covered by this node, without
- * taking any of its rendering attribute into account, i.e., exclusive
- * of any clipping, masking, filtering or stroking, for example.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns the bounds of the area covered by this node, without taking any
+ * of its rendering attribute into account. i.e., exclusive of any clipping,
+ * masking, filtering or stroking, for example.
*
* @param rc the GraphicsNodeRenderContext for which this dimension applies
*/
Rectangle2D getGeometryBounds(GraphicsNodeRenderContext rc);
/**
- * Returns the bounds of the area covered by this node, without
- * taking any of its rendering attribute into account, i.e., 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.
- *
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * 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,
+ * masking, filtering or stroking, for example. The returned value is
+ * transformed by the concatenation of the input transform and this node's
+ * transform.
*
* @param txf the affine transform with which this node's transform should
* be concatenated. Should not be null.
@@ -334,61 +336,36 @@
GraphicsNodeRenderContext rc);
/**
- * Tests if the specified Point2D is inside the boundary of this node.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns true if the specified Point2D is inside the boundary of this
+ * node, false otherwise.
*
* @param p the specified Point2D in the user space
* @param rc the GraphicsNodeRenderContext for which this dimension applies
- * @return true if the coordinates are inside, false otherwise
*/
boolean contains(Point2D p, GraphicsNodeRenderContext rc);
/**
- * Tests if the interior of this node intersects the interior of a
- * specified Rectangle2D.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns true if the interior of this node intersects the interior of a
+ * specified Rectangle2D, false otherwise.
*
* @param r the specified Rectangle2D in the user node space
* @param rc the GraphicsNodeRenderContext for which this dimension applies
- * @return true if the rectangle intersects, false otherwise
*/
boolean intersects(Rectangle2D r, GraphicsNodeRenderContext rc);
/**
- * Returns the GraphicsNode containing point p if this node or one of
- * its children is sensitive to mouse events at p.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
+ * Returns the GraphicsNode containing point p if this node or one of its
+ * children is sensitive to mouse events at p.
*
* @param p the specified Point2D in the user space
* @param rc the GraphicsNodeRenderContext for which this dimension applies
- * @return the GraphicsNode containing p on this branch of the GVT tree.
*/
GraphicsNode nodeHitAt(Point2D p, GraphicsNodeRenderContext rc);
/**
* Returns the outline of this node.
- * <b>Note</b>: The boundaries of some nodes (notably, text element nodes)
- * cannot be precisely determined independent of their
- * GraphicsNodeRenderContext.
*
* @param rc the GraphicsNodeRenderContext for which this dimension applies
- * @return the outline of this node
*/
Shape getOutline(GraphicsNodeRenderContext rc);
-
- /**
- * Returns a deep clone of this graphics node.
- *
- * <b>Warning</b>: All attributes of this graphics node are shared
- * between the original node and its copy. This method does not
- * perform any synchronization.
- */
- GraphicsNode renderingClone();
-
}
1.2 +14 -4 xml-batik/sources/org/apache/batik/gvt/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/Marker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Marker.java 2001/02/01 16:41:57 1.1
+++ Marker.java 2001/09/13 08:42:49 1.2
@@ -16,9 +16,10 @@
* particular policy for rotating the marker when drawing it.
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: Marker.java,v 1.1 2001/02/01 16:41:57 vhardy Exp $
+ * @version $Id: Marker.java,v 1.2 2001/09/13 08:42:49 tkormann Exp $
*/
public class Marker {
+
/**
* Rotation angle, about (0, 0) is user space. If orient is NaN
* then the marker's x-axis should be aligned with the slope
@@ -36,6 +37,13 @@
*/
private Point2D ref;
+ /**
+ * Constructs a new marker.
+ *
+ * @param markerNode the graphics node that represents the marker
+ * @param ref the reference point
+ * @param orient the orientation of the marker
+ */
public Marker(GraphicsNode markerNode,
Point2D ref,
double orient){
@@ -52,20 +60,22 @@
this.orient = orient;
}
+ /**
+ * Returns the reference point of this marker.
+ */
public Point2D getRef(){
return (Point2D)ref.clone();
}
/**
- * @see #orient
+ * Returns the orientation of this marker.
*/
public double getOrient(){
return orient;
}
/**
- * Returns the <code>GraphicsNode</code> that draws this
- * Marker
+ * Returns the <code>GraphicsNode</code> that draws this marker.
*/
public GraphicsNode getMarkerNode(){
return markerNode;
1.10 +7 -1 xml-batik/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
Index: StrokingTextPainter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StrokingTextPainter.java 2001/07/31 01:07:34 1.9
+++ StrokingTextPainter.java 2001/09/13 08:42:49 1.10
@@ -16,19 +16,24 @@
import java.awt.Stroke;
import java.awt.Composite;
import java.awt.BasicStroke;
+
import java.awt.font.FontRenderContext;
import java.awt.font.TextAttribute;
+
import java.awt.geom.Point2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
+
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import java.text.CharacterIterator;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Vector;
+
import org.apache.batik.gvt.GraphicsNodeRenderContext;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.text.AttributedCharacterSpanIterator;
@@ -48,11 +53,12 @@
* renders the attributed character iterator of a <tt>TextNode</tt>.
* <em>StrokingTextPainter includes support for stroke, fill, opacity,
* text-decoration, and other attributes.</em>
+ *
* @see org.apache.batik.gvt.TextPainter
* @see org.apache.batik.gvt.text.GVTAttributedCharacterIterator
*
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: StrokingTextPainter.java,v 1.9 2001/07/31 01:07:34 bella Exp $
+ * @version $Id: StrokingTextPainter.java,v 1.10 2001/09/13 08:42:49 tkormann Exp $
*/
public class StrokingTextPainter extends BasicTextPainter {
1.20 +2 -2 xml-batik/sources/org/apache/batik/gvt/text/GlyphLayout.java
Index: GlyphLayout.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/GlyphLayout.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GlyphLayout.java 2001/08/02 07:50:11 1.19
+++ GlyphLayout.java 2001/09/13 08:42:49 1.20
@@ -36,10 +36,10 @@
/**
* Implementation of TextSpanLayout which uses java.awt.font.GlyphVector.
- * @see org.apache.batik.gvt.TextSpanLayout.
+ * @see org.apache.batik.gvt.text.TextSpanLayout
*
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: GlyphLayout.java,v 1.19 2001/08/02 07:50:11 bella Exp $
+ * @version $Id: GlyphLayout.java,v 1.20 2001/09/13 08:42:49 tkormann Exp $
*/
public class GlyphLayout implements TextSpanLayout {
1.8 +2 -2 xml-batik/sources/org/apache/batik/gvt/text/TextHit.java
Index: TextHit.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/TextHit.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TextHit.java 2001/07/05 06:34:51 1.7
+++ TextHit.java 2001/09/13 08:42:49 1.8
@@ -14,10 +14,10 @@
/**
* Class that encapsulates information returned from hit testing
* a <tt>TextSpanLayout</tt> instance.
- * @see org.apache.batik.gvt.text.TextSpanLayout.
+ * @see org.apache.batik.gvt.text.TextSpanLayout
*
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: TextHit.java,v 1.7 2001/07/05 06:34:51 bella Exp $
+ * @version $Id: TextHit.java,v 1.8 2001/09/13 08:42:49 tkormann Exp $
*/
public class TextHit {
1.9 +2 -2 xml-batik/sources/org/apache/batik/gvt/text/TextLayoutAdapter.java
Index: TextLayoutAdapter.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/TextLayoutAdapter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TextLayoutAdapter.java 2001/07/05 06:34:51 1.8
+++ TextLayoutAdapter.java 2001/09/13 08:42:49 1.9
@@ -31,10 +31,10 @@
* Implementation of TextSpanLayout that uses java.awt.font.TextLayout
* for its internals.
* @see java.awt.font.TextLayout
- * @see org.apache.batik.gvt.TextPainter.
+ * @see org.apache.batik.gvt.TextPainter
*
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: TextLayoutAdapter.java,v 1.8 2001/07/05 06:34:51 bella Exp $
+ * @version $Id: TextLayoutAdapter.java,v 1.9 2001/09/13 08:42:49 tkormann Exp $
*/
public class TextLayoutAdapter implements TextSpanLayout {
1.3 +4 -4 xml-batik/sources/org/apache/batik/gvt/text/TextLayoutFactory.java
Index: TextLayoutFactory.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/TextLayoutFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextLayoutFactory.java 2001/01/15 17:10:48 1.2
+++ TextLayoutFactory.java 2001/09/13 08:42:49 1.3
@@ -19,7 +19,7 @@
*
* @see org.apache.batik.gvt.text.TextSpanLayout
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: TextLayoutFactory.java,v 1.2 2001/01/15 17:10:48 billh Exp $
+ * @version $Id: TextLayoutFactory.java,v 1.3 2001/09/13 08:42:49 tkormann Exp $
*/
public interface TextLayoutFactory {
@@ -29,8 +29,8 @@
* @param aci the character iterator to be laid out
* @param frc the rendering context for the fonts used.
*/
- public TextSpanLayout createTextLayout(AttributedCharacterIterator aci,
- Point2D offset,
- FontRenderContext frc);
+ TextSpanLayout createTextLayout(AttributedCharacterIterator aci,
+ Point2D offset,
+ FontRenderContext frc);
}
1.10 +2 -2 xml-batik/sources/org/apache/batik/gvt/text/TextSpanLayout.java
Index: TextSpanLayout.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/text/TextSpanLayout.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TextSpanLayout.java 2001/07/05 06:34:51 1.9
+++ TextSpanLayout.java 2001/09/13 08:42:49 1.10
@@ -23,10 +23,10 @@
* <tt>TextPainter</tt> implementations, conforming <tt>TextPainter</tt>s
* are not required to use this class.
* @see java.awt.font.TextLayout
- * @see org.apache.batik.gvt.TextPainter.
+ * @see org.apache.batik.gvt.TextPainter
*
* @author <a href="bill.haneman@ireland.sun.com>Bill Haneman</a>
- * @version $Id: TextSpanLayout.java,v 1.9 2001/07/05 06:34:51 bella Exp $
+ * @version $Id: TextSpanLayout.java,v 1.10 2001/09/13 08:42:49 tkormann Exp $
*/
public interface TextSpanLayout {
1.12 +3 -3 xml-batik/sources/org/apache/batik/svggen/SVGGeneratorContext.java
Index: SVGGeneratorContext.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/svggen/SVGGeneratorContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SVGGeneratorContext.java 2001/08/29 13:08:52 1.11
+++ SVGGeneratorContext.java 2001/09/13 08:42:50 1.12
@@ -18,7 +18,7 @@
*
* @see org.apache.batik.svggen.SVGGraphics2D#SVGGraphics2D(SVGGeneratorContext,boolean)
* @author <a href="mailto:cjolif@ilog.fr>Christophe Jolif</a>
- * @version $Id: SVGGeneratorContext.java,v 1.11 2001/08/29 13:08:52 cjolif Exp $
+ * @version $Id: SVGGeneratorContext.java,v 1.12 2001/09/13 08:42:50 tkormann Exp $
*/
public class SVGGeneratorContext implements ErrorConstants {
// this fields are package access for read-only purpose
@@ -187,7 +187,7 @@
}
/**
- * Sets the {@link org.apache.batik.svggen.Stylehandler}
+ * Sets the {@link org.apache.batik.svggen.StyleHandler}
* to be used. It should not be <code>null</code>.
*/
final public void setStyleHandler(StyleHandler styleHandler) {
@@ -220,7 +220,7 @@
}
/**
- * Sets the {@link org.apache.batik.svggen.Errorhandler}
+ * Sets the {@link org.apache.batik.svggen.ErrorHandler}
* to be used. It should not be <code>null</code>.
*/
final public void setErrorHandler(ErrorHandler errorHandler) {
1.2 +1 -3 xml-batik/sources/org/apache/batik/util/Base64EncoderStream.java
Index: Base64EncoderStream.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/Base64EncoderStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Base64EncoderStream.java 2001/07/05 16:54:49 1.1
+++ Base64EncoderStream.java 2001/09/13 08:42:50 1.2
@@ -23,10 +23,8 @@
* @author <a href="deweese@apache.org">Thomas DeWeese</a>
* @author <a href="vincent.hardy@eng.sun.com">Vincent Hardy</a>
* @author Chuck McManis
- * @version $Id: Base64EncoderStream.java,v 1.1 2001/07/05 16:54:49 deweese Exp $
- * @see Base64DecoderStream
+ * @version $Id: Base64EncoderStream.java,v 1.2 2001/09/13 08:42:50 tkormann Exp $
*/
-
public class Base64EncoderStream extends OutputStream {
/** This array maps the 6 bit values to their characters */
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org