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 2006/03/15 07:06:25 UTC
svn commit: r385978 [3/3] - in /xmlgraphics/batik/trunk:
sources-1.4/org/apache/batik/ext/awt/image/codec/imageio/
sources-1.4/org/apache/batik/swing/gvt/
sources-1.4/org/apache/batik/swing/svg/
sources/org/apache/batik/apps/svgbrowser/ sources/org/apa...
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/TransformListParser.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/TransformListParser.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/TransformListParser.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/TransformListParser.java Tue Mar 14 22:06:12 2006
@@ -207,7 +207,6 @@
/**
* Parses a rotate transform. 'r' is assumed to be the current character.
- * @return the current character.
*/
protected void parseRotate() throws ParseException, IOException {
current = reader.read();
@@ -296,7 +295,6 @@
/**
* Parses a translate transform. 't' is assumed to be
* the current character.
- * @return the current character.
*/
protected void parseTranslate() throws ParseException, IOException {
current = reader.read();
@@ -405,7 +403,6 @@
/**
* Parses a scale transform. 'c' is assumed to be the current character.
- * @return the current character.
*/
protected void parseScale() throws ParseException, IOException {
current = reader.read();
@@ -474,7 +471,6 @@
/**
* Parses a skew transform. 'e' is assumed to be the current character.
- * @return the current character.
*/
protected void parseSkew() throws ParseException, IOException {
current = reader.read();
@@ -542,7 +538,6 @@
/**
* Skips characters in the given reader until a ')' is encountered.
- * @return the first character after the ')'.
*/
protected void skipTransform() throws IOException {
loop: for (;;) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/InterpreterPool.java Tue Mar 14 22:06:12 2006
@@ -41,18 +41,6 @@
*/
public class InterpreterPool {
- /** The InterpreterFactory classname for Rhino. */
- private static final String RHINO =
- "org.apache.batik.script.rhino.RhinoInterpreterFactory";
-
- /** The InterpreterFactory classname for JPython. */
- private static final String JPYTHON =
- "org.apache.batik.script.jpython.JPythonInterpreterFactory";
-
- /** The InterpreterFactory classname for Jacl. */
- private static final String JACL =
- "org.apache.batik.script.jacl.JaclInterpreterFactory";
-
/**
* Name of the "document" object when referenced by scripts
*/
@@ -130,4 +118,3 @@
factories.remove(language);
}
}
-
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/BatikSecurityController.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/BatikSecurityController.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/BatikSecurityController.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/BatikSecurityController.java Tue Mar 14 22:06:12 2006
@@ -17,6 +17,10 @@
*/
package org.apache.batik.script.rhino;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
+
import org.mozilla.javascript.Context;
import org.mozilla.javascript.GeneratedClassLoader;
import org.mozilla.javascript.JavaScriptException;
@@ -24,12 +28,6 @@
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.SecurityController;
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-
/**
* This implementation of the Rhino <tt>SecurityController</tt> interface is
* meant for use within the context of Batik only. It is a partial
@@ -109,6 +107,5 @@
} catch (Exception e) {
throw new JavaScriptException(e);
}
-
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/RhinoInterpreter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/RhinoInterpreter.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/RhinoInterpreter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/RhinoInterpreter.java Tue Mar 14 22:06:12 2006
@@ -30,6 +30,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import java.util.MissingResourceException;
import org.apache.batik.bridge.InterruptedBridgeException;
import org.apache.batik.script.Interpreter;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/WindowWrapper.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/WindowWrapper.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/WindowWrapper.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/WindowWrapper.java Tue Mar 14 22:06:12 2006
@@ -1,6 +1,6 @@
/*
- Copyright 1999-2003 The Apache Software Foundation
+ Copyright 1999-2003,2006 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.
@@ -357,25 +357,32 @@
Object[] args,
Function funObj)
throws JavaScriptException {
- int len = args.length;
+
WindowWrapper ww = (WindowWrapper)thisObj;
Window window = ww.window;
- switch (len) {
- case 0:
- return Context.toObject("", thisObj);
-
- case 1:
- String message =
- (String)Context.toType(args[0], String.class);
- return Context.toObject(window.prompt(message), thisObj);
+ Object result;
+ switch (args.length) {
+ case 0:
+ result = "";
+ break;
+ case 1:
+ String message =
+ (String)Context.toType(args[0], String.class);
+ result = window.prompt(message);
+ break;
+ default:
+ message =
+ (String)Context.toType(args[0], String.class);
+ String defVal =
+ (String)Context.toType(args[1], String.class);
+ result = window.prompt(message, defVal);
+ break;
+ }
- default:
- message =
- (String)Context.toType(args[0], String.class);
- String defVal =
- (String)Context.toType(args[1], String.class);
- return Context.toObject(window.prompt(message, defVal), thisObj);
+ if (result == null) {
+ return null;
}
+ return Context.toObject(result, thisObj);
}
/**
@@ -556,5 +563,4 @@
return new Object [] { so };
}
}
-
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/svg12/GlobalWrapper.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/svg12/GlobalWrapper.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/svg12/GlobalWrapper.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/script/rhino/svg12/GlobalWrapper.java Tue Mar 14 22:06:12 2006
@@ -95,7 +95,6 @@
Scriptable thisObj,
Object[] args,
Function funObj) {
- int len = args.length;
GlobalWrapper gw = (GlobalWrapper) thisObj;
SVGGlobal global = (SVGGlobal) gw.window;
global.stopMouseCapture();
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandlerPNGEncoder.java Tue Mar 14 22:06:12 2006
@@ -22,7 +22,6 @@
import java.io.OutputStream;
import org.apache.batik.ext.awt.image.spi.ImageWriter;
-import org.apache.batik.ext.awt.image.spi.ImageWriterParams;
import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
/**
@@ -60,7 +59,6 @@
throws IOException {
ImageWriter writer = ImageWriterRegistry.getInstance()
.getWriterFor("image/png");
- ImageWriterParams params = new ImageWriterParams();
writer.writeImage(buf, os);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGClip.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGClip.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGClip.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGClip.java Tue Mar 14 22:06:12 2006
@@ -165,14 +165,11 @@
}
/**
- * @param object to compare
+ * @param clipKey object to compare
* @return true if equal, false otherwise
*/
- public boolean equals(Object clipKey){
- boolean isEqual = false;
- if((clipKey != null) &&clipKey instanceof ClipKey)
- isEqual = (hashCodeValue == ((ClipKey)clipKey).hashCodeValue);
-
- return isEqual;
+ public boolean equals(Object clipKey) {
+ return clipKey instanceof ClipKey
+ && hashCodeValue == ((ClipKey) clipKey).hashCodeValue;
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGComposite.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGComposite.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGComposite.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGComposite.java Tue Mar 14 22:06:12 2006
@@ -53,18 +53,12 @@
private SVGCustomComposite svgCustomComposite;
/**
- * Used to create DOM elements
- */
- private SVGGeneratorContext generatorContext;
-
- /**
* @param generatorContext The generator context used for handling
* custom and alpha composites
*/
public SVGComposite(SVGGeneratorContext generatorContext) {
this.svgAlphaComposite = new SVGAlphaComposite(generatorContext);
this.svgCustomComposite = new SVGCustomComposite(generatorContext);
- this.generatorContext = generatorContext;
}
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphics2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphics2D.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphics2D.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphics2D.java Tue Mar 14 22:06:12 2006
@@ -52,9 +52,9 @@
import org.apache.batik.ext.awt.g2d.AbstractGraphics2D;
import org.apache.batik.ext.awt.g2d.GraphicContext;
-import org.apache.batik.util.XMLConstants;
import org.apache.batik.util.CSSConstants;
-import org.apache.batik.util.SVGConstants;
+import org.apache.batik.util.XMLConstants;
+
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
@@ -789,7 +789,7 @@
* @see java.awt.Component#paint
* @see java.awt.Component#update
* @see java.awt.Component#getGraphics
- * @see java.awt.Graphics#create
+ * @see java.awt.Graphics#create()
*/
public void dispose() {
this.domTreeManager.removeGroupManager(this.domGroupManager);
@@ -802,14 +802,12 @@
* <code>Paint</code>, <code>Composite</code> and
* <code>Stroke</code> attributes.
* @param s the <code>Shape</code> to be rendered
- * @see #setStroke
- * @see #setPaint
+ * @see #setStroke(Stroke)
+ * @see #setPaint(Paint)
* @see java.awt.Graphics#setColor
- * @see #transform
- * @see #setTransform
- * @see #clip
- * @see #setClip
- * @see #setComposite
+ * @see #setTransform(AffineTransform)
+ * @see #setClip(Shape)
+ * @see #setComposite(java.awt.Composite)
*/
public void draw(Shape s) {
// Only BasicStroke can be converted to an SVG attribute equivalent.
@@ -847,11 +845,9 @@
* @return <code>true</code> if the <code>Image</code> is
* fully loaded and completely rendered;
* <code>false</code> if the <code>Image</code> is still being loaded.
- * @see #transform
- * @see #setTransform
- * @see #setComposite
- * @see #clip
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public boolean drawImage(Image img,
AffineTransform xform,
@@ -902,11 +898,9 @@
* corner of the image is rendered
* @param y the y coordinate in user space where the upper left
* corner of the image is rendered
- * @see #transform
- * @see #setTransform
- * @see #setComposite
- * @see #clip
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public void drawImage(BufferedImage img,
BufferedImageOp op,
@@ -1020,11 +1014,9 @@
* noninvertible.
* @param img the image to be rendered
* @param trans2 the transformation from image space into user space
- * @see #transform
- * @see #setTransform
- * @see #setComposite
- * @see #clip
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public void drawRenderedImage(RenderedImage img,
AffineTransform trans2) {
@@ -1100,11 +1092,9 @@
* {@link #drawRenderedImage(RenderedImage, AffineTransform)}.
* @param img the image to be rendered
* @param trans2 the transformation from image space into user space
- * @see #transform
- * @see #setTransform
- * @see #setComposite
- * @see #clip
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
* @see #drawRenderedImage
*/
public void drawRenderableImage(RenderableImage img,
@@ -1177,12 +1167,12 @@
* should be rendered
* @param y the y coordinate where the <code>String</code>
* should be rendered
- * @see #setPaint
+ * @see #setPaint(Paint)
* @see java.awt.Graphics#setColor
* @see java.awt.Graphics#setFont
- * @see #setTransform
- * @see #setComposite
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public void drawString(String s, float x, float y) {
if (textAsShapes) {
@@ -1201,7 +1191,6 @@
getFontConverter().recordFontUsage(s, getFont());
}
- Font font = getFont();
// Account for the font transform if there is one
AffineTransform savTxf = getTransform();
AffineTransform txtTxf = transformText(x, y);
@@ -1259,14 +1248,14 @@
* on the baseline.<br />
*
*
- * @param iterator the iterator whose text is to be rendered
+ * @param ati the iterator whose 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 #setPaint(Paint)
* @see java.awt.Graphics#setColor
- * @see #setTransform
- * @see #setComposite
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public void drawString(AttributedCharacterIterator ati, float x, float y) {
if ((textAsShapes) || (usesUnsupportedAttributes(ati))) {
@@ -1278,8 +1267,7 @@
// ati. This will be used to decide if we create tspan
// Elements under the text Element or not
boolean multiSpans = false;
- if (ati.getRunLimit() < ati.getEndIndex()) multiSpans = true;
- Font font = getFont();
+ if (ati.getRunLimit() < ati.getEndIndex()) multiSpans = true;
// create the parent text Element
Element text = getDOMFactory().createElementNS(SVG_NAMESPACE_URI,
@@ -1381,13 +1369,11 @@
* include the <code>Clip</code>, <code>Transform</code>,
* <code>Paint</code>, and <code>Composite</code>.
* @param s the <code>Shape</code> to be filled
- * @see #setPaint
+ * @see #setPaint(Paint)
* @see java.awt.Graphics#setColor
- * @see #transform
- * @see #setTransform
- * @see #setComposite
- * @see #clip
- * @see #setClip
+ * @see #setTransform(AffineTransform)
+ * @see #setComposite(java.awt.Composite)
+ * @see #setClip(Shape)
*/
public void fill(Shape s) {
Element svgShape = shapeConverter.toSVG(s);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java Tue Mar 14 22:06:12 2006
@@ -46,8 +46,6 @@
/**
* @param cmp Swing component to be converted to SVG
* @param svgGen SVGraphics2D to use to paint Swing components
- * @return an SVG fragment containing an SVG equivalent of the Swing
- * component tree.
*/
public static void print(JComponent cmp, SVGGraphics2D svgGen) {
if ((cmp instanceof JComboBox) || (cmp instanceof JScrollBar)) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java Tue Mar 14 22:06:12 2006
@@ -48,7 +48,6 @@
static private String EOL;
static private final String TAG_END = "/>";
static private final String TAG_START = "</";
- static private final String SPACE = " ";
static private final char[] SPACES =
{ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java Tue Mar 14 22:06:12 2006
@@ -28,12 +28,9 @@
import java.awt.geom.AffineTransform;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.WeakHashMap;
import javax.swing.AbstractAction;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java Tue Mar 14 22:06:12 2006
@@ -20,7 +20,6 @@
import java.awt.Component;
import java.awt.BorderLayout;
import java.awt.Dimension;
-import java.awt.Frame;
import java.awt.Rectangle;
import java.awt.event.ComponentAdapter;
@@ -261,6 +260,8 @@
*
* This is commented out because it requires JDK 1.4 and currently
* Batik targets JDK 1.3.
+ *
+ * TODO Move this to a JDK 1.4 specific class in sources-1.4.
*/
/*
protected class WheelListener implements MouseWheelListener
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractImageZoomInteractor.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractImageZoomInteractor.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractImageZoomInteractor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractImageZoomInteractor.java Tue Mar 14 22:06:12 2006
@@ -17,6 +17,7 @@
*/
package org.apache.batik.swing.gvt;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractPanInteractor.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractPanInteractor.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractPanInteractor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractPanInteractor.java Tue Mar 14 22:06:12 2006
@@ -18,6 +18,7 @@
package org.apache.batik.swing.gvt;
import java.awt.Cursor;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractRotateInteractor.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractRotateInteractor.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractRotateInteractor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractRotateInteractor.java Tue Mar 14 22:06:12 2006
@@ -18,6 +18,7 @@
package org.apache.batik.swing.gvt;
import java.awt.Dimension;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractZoomInteractor.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractZoomInteractor.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractZoomInteractor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractZoomInteractor.java Tue Mar 14 22:06:12 2006
@@ -22,6 +22,7 @@
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.geom.AffineTransform;
import java.awt.geom.Line2D;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java Tue Mar 14 22:06:12 2006
@@ -1870,7 +1870,6 @@
List l = e.getDirtyAreas();
if (l != null) {
- Rectangle visRect = getRenderRect();
Iterator i = l.iterator();
while (i.hasNext()) {
Rectangle r = (Rectangle)i.next();
@@ -2914,8 +2913,8 @@
*
* @param e The <image> element that can't be loaded.
* @param url The resolved url that can't be loaded.
- * @param message As best as can be determined the reason it can't be
- * loaded (not available, corrupt, unknown format,...).
+ * @param msg As best as can be determined the reason it can't be
+ * loaded (not available, corrupt, unknown format,...).
*/
public SVGDocument getBrokenLinkDocument(final Element e,
final String url,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/SVGUpdateOverlay.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/SVGUpdateOverlay.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/SVGUpdateOverlay.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/SVGUpdateOverlay.java Tue Mar 14 22:06:12 2006
@@ -53,7 +53,6 @@
public void endUpdate() {
int i=0;
- int total =0;
for (; i<counts.length-1; i++) {
counts[i] = counts[i+1];
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/ToSVGAbstractTranscoder.java Tue Mar 14 22:06:12 2006
@@ -17,23 +17,27 @@
*/
package org.apache.batik.transcoder;
+import java.awt.Toolkit;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.transcoder.AbstractTranscoder;
-import org.apache.batik.transcoder.TranscoderException;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.keys.*;
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.keys.BooleanKey;
+import org.apache.batik.transcoder.keys.FloatKey;
+import org.apache.batik.transcoder.keys.IntegerKey;
import org.apache.batik.util.SVGConstants;
+
+import org.xml.sax.XMLFilter;
+
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.xml.sax.XMLFilter;
-
-import java.net.*;
-import java.awt.Toolkit;
-import java.io.*;
-import org.apache.batik.svggen.SVGGraphics2D;
/** This class allows to simplify the creation of a transcoder which transcodes to
* SVG content.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/TranscodingHints.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/TranscodingHints.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/TranscodingHints.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/TranscodingHints.java Tue Mar 14 22:06:12 2006
@@ -81,7 +81,7 @@
*
* @param key the trancoding hint key.
* @param value the trancoding hint value.
- * @exception <tt>IllegalArgumentException</tt> value is not
+ * @exception IllegalArgumentException value is not
* appropriate for the specified key.
* @exception ClassCastException key is not of type
* <tt>TranscodingHints.Key</tt>
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java Tue Mar 14 22:06:12 2006
@@ -60,9 +60,10 @@
* @return the Image associated with the bitmap (null if the dimensions detected in the
* header are not consistent with the assumed dimensions)
*/
- protected BufferedImage getImage(byte[] bit, int width, int height) {
+ protected BufferedImage getImage(byte[] bit, int width, int height) {
+ // XXX This created BufferedImage with the given dimensions is wasted?
BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- WritableRaster raster = img.getRaster();
+ WritableRaster raster = img.getRaster();
// get the header of the bitmap, first the width and height
int _width = (((int)bit[7] & 0x00ff) << 24) | (((int)bit[6] & 0x00ff) << 16)
| (((int)bit[5] & 0x00ff) << 8) | (int)bit[4] & 0x00ff;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java Tue Mar 14 22:06:12 2006
@@ -18,15 +18,12 @@
package org.apache.batik.transcoder.wmf.tosvg;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.geom.Rectangle2D;
import java.io.DataInputStream;
import java.io.IOException;
-import java.net.URL;
import java.util.Vector;
-import java.awt.Font;
-import java.awt.Toolkit;
-import java.awt.Rectangle;
-import java.awt.geom.Dimension2D;
-import java.awt.geom.Rectangle2D;
import org.apache.batik.transcoder.wmf.WMFConstants;
@@ -299,7 +296,7 @@
* readShort(is);
* break;
* </pre>
- * @see svglab.encoding.wmf.WMFConstants
+ * @see WMFConstants
*/
protected abstract boolean readRecords(DataInputStream is) throws IOException;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java Tue Mar 14 22:06:12 2006
@@ -18,22 +18,19 @@
package org.apache.batik.transcoder.wmf.tosvg;
-import java.awt.Rectangle;
import java.awt.Color;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Dimension2D;
+import java.awt.Rectangle;
import java.awt.Shape;
-import java.io.File;
-import java.io.IOException;
+import java.awt.geom.Rectangle2D;
+import java.io.BufferedInputStream;
import java.io.DataInputStream;
+import java.io.File;
import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.util.ArrayList;
+import java.io.IOException;
-import org.apache.batik.transcoder.wmf.WMFConstants;
import org.apache.batik.ext.awt.geom.Polygon2D;
import org.apache.batik.ext.awt.geom.Polyline2D;
+import org.apache.batik.transcoder.wmf.WMFConstants;
/** This class holds simple properties about a WMF Metafile. It can be used whenever general
* informations must be retrieved about this file.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java Tue Mar 14 22:06:12 2006
@@ -19,40 +19,23 @@
package org.apache.batik.transcoder.wmf.tosvg;
import java.awt.Dimension;
-import java.awt.BasicStroke;
-import java.awt.geom.Rectangle2D;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLConnection;
-import org.w3c.dom.svg.SVGDocument;
-import org.apache.batik.transcoder.TranscodingHints;
-import org.apache.batik.transcoder.keys.*;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.transcoder.AbstractTranscoder;
+import org.apache.batik.svggen.SVGGraphics2D;
+import org.apache.batik.transcoder.ToSVGAbstractTranscoder;
import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.util.SVGConstants;
-import org.w3c.dom.DOMImplementation;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.xml.sax.XMLFilter;
-import org.apache.batik.svggen.SVGGraphics2D;
-import org.apache.batik.util.SVGConstants;
-import org.apache.batik.transcoder.ToSVGAbstractTranscoder;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.DocumentFragment;
/** This class implements the <tt>Transcoder</tt> interface and
* can convert a WMF input document into an SVG document.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/util/gui/resource/ToolBarFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/sources/org/apache/batik/util/gui/resource/ToolBarFactory.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/util/gui/resource/ToolBarFactory.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/util/gui/resource/ToolBarFactory.java Tue Mar 14 22:06:12 2006
@@ -48,11 +48,6 @@
private final static String SEPARATOR = "-";
/**
- * The table which contains the actions
- */
- private ActionMap actions;
-
- /**
* The button factory
*/
private ButtonFactory buttonFactory;
@@ -65,7 +60,6 @@
*/
public ToolBarFactory(ResourceBundle rb, ActionMap am) {
super(rb);
- actions = am;
buttonFactory = new ButtonFactory(rb, am);
}
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java Tue Mar 14 22:06:12 2006
@@ -139,13 +139,8 @@
private Object[][] permissions;
/**
- * Reference to the rectangles which show the test status
- */
- private Element[] statusRects;
-
- /**
* Runs this handler.
- * @param doc The current document.
+ * @param document The current document.
* @param win An object which represents the current viewer.
*/
public void run(final Document document, final Window win){
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java Tue Mar 14 22:06:12 2006
@@ -140,13 +140,8 @@
private Object[][] permissions;
/**
- * Reference to the rectangles which show the test status
- */
- private Element[] statusRects;
-
- /**
* Runs this handler.
- * @param doc The current document.
+ * @param document The current document.
* @param win An object which represents the current viewer.
*/
public void run(final Document document, final Window win){
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/swing/unitTesting.xml Tue Mar 14 22:06:12 2006
@@ -25,7 +25,6 @@
<test id="samples/anne.svg" />
<test id="samples/tests/spec/scripting/memoryLeak1.svg"/>
<test id="samples/tests/spec/scripting/primaryDoc.svg"/>
- <test id="samples/tests/spec/scripting/resourceDocDynamic11.svg"/>
</testGroup>
<!--test id="NullURITest"
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ScriptSelfTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ScriptSelfTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ScriptSelfTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/bridge/ScriptSelfTest.java Tue Mar 14 22:06:12 2006
@@ -16,28 +16,11 @@
package org.apache.batik.bridge;
-import org.apache.batik.test.*;
+import org.apache.batik.test.TestReport;
+import org.apache.batik.test.svg.SelfContainedSVGOnLoadTest;
import org.apache.batik.util.ApplicationSecurityEnforcer;
import org.apache.batik.util.ParsedURL;
-import org.apache.batik.test.svg.SelfContainedSVGOnLoadTest;
-
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-import java.security.ProtectionDomain;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-
-import java.io.FilePermission;
-import java.io.File;
-
-import java.net.URL;
-import java.util.Enumeration;
/**
* Helper class to simplify writing the unitTesting.xml file for
* the bridge.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/AttrIsIdTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/AttrIsIdTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/AttrIsIdTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/AttrIsIdTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,9 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractAttr;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* Tests Attr.isId.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentAdoptNodeTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentAdoptNodeTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentAdoptNodeTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentAdoptNodeTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,8 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* Tests Document.adoptNode.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentNormalizeDocumentTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentNormalizeDocumentTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentNormalizeDocumentTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentNormalizeDocumentTest.java Tue Mar 14 22:06:12 2006
@@ -17,15 +17,15 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.util.HashTable;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* Tests Document.normalizeDocument.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentRenameNodeTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentRenameNodeTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentRenameNodeTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/DocumentRenameNodeTest.java Tue Mar 14 22:06:12 2006
@@ -17,15 +17,11 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
-import org.w3c.dom.svg.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.svg.SVGGElement;
+import org.w3c.dom.svg.SVGSVGElement;
/**
* Tests Document.renameNode.
@@ -36,7 +32,6 @@
public class DocumentRenameNodeTest extends DOM3Test {
public boolean runImplBase() throws Exception {
Document doc = newSVGDoc();
- Element e = doc.getDocumentElement();
Element e2 = doc.createElementNS(SVG_NAMESPACE_URI, "g");
boolean pass = e2 instanceof SVGGElement;
e2 = (Element) ((AbstractDocument) doc).renameNode(e2, SVG_NAMESPACE_URI, "svg");
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/ElementSetIdAttributeNSTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/ElementSetIdAttributeNSTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/ElementSetIdAttributeNSTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/ElementSetIdAttributeNSTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,8 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractElement;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* Tests Element.setIdAttributeNS.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java Tue Mar 14 22:06:12 2006
@@ -17,15 +17,10 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
-import org.w3c.dom.events.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventListener;
/**
* Tests EventTarget.addEventListenerNS.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeBaseURITest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeBaseURITest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeBaseURITest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeBaseURITest.java Tue Mar 14 22:06:12 2006
@@ -17,15 +17,8 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* Tests Node.baseURI.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeCompareDocumentPositionTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeCompareDocumentPositionTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeCompareDocumentPositionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeCompareDocumentPositionTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,7 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
/**
* Tests Node.compareDocumentPosition.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeGetUserDataTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeGetUserDataTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeGetUserDataTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeGetUserDataTest.java Tue Mar 14 22:06:12 2006
@@ -17,15 +17,9 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.AbstractNode;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.UserDataHandler;
/**
* Tests Node.setUserData and Node.getUserData.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeTextContentTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeTextContentTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeTextContentTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/NodeTextContentTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,9 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractElement;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* Tests Node.textContent.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextReplaceWholeTextTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextReplaceWholeTextTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextReplaceWholeTextTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextReplaceWholeTextTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,8 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractText;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Text;
/**
* Tests Text.replaceWholeText.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextWholeTextTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextWholeTextTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextWholeTextTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/dom/TextWholeTextTest.java Tue Mar 14 22:06:12 2006
@@ -17,14 +17,7 @@
*/
package org.apache.batik.dom;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
-import org.apache.batik.dom.AbstractText;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.SVGConstants;
-
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
/**
* Tests Text.wholeText.
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/gvt/TextSelectionTest.java Tue Mar 14 22:06:12 2006
@@ -117,11 +117,10 @@
/**
* Constructor. ref is ignored if action == ROUND.
- * @param svg The svg file to load
- * @param id The element to select text from (must be a <text> element)
+ * @param textID The element to select text from (must be a <text> element)
* @param start The first character to select
* @param end The last character to select
- * @param ref The reference file.
+ * @param file The reference file.
*/
public TextSelectionTest(String file, String textID,
Integer start, Integer end) {
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java Tue Mar 14 22:06:12 2006
@@ -66,9 +66,6 @@
public static final String CUSTOM_CONTEXT_GENERATION_PREFIX = "Context";
- /**
- * @param name of the <tt>Painter</tt> class
- */
public SVGGeneratorTests(){
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/NullURITest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/NullURITest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/NullURITest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/swing/NullURITest.java Tue Mar 14 22:06:12 2006
@@ -17,17 +17,6 @@
*/
package org.apache.batik.swing;
-import java.awt.Dimension;
-
-import javax.swing.JFrame;
-
-import org.apache.batik.swing.gvt.GVTTreeRendererAdapter;
-import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
-import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
-import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
-import org.apache.batik.test.AbstractTest;
-import org.apache.batik.test.TestReport;
-
/**
* This test makes sure that setting the canvas's document uri to
* null does not cause a NullPointerException
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/AbstractTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/AbstractTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/AbstractTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/AbstractTest.java Tue Mar 14 22:06:12 2006
@@ -206,17 +206,15 @@
}catch(Exception ex){
ex.printStackTrace();
- }finally {
- //
- // In case we are in severe trouble, even filling in the
- // TestReport may fail. Because the TestReport instance
- // was created up-front, this ensures we can return
- // the report, even though it may be incomplete.
- e.printStackTrace();
- System.out.println("SERIOUS ERROR");
- return report;
}
-
+
+ // In case we are in severe trouble, even filling in the
+ // TestReport may fail. Because the TestReport instance
+ // was created up-front, this ensures we can return
+ // the report, even though it may be incomplete.
+ e.printStackTrace();
+ System.out.println("SERIOUS ERROR");
+ return report;
}
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/DefaultTestSuiteReport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/DefaultTestSuiteReport.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/DefaultTestSuiteReport.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/DefaultTestSuiteReport.java Tue Mar 14 22:06:12 2006
@@ -59,18 +59,13 @@
/**
* Descriptions in addition to that coming from children.
*/
- protected Entry[] description = null;
+ protected Entry[] description;
/**
* Parent report in case this report is part of a bigger one.
*/
protected TestSuiteReport parent;
- /**
- * Status of the TestSuite
- */
- private boolean passed = true;
-
public DefaultTestSuiteReport(TestSuite testSuite){
if(testSuite == null){
throw new IllegalArgumentException();
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java Tue Mar 14 22:06:12 2006
@@ -18,12 +18,21 @@
package org.apache.batik.test.svg;
import java.io.File;
+import java.io.FilePermission;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
import java.security.cert.Certificate;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import java.util.Enumeration;
import org.apache.batik.bridge.BaseScriptingEnvironment;
import org.apache.batik.bridge.BridgeContext;
@@ -39,29 +48,16 @@
import org.apache.batik.bridge.RelaxedExternalResourceSecurity;
import org.apache.batik.bridge.RelaxedScriptSecurity;
import org.apache.batik.bridge.ScriptSecurity;
-import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.UserAgentAdapter;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
+import org.apache.batik.util.ApplicationSecurityEnforcer;
import org.apache.batik.util.ParsedURL;
import org.apache.batik.util.XMLResourceDescriptor;
-import org.apache.batik.util.ApplicationSecurityEnforcer;
-import java.security.AccessController;
-import java.security.AccessControlContext;
-import java.security.CodeSource;
-import java.security.PrivilegedExceptionAction;
-import java.security.PrivilegedActionException;
-import java.security.ProtectionDomain;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Permissions;
-import java.security.Policy;
-
-import java.io.FilePermission;
-
-import java.util.Enumeration;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* This test takes an SVG file as an input. It processes the input SVG
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/test/xml/XMLTestReportProcessor.java Tue Mar 14 22:06:12 2006
@@ -152,7 +152,7 @@
}
/**
- * @param reportConsumer consumer for the XML report generated
+ * @param consumer consumer for the XML report generated
* by this object. May be null.
*/
public XMLTestReportProcessor(XMLTestReportProcessor.XMLReportConsumer consumer){
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/TranscoderInputTest.java Tue Mar 14 22:06:12 2006
@@ -27,12 +27,9 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-
import org.apache.batik.dom.GenericDOMImplementation;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.TestReport;
@@ -40,7 +37,9 @@
import org.apache.batik.util.XMLResourceDescriptor;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
/**
* This test validates that the various configurations of TranscoderInput
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AOITest.java Tue Mar 14 22:06:12 2006
@@ -51,7 +51,7 @@
* Constructs a new <tt>AOITest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param x the x coordinate of the area of interest
* @param y the y coordinate of the area of interest
* @param width the width of the area of interest
@@ -77,7 +77,7 @@
* Constructs a new <tt>AOITest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param x the x coordinate of the area of interest
* @param y the y coordinate of the area of interest
* @param width the width of the area of interest
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java Tue Mar 14 22:06:12 2006
@@ -228,8 +228,7 @@
/**
* Constructs a new <tt>DiffImageTranscoder</tt>.
*
- * @param refImg the reference image
- * @param report the test report into which errors have been sent
+ * @param refImgData the reference image data
*/
public DiffImageTranscoder(byte [] refImgData) {
this.refImgData = refImgData;
@@ -250,7 +249,7 @@
*
* @param img the image to write
* @param output the output (ignored)
- * @param TranscoderException if an error occured while storing the
+ * @throw TranscoderException if an error occured while storing the
* image
*/
public void writeImage(BufferedImage img, TranscoderOutput output)
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/AlternateStylesheetTest.java Tue Mar 14 22:06:12 2006
@@ -43,7 +43,7 @@
* Constructs a new <tt>AlternateStylesheetTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param alternateStylesheet the alternate stylesheet CSS media
*/
public AlternateStylesheetTest(String inputURI,
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java Tue Mar 14 22:06:12 2006
@@ -43,7 +43,7 @@
* Constructs a new <tt>DefaultFontFamilyTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param defaultFontFamily the default font-family to use
*/
public DefaultFontFamilyTest(String inputURI,
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DimensionTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DimensionTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DimensionTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/DimensionTest.java Tue Mar 14 22:06:12 2006
@@ -47,7 +47,7 @@
* Constructs a new <tt>DimensionTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param width the image width
* @param height the image height
*/
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/GenericDocumentTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/GenericDocumentTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/GenericDocumentTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/GenericDocumentTest.java Tue Mar 14 22:06:12 2006
@@ -46,7 +46,7 @@
* Constructs a new <tt>GenericDocumentTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
*/
public GenericDocumentTest(String inputURI, String refImageURI) {
this.inputURI = inputURI;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/InputStreamTest.java Tue Mar 14 22:06:12 2006
@@ -41,7 +41,7 @@
* Constructs a new <tt>InputStreamTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
*/
public InputStreamTest(String inputURI, String refImageURI) {
this.inputURI = inputURI;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/LanguageTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/LanguageTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/LanguageTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/LanguageTest.java Tue Mar 14 22:06:12 2006
@@ -46,7 +46,7 @@
* Constructs a new <tt>LanguageTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param language the preferred language
*/
public LanguageTest(String inputURI,
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MediaTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MediaTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MediaTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/MediaTest.java Tue Mar 14 22:06:12 2006
@@ -43,7 +43,7 @@
* Constructs a new <tt>MediaTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param media the CSS media
*/
public MediaTest(String inputURI, String refImageURI, String media) {
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ParametrizedDOMTest.java Tue Mar 14 22:06:12 2006
@@ -43,7 +43,7 @@
* Constructs a new <tt>ParametrizedDOMTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
*/
public ParametrizedDOMTest(String inputURI, String refImageURI) {
this.inputURI = inputURI;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/PixelToMMTest.java Tue Mar 14 22:06:12 2006
@@ -43,7 +43,7 @@
* Constructs a new <tt>PixelToMMTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
* @param px2mm the pixel to mm conversion factor
*/
public PixelToMMTest(String inputURI,
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ReaderTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ReaderTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ReaderTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/ReaderTest.java Tue Mar 14 22:06:12 2006
@@ -42,7 +42,7 @@
* Constructs a new <tt>ReaderTest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
*/
public ReaderTest(String inputURI, String refImageURI) {
this.inputURI = inputURI;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/URITest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/URITest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/URITest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/image/URITest.java Tue Mar 14 22:06:12 2006
@@ -36,7 +36,7 @@
* Constructs a new <tt>URITest</tt>.
*
* @param inputURI the URI of the input image
- * @param the URI of the reference image
+ * @param refImageURI the URI of the reference image
*/
public URITest(String inputURI, String refImageURI) {
this.inputURI = inputURI;
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java Tue Mar 14 22:06:12 2006
@@ -18,10 +18,6 @@
package org.apache.batik.transcoder.wmf;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -34,15 +30,16 @@
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
-import org.apache.batik.util.SVGConstants;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
-
-import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
+import org.apache.batik.util.SVGConstants;
/**
* This test validates that a given WMF file is properly converted to
@@ -169,14 +166,6 @@
return ret;
}
- /**
- * Constructor
- * @param painter the <tt>Painter</tt> object which will
- * perform an arbitrary rendering sequence.
- * @param refURL the location of a reference SVG which
- * should be exactly identical to that generated
- * by the painter.
- */
public WMFAccuracyTest(){
}
Modified: xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/RunnableQueueTest.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/RunnableQueueTest.java?rev=385978&r1=385977&r2=385978&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/RunnableQueueTest.java (original)
+++ xmlgraphics/batik/trunk/test-sources/org/apache/batik/util/RunnableQueueTest.java Tue Mar 14 22:06:12 2006
@@ -32,10 +32,8 @@
public RunnableQueue rq;
/**
- * Constructor
+ * Creates a new RunnableQueueTest.
* @param nThreads number of runnables to queue
- * @param sync Should requests be made synchronously (from
- * different threads).
*/
public RunnableQueueTest(int nThreads) {
this.nThreads = nThreads;