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 08:09:23 UTC
svn commit: r385983 [2/3] - in /xmlgraphics/batik/branches/anim:
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...
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractDocument.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractDocument.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractDocument.java Tue Mar 14 23:08:56 2006
@@ -43,14 +43,14 @@
import org.apache.batik.util.DOMConstants;
import org.apache.batik.util.SoftDoublyIndexedTable;
import org.apache.batik.util.XMLConstants;
+
import org.apache.xml.utils.PrefixResolver;
+
import org.apache.xpath.XPath;
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XObject;
import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMError;
import org.w3c.dom.DOMErrorHandler;
@@ -58,19 +58,20 @@
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.DOMLocator;
import org.w3c.dom.DOMStringList;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
-import org.w3c.dom.events.DocumentEvent;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.MutationNameEvent;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
+import org.w3c.dom.events.DocumentEvent;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.MutationNameEvent;
import org.w3c.dom.traversal.DocumentTraversal;
import org.w3c.dom.traversal.NodeFilter;
import org.w3c.dom.traversal.NodeIterator;
import org.w3c.dom.traversal.TreeWalker;
-import org.w3c.dom.UserDataHandler;
import org.w3c.dom.xpath.XPathEvaluator;
import org.w3c.dom.xpath.XPathException;
import org.w3c.dom.xpath.XPathExpression;
@@ -1259,7 +1260,7 @@
}
/**
- * Helper function for {@link normalizeDocument()}.
+ * Helper function for {@link #normalizeDocument()}.
*/
protected boolean normalizeDocument(Element e,
boolean cdataSections,
@@ -1355,7 +1356,6 @@
toRemove.add(a);
} else {
// namespace normalization
- boolean def = a.getNodeName().equals(XMLConstants.XMLNS_PREFIX);
String ns = a.getNodeValue();
if (a.getNodeValue().equals(XMLConstants.XMLNS_NAMESPACE_URI)
|| !ns.equals(XMLConstants.XMLNS_NAMESPACE_URI)) {
@@ -1648,16 +1648,13 @@
protected boolean checkChars(String s) {
int len = s.length();
if (xmlVersion.equals(XMLConstants.XML_VERSION_11)) {
- char c;
for (int i = 0; i < len; i++) {
- c = s.charAt(i);
if (!DOMUtilities.isXML11Character(s.charAt(i))) {
return false;
}
}
} else {
// assume XML 1.0
- char c;
for (int i = 0; i < len; i++) {
if (!DOMUtilities.isXMLCharacter(s.charAt(i))) {
return false;
@@ -2583,7 +2580,7 @@
/**
* <b>DOM</b>: Implements
- * {@link org.w3c.dom.xpath.XPathNSResolver.lookupNamespaceURI(String)}.
+ * {@link org.w3c.dom.xpath.XPathNSResolver#lookupNamespaceURI(String)}.
*/
public String lookupNamespaceURI(String prefix) {
return ((AbstractNode) contextNode).lookupNamespaceURI(prefix);
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractNode.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractNode.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/AbstractNode.java Tue Mar 14 23:08:56 2006
@@ -45,6 +45,7 @@
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventException;
import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
import org.w3c.dom.events.MutationEvent;
/**
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/ExtensibleDOMImplementation.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/ExtensibleDOMImplementation.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/ExtensibleDOMImplementation.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/ExtensibleDOMImplementation.java Tue Mar 14 23:08:56 2006
@@ -17,7 +17,6 @@
*/
package org.apache.batik.dom;
-import java.net.URL;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -31,9 +30,6 @@
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.css.parser.ExtendedParser;
import org.apache.batik.css.parser.ExtendedParserWrapper;
-import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.GenericElement;
-import org.apache.batik.dom.GenericElementNS;
import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.dom.util.DoublyIndexedTable;
import org.apache.batik.i18n.Localizable;
@@ -41,14 +37,12 @@
import org.apache.batik.util.Service;
import org.apache.batik.util.XMLResourceDescriptor;
-import org.w3c.css.sac.InputSource;
import org.w3c.css.sac.Parser;
-import org.w3c.dom.css.DOMImplementationCSS;
-import org.w3c.dom.css.ViewCSS;
-import org.w3c.dom.Document;
import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.css.DOMImplementationCSS;
+import org.w3c.dom.css.ViewCSS;
/**
* This class implements the {@link org.w3c.dom.DOMImplementation} interface.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/CustomEvent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/CustomEvent.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/CustomEvent.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/CustomEvent.java Tue Mar 14 23:08:56 2006
@@ -25,6 +25,7 @@
/**
* An interface DOM 3 custom events should implement to be used with
* Batik's DOM implementation.
+ * XXX This description is out of date.
* <p>
* This interface exists because of issues running under JDK < 1.5.
* In these environments where only the DOM Level 2 interfaces are
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMTextEvent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMTextEvent.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMTextEvent.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/DOMTextEvent.java Tue Mar 14 23:08:56 2006
@@ -17,7 +17,6 @@
*/
package org.apache.batik.dom.events;
-import org.w3c.dom.Node;
import org.w3c.dom.events.TextEvent;
import org.w3c.dom.views.AbstractView;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/events/EventSupport.java Tue Mar 14 23:08:56 2006
@@ -27,6 +27,7 @@
import org.apache.batik.dom.util.HashTable;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventException;
import org.w3c.dom.events.EventListener;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractElement.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractElement.java Tue Mar 14 23:08:56 2006
@@ -17,7 +17,6 @@
*/
package org.apache.batik.dom.svg;
-import org.apache.batik.css.engine.CSSEngine;
import org.apache.batik.css.engine.CSSNavigableNode;
import org.apache.batik.dom.AbstractAttr;
import org.apache.batik.dom.AbstractDocument;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/AbstractSVGPreserveAspectRatio.java Tue Mar 14 23:08:56 2006
@@ -17,13 +17,10 @@
*/
package org.apache.batik.dom.svg;
-import java.util.StringTokenizer;
-
-import org.apache.batik.util.SVGConstants;
-import org.apache.batik.parser.ParseException;
import org.apache.batik.parser.DefaultPreserveAspectRatioHandler;
-import org.apache.batik.parser.PreserveAspectRatioHandler;
+import org.apache.batik.parser.ParseException;
import org.apache.batik.parser.PreserveAspectRatioParser;
+import org.apache.batik.util.SVGConstants;
import org.w3c.dom.DOMException;
import org.w3c.dom.svg.SVGPreserveAspectRatio;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SAXSVGDocumentFactory.java Tue Mar 14 23:08:56 2006
@@ -27,17 +27,17 @@
import java.util.Properties;
import org.apache.batik.dom.AbstractDocument;
-import org.apache.batik.dom.util.SAXDocumentFactory;
-import org.apache.batik.dom.util.XLinkSupport;
import org.apache.batik.dom.svg12.SVG12DOMImplementation;
+import org.apache.batik.dom.util.SAXDocumentFactory;
import org.apache.batik.util.MimeTypeConstants;
import org.apache.batik.util.ParsedURL;
-import org.w3c.dom.Document;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.svg.SVGDocument;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.svg.SVGDocument;
/**
* This class contains methods for creating SVGDocument instances
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimatedPreserveAspectRatio.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimatedPreserveAspectRatio.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimatedPreserveAspectRatio.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMAnimatedPreserveAspectRatio.java Tue Mar 14 23:08:56 2006
@@ -23,7 +23,6 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.svg.SVGAnimatedPreserveAspectRatio;
import org.w3c.dom.svg.SVGPreserveAspectRatio;
-import org.w3c.dom.svg.SVGException;
/**
* This class implements the {@link SVGAnimatedPreserveAspectRatio} interface.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMDocument.java Tue Mar 14 23:08:56 2006
@@ -21,15 +21,11 @@
import java.io.ObjectInputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Calendar;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.MissingResourceException;
-import org.apache.batik.anim.timing.TimedDocumentRoot;
-import org.apache.batik.anim.timing.TimedElement;
import org.apache.batik.css.engine.CSSNavigableDocument;
import org.apache.batik.css.engine.CSSNavigableDocumentListener;
import org.apache.batik.css.engine.CSSStylableElement;
@@ -44,9 +40,9 @@
import org.apache.batik.dom.GenericProcessingInstruction;
import org.apache.batik.dom.GenericText;
import org.apache.batik.dom.StyleSheetFactory;
-import org.apache.batik.dom.events.DOMTimeEvent;
import org.apache.batik.dom.events.EventSupport;
import org.apache.batik.dom.util.XMLSupport;
+import org.apache.batik.i18n.Localizable;
import org.apache.batik.i18n.LocalizableSupport;
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.XMLConstants;
@@ -56,6 +52,7 @@
import org.w3c.dom.Comment;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
@@ -64,9 +61,9 @@
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
import org.w3c.dom.css.CSSStyleDeclaration;
+import org.w3c.dom.css.DocumentCSS;
import org.w3c.dom.events.Event;
import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
import org.w3c.dom.events.MutationEvent;
import org.w3c.dom.svg.SVGDocument;
import org.w3c.dom.svg.SVGLangSpace;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGOMElement.java Tue Mar 14 23:08:56 2006
@@ -28,9 +28,9 @@
import org.apache.batik.util.SVGConstants;
import org.apache.batik.util.SVGTypes;
import org.apache.batik.util.XMLConstants;
+
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.svg.SVGAnimatedEnumeration;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGTextContentSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGTextContentSupport.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGTextContentSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg/SVGTextContentSupport.java Tue Mar 14 23:08:56 2006
@@ -22,7 +22,6 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
-import org.w3c.dom.svg.SVGMatrix;
import org.w3c.dom.svg.SVGPoint;
import org.w3c.dom.svg.SVGRect;
@@ -32,8 +31,7 @@
* @author nicolas.socheleau@bitflash.com
* @version $Id$
*/
-public class SVGTextContentSupport
-{
+public class SVGTextContentSupport {
/**
* To implement {@link
@@ -46,7 +44,6 @@
return (((SVGTextContent)svgelt.getSVGContext()).getNumberOfChars());
}
-
/**
* To implement {@link
* org.w3c.dom.svg.SVGTextContentElement#getExtentOfChar(int charnum)}.
@@ -62,8 +59,7 @@
}
final SVGTextContent context = (SVGTextContent)svgelt.getSVGContext();
- Rectangle2D r2d = getExtent(svgelt, context, charnum);
-
+
return new SVGRect() {
public float getX() {
return (float)SVGTextContentSupport.getExtent
@@ -132,7 +128,6 @@
}
final SVGTextContent context = (SVGTextContent)svgelt.getSVGContext();
- Point2D p2d = getStartPos(svgelt, context, charnum);
return new SVGTextPoint(svgelt){
public float getX(){
@@ -171,7 +166,6 @@
}
final SVGTextContent context = (SVGTextContent)svgelt.getSVGContext();
- Point2D p2d = getEndPos(svgelt, context, charnum);
return new SVGTextPoint(svgelt){
public float getX(){
@@ -294,5 +288,4 @@
"readonly.point", null);
}
}
-
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVG12OMDocument.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVG12OMDocument.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVG12OMDocument.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVG12OMDocument.java Tue Mar 14 23:08:56 2006
@@ -25,6 +25,7 @@
import org.w3c.dom.DocumentType;
import org.w3c.dom.Node;
import org.w3c.dom.events.EventListener;
+import org.w3c.dom.svg.SVGDocument;
/**
* This class implements {@link SVGDocument} and provides support for
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMHandlerElement.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMHandlerElement.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMHandlerElement.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMHandlerElement.java Tue Mar 14 23:08:56 2006
@@ -24,7 +24,7 @@
import org.w3c.dom.Node;
/**
- * This class implements {@link org.w3c.dom.svg.SVGHandlerElement}.
+ * This class implements SVGHandlerElement.
*
* @author <a href="mailto:cam%40mcc%2eid%2eau">Cameron McCormack</a>
* @version $Id$
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMWheelEvent.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMWheelEvent.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMWheelEvent.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/SVGOMWheelEvent.java Tue Mar 14 23:08:56 2006
@@ -51,8 +51,6 @@
* <code>AbstractView</code>.
* @param wheelDeltaArg Specifices the number of clicks the mouse wheel has
* been moved.
- * @param modifiersList Specifies which modifiers were in effect for this
- * <code>Event</code>.
*/
public void initWheelEvent(String typeArg,
boolean canBubbleArg,
@@ -74,8 +72,6 @@
* <code>AbstractView</code>.
* @param wheelDeltaArg Specifices the number of clicks the mouse wheel has
* been moved.
- * @param modifiersList Specifies which modifiers were in effect for this
- * <code>Event</code>.
*/
public void initWheelEventNS(String namespaceURIArg,
String typeArg,
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/svg12/XBLEventSupport.java Tue Mar 14 23:08:56 2006
@@ -286,13 +286,10 @@
Object evts = getRetargettedEvents(target, ancestors, e, isCustom);
CustomEvent[] ces = null;
AbstractEvent[] aevts = null;
- boolean someEvents;
if (isCustom) {
ces = (CustomEvent[]) evts;
- someEvents = ces.length > 0;
} else {
aevts = (AbstractEvent[]) evts;
- someEvents = aevts.length > 0;
}
boolean preventDefault = false;
// CAPTURING_PHASE : fire event listeners from top to EventTarget
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/dom/util/SAXDocumentFactory.java Tue Mar 14 23:08:56 2006
@@ -25,30 +25,29 @@
import java.util.LinkedList;
import java.util.List;
-import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import org.apache.batik.util.HaltingThread;
+import org.apache.batik.util.XMLConstants;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory;
-import org.apache.batik.util.HaltingThread;
-import org.apache.batik.util.XMLConstants;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* This class contains methods for creating Document instances
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/LinearGradientPaintContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/LinearGradientPaintContext.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/LinearGradientPaintContext.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/LinearGradientPaintContext.java Tue Mar 14 23:08:56 2006
@@ -430,7 +430,6 @@
}
}
-
protected void fillSimpleReflect(int[] pixels, int off, int adjust,
int x, int y, int w, int h) {
final float initConst = (dgdX*x) + gc;
@@ -491,9 +490,14 @@
* operation. This is where the area is filled with colors distributed
* linearly.
*
- * @param x,y,w,h The area in device space for which colors are
- * generated.
- *
+ * @param x The x coordinate of the area in device space for which colors
+ * are generated.
+ * @param y The y coordinate of the area in device space for which colors
+ * are generated.
+ * @param w The width of the area in device space for which colors
+ * are generated.
+ * @param h The height of the area in device space for which colors
+ * are generated.
*/
protected void fillRaster(int[] pixels, int off, int adjust,
int x, int y, int w, int h) {
@@ -544,6 +548,4 @@
fillSimpleReflect(pixels, off, adjust, x, y, w, h);
}
}
-
-
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/RadialGradientPaintContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/RadialGradientPaintContext.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/RadialGradientPaintContext.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/RadialGradientPaintContext.java Tue Mar 14 23:08:56 2006
@@ -219,8 +219,15 @@
/**
* Return a Raster containing the colors generated for the graphics
* operation.
- * @param x,y,w,h The area in device space for which colors are
- * generated.
+ *
+ * @param x The x coordinate of the area in device space for which colors
+ * are generated.
+ * @param y The y coordinate of the area in device space for which colors
+ * are generated.
+ * @param w The width of the area in device space for which colors
+ * are generated.
+ * @param h The height of the area in device space for which colors
+ * are generated.
*/
protected void fillRaster(int pixels[], int off, int adjust,
int x, int y, int w, int h) {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/AbstractGraphics2D.java Tue Mar 14 23:08:56 2006
@@ -81,16 +81,15 @@
* convertion. No text is output.
*
*/
- public AbstractGraphics2D(boolean textAsShapes){
+ public AbstractGraphics2D(boolean textAsShapes) {
this.textAsShapes = textAsShapes;
}
/**
- * This private constructor is used in create
- *
- * @see #create
+ * Creates a new AbstractGraphics2D from an existing instance.
+ * @param g the AbstractGraphics2D whose properties should be copied
*/
- public AbstractGraphics2D(AbstractGraphics2D g){
+ public AbstractGraphics2D(AbstractGraphics2D g) {
this.gc = (GraphicContext)g.gc.clone();
this.gc.validateTransformStack();
this.textAsShapes = g.textAsShapes;
@@ -240,8 +239,8 @@
* @return a <code>Shape</code> object representing the
* current clipping area, or <code>null</code> if
* no clip is set.
- * @see java.awt.Graphics#getClipBounds
- * @see java.awt.Graphics#clipRect
+ * @see java.awt.Graphics#getClipBounds()
+ * @see java.awt.Graphics#clipRect(int, int, int, int)
* @see java.awt.Graphics#setClip(int, int, int, int)
* @see java.awt.Graphics#setClip(Shape)
* @since JDK1.1
@@ -557,7 +556,7 @@
* @param xPoints a an array of <code>x</code> coordinates.
* @param yPoints a an array of <code>y</code> coordinates.
* @param nPoints a the total number of points.
- * @see java.awt.Graphics#fillPolygon
+ * @see java.awt.Graphics#fillPolygon(int[],int[],int)
* @see java.awt.Graphics#drawPolyline
*/
public void drawPolygon(int xPoints[], int yPoints[],
@@ -866,7 +865,7 @@
* @see #setTransform
* @see #setComposite
* @see #clip
- * @see #setClip
+ * @see #setClip(Shape)
*/
public boolean drawImage(Image img,
AffineTransform xform,
@@ -918,7 +917,7 @@
* @see #setTransform
* @see #setComposite
* @see #clip
- * @see #setClip
+ * @see #setClip(Shape)
*/
public void drawImage(BufferedImage img,
BufferedImageOp op,
@@ -948,13 +947,13 @@
* @param y the y position in user space where the glyphs should be
* rendered
*
- * @see java.awt.Font#createGlyphVector
+ * @see java.awt.Font#createGlyphVector(FontRenderContext, char[])
* @see java.awt.font.GlyphVector
* @see #setPaint
* @see java.awt.Graphics#setColor
* @see #setTransform
* @see #setComposite
- * @see #setClip
+ * @see #setClip(Shape)
*/
public void drawGlyphVector(GlyphVector g, float x, float y){
Shape glyphOutline = g.getOutline(x, y);
@@ -983,12 +982,12 @@
* @return <code>true</code> if there is a hit; <code>false</code>
* otherwise.
* @see #setStroke
- * @see #fill
- * @see #draw
+ * @see #fill(Shape)
+ * @see #draw(Shape)
* @see #transform
* @see #setTransform
* @see #clip
- * @see #setClip
+ * @see #setClip(Shape)
*/
public boolean hit(Rectangle rect,
Shape s,
@@ -1016,12 +1015,12 @@
* there is a security manager, its <code>checkPermission</code>
* method is called with an <code>AWTPermission("readDisplayPixels")</code>
* permission.
+ * @param comp the <code>Composite</code> object to be used for rendering
* @throws SecurityException
* if a custom <code>Composite</code> object is being
* used to render to the screen and a security manager
* is set and its <code>checkPermission</code> method
* does not allow the operation.
- * @param comp the <code>Composite</code> object to be used for rendering
* @see java.awt.Graphics#setXORMode
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
@@ -1410,7 +1409,7 @@
*
* @return a reference to an instance of FontRenderContext.
* @see java.awt.font.FontRenderContext
- * @see java.awt.Font#createGlyphVector
+ * @see java.awt.Font#createGlyphVector(FontRenderContext,char[])
* @see java.awt.font.TextLayout
* @since JDK1.2
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/DefaultGraphics2D.java Tue Mar 14 23:08:56 2006
@@ -164,7 +164,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(){
System.out.println("dispose");
@@ -177,14 +177,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(java.awt.Stroke)
+ * @see #setPaint(java.awt.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){
System.out.println("draw(Shape)");
@@ -204,11 +202,9 @@
* noninvertible.
* @param img the image to be rendered
* @param xform 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 xform) {
@@ -239,11 +235,9 @@
*{@link #drawRenderedImage(RenderedImage, AffineTransform) drawRenderedImage}.
* @param img the image to be rendered
* @param xform 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,
@@ -268,12 +262,12 @@
* rendered
* @param y the y coordinate where the <code>String</code> should be
* rendered
- * @see #setPaint
+ * @see #setPaint(java.awt.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){
System.out.println("drawString(String)");
@@ -296,11 +290,11 @@
* @param iterator 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(java.awt.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 iterator,
float x, float y) {
@@ -315,13 +309,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(java.awt.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){
System.err.println("fill");
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/GraphicContext.java Tue Mar 14 23:08:56 2006
@@ -321,7 +321,7 @@
* @return a <code>Shape</code> object representing the
* current clipping area, or <code>null</code> if
* no clip is set.
- * @see java.awt.Graphics#getClipBounds
+ * @see java.awt.Graphics#getClipBounds()
* @see java.awt.Graphics#clipRect
* @see java.awt.Graphics#setClip(int, int, int, int)
* @see java.awt.Graphics#setClip(Shape)
@@ -373,12 +373,13 @@
* there is a security manager, its <code>checkPermission</code>
* method is called with an <code>AWTPermission("readDisplayPixels")</code>
* permission.
+ *
+ * @param comp the <code>Composite</code> object to be used for rendering
* @throws SecurityException
* if a custom <code>Composite</code> object is being
* used to render to the screen and a security manager
* is set and its <code>checkPermission</code> method
* does not allow the operation.
- * @param comp the <code>Composite</code> object to be used for rendering
* @see java.awt.Graphics#setXORMode
* @see java.awt.Graphics#setPaintMode
* @see java.awt.AlphaComposite
@@ -846,7 +847,7 @@
*
* @return a reference to an instance of FontRenderContext.
* @see java.awt.font.FontRenderContext
- * @see java.awt.Font#createGlyphVector
+ * @see java.awt.Font#createGlyphVector(FontRenderContext,char[])
* @see java.awt.font.TextLayout
* @since JDK1.2
*/
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/TransformType.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/TransformType.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/TransformType.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/g2d/TransformType.java Tue Mar 14 23:08:56 2006
@@ -52,15 +52,6 @@
public static final TransformType SHEAR = new TransformType(TRANSFORM_SHEAR, SHEAR_STRING);
public static final TransformType GENERAL = new TransformType(TRANSFORM_GENERAL, GENERAL_STRING);
- /**
- * All values
- */
- private static final TransformType[] enumValues = { TRANSLATE,
- ROTATE,
- SCALE,
- SHEAR,
- GENERAL };
-
private String desc;
private int val;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/AbstractSegment.java Tue Mar 14 23:08:56 2006
@@ -17,12 +17,8 @@
*/
package org.apache.batik.ext.awt.geom;
-import java.util.Arrays;
import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import java.io.PrintStream;
-import java.io.FileOutputStream;
+import java.util.Arrays;
/**
* An abstract class for path segments.
@@ -30,8 +26,6 @@
* @version $Id$
*/
public abstract class AbstractSegment implements Segment {
-
- private static final double rt3 = 1.7320508075689;
protected abstract int findRoots(double y, double [] roots);
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Cubic.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Cubic.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Cubic.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Cubic.java Tue Mar 14 23:08:56 2006
@@ -69,7 +69,6 @@
private void getMinMax(double p1, double p2,
double p3, double p4,
double [] minMax) {
- double min, max;
if (p4 > p1){
minMax[0] = p1; minMax[1] = p4;
} else {
@@ -271,7 +270,6 @@
}
private static int count = 0;
- private static int countExp = 0;
protected double subLength(double leftLegLen, double rightLegLen,
double maxErr) {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Linear.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Linear.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Linear.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Linear.java Tue Mar 14 23:08:56 2006
@@ -17,11 +17,8 @@
*/
package org.apache.batik.ext.awt.geom;
-import java.util.Arrays;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
/**
* A class representing a linear path segment.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Polyline2D.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Polyline2D.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Polyline2D.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Polyline2D.java Tue Mar 14 23:08:56 2006
@@ -18,16 +18,15 @@
package org.apache.batik.ext.awt.geom;
+import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
-import java.awt.Polygon;
-import java.awt.Point;
import java.awt.geom.AffineTransform;
-import java.awt.geom.PathIterator;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.awt.geom.Line2D;
/**
* This class has the same behavior than {@link Polygon2D}, except that
@@ -214,7 +213,7 @@
* @param x the specified x coordinate
* @param y the specified y coordinate
* @see java.awt.Polygon#getBounds
- * @see java.awt.Polygon#contains
+ * @see java.awt.Polygon#contains(double,double)
*/
public void addPoint(float x, float y) {
if (npoints == xpoints.length) {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Quadradic.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Quadradic.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Quadradic.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/Quadradic.java Tue Mar 14 23:08:56 2006
@@ -17,7 +17,6 @@
*/
package org.apache.batik.ext.awt.geom;
-import java.awt.geom.CubicCurve2D;
import java.awt.geom.Point2D;
import java.awt.geom.QuadCurve2D;
import java.awt.geom.Rectangle2D;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/RectListManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/RectListManager.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/RectListManager.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/geom/RectListManager.java Tue Mar 14 23:08:56 2006
@@ -21,7 +21,6 @@
import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
import java.util.Comparator;
import java.util.Iterator;
import java.util.ListIterator;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/ARGBChannel.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/ARGBChannel.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/ARGBChannel.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/ARGBChannel.java Tue Mar 14 23:08:56 2006
@@ -56,12 +56,6 @@
public static final ARGBChannel A
= new ARGBChannel(CHANNEL_A, ALPHA);
- /**
- * All values
- */
- private static final
- ARGBChannel[] enumValues = {R, G, B, A};
-
private String desc;
private int val;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/jpeg/JPEGImageWriter.java Tue Mar 14 23:08:56 2006
@@ -39,7 +39,7 @@
public class JPEGImageWriter implements ImageWriter {
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
*/
public void writeImage(RenderedImage image, OutputStream out)
throws IOException {
@@ -47,7 +47,7 @@
}
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.util.ImageWriterParams)
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.spi.ImageWriterParams)
*/
public void writeImage(RenderedImage image, OutputStream out,
ImageWriterParams params) throws IOException {
@@ -74,10 +74,9 @@
}
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#getMIMEType()
+ * @see ImageWriter#getMIMEType()
*/
public String getMIMEType() {
return "image/jpeg";
}
-
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageDecoder.java Tue Mar 14 23:08:56 2006
@@ -17,11 +17,6 @@
*/
package org.apache.batik.ext.awt.image.codec.png;
-import org.apache.batik.ext.awt.image.codec.util.ImageDecodeParam;
-import org.apache.batik.ext.awt.image.codec.util.ImageDecoderImpl;
-import org.apache.batik.ext.awt.image.codec.util.PropertyUtil;
-import org.apache.batik.ext.awt.image.codec.util.SimpleRenderedImage;
-
import java.awt.Color;
import java.awt.Point;
import java.awt.Transparency;
@@ -49,6 +44,10 @@
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+import org.apache.batik.ext.awt.image.codec.util.ImageDecoderImpl;
+import org.apache.batik.ext.awt.image.codec.util.PropertyUtil;
+import org.apache.batik.ext.awt.image.codec.util.SimpleRenderedImage;
+
/**
*/
public class PNGImageDecoder extends ImageDecoderImpl {
@@ -162,10 +161,6 @@
public static final int PNG_FILTER_AVERAGE = 3;
public static final int PNG_FILTER_PAETH = 4;
- private static final int RED_OFFSET = 2;
- private static final int GREEN_OFFSET = 1;
- private static final int BLUE_OFFSET = 0;
-
private int[][] bandOffsets = {
null,
{ 0 }, // G
@@ -200,8 +195,6 @@
private int[] significantBits = null;
- private boolean hasBackground = false;
-
// Parameter information
// If true, the user wants destination alpha where applicable.
@@ -1002,8 +995,6 @@
}
private void parse_bKGD_chunk(PNGChunk chunk) {
- hasBackground = true;
-
switch (colorType) {
case PNG_COLOR_PALETTE:
int bkgdIndex = chunk.getByte(0) & 0xff;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGImageWriter.java Tue Mar 14 23:08:56 2006
@@ -34,7 +34,7 @@
public class PNGImageWriter implements ImageWriter {
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream)
*/
public void writeImage(RenderedImage image, OutputStream out)
throws IOException {
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.util.ImageWriterParams)
+ * @see ImageWriter#writeImage(java.awt.image.RenderedImage, java.io.OutputStream, org.apache.batik.ext.awt.image.spi.ImageWriterParams)
*/
public void writeImage(RenderedImage image, OutputStream out,
ImageWriterParams params) throws IOException {
@@ -51,10 +51,9 @@
}
/**
- * @see org.apache.batik.ext.awt.image.util.ImageWriter#getMIMEType()
+ * @see ImageWriter#getMIMEType()
*/
public String getMIMEType() {
return "image/png";
}
-
}
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGRed.java Tue Mar 14 23:08:56 2006
@@ -141,10 +141,6 @@
public static final int PNG_FILTER_AVERAGE = 3;
public static final int PNG_FILTER_PAETH = 4;
- private static final int RED_OFFSET = 2;
- private static final int GREEN_OFFSET = 1;
- private static final int BLUE_OFFSET = 0;
-
private int[][] bandOffsets = {
null,
{ 0 }, // G
@@ -179,8 +175,6 @@
private int[] significantBits = null;
- private boolean hasBackground = false;
-
// Parameter information
// If true, the user wants destination alpha where applicable.
@@ -997,8 +991,6 @@
}
private void parse_bKGD_chunk(PNGChunk chunk) {
- hasBackground = true;
-
switch (colorType) {
case PNG_COLOR_PALETTE:
int bkgdIndex = chunk.getByte(0) & 0xff;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/png/PNGTranscoderInternalCodecWriteAdapter.java Tue Mar 14 23:08:56 2006
@@ -40,7 +40,7 @@
/**
* @throws TranscoderException
- * @see org.apache.batik.transcoder.image.PNGTranscoderWriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
+ * @see org.apache.batik.transcoder.image.PNGTranscoder.WriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
*/
public void writeImage(PNGTranscoder transcoder, BufferedImage img,
TranscoderOutput output) throws TranscoderException {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFFaxDecoder.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFFaxDecoder.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFFaxDecoder.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFFaxDecoder.java Tue Mar 14 23:08:56 2006
@@ -549,9 +549,6 @@
/**
* @param fillOrder The fill order of the compressed data bytes.
- * @param compData Array containing compressed data.
- * @param w
- * @param h
*/
public TIFFFaxDecoder(int fillOrder, int w, int h) {
this.fillOrder = fillOrder;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/tiff/TIFFTranscoderInternalCodecWriteAdapter.java Tue Mar 14 23:08:56 2006
@@ -48,7 +48,7 @@
/**
* @throws TranscoderException
- * @see org.apache.batik.transcoder.image.PNGTranscoderWriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
+ * @see org.apache.batik.transcoder.image.PNGTranscoder.WriteAdapter#writeImage(org.apache.batik.transcoder.image.PNGTranscoder, java.awt.image.BufferedImage, org.apache.batik.transcoder.TranscoderOutput)
*/
public void writeImage(TIFFTranscoder transcoder, BufferedImage img,
TranscoderOutput output) throws TranscoderException {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/codec/util/SeekableStream.java Tue Mar 14 23:08:56 2006
@@ -22,6 +22,7 @@
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
+import java.io.UTFDataFormatException;
/**
* An abstract subclass of <code>java.io.InputStream</code> that allows seeking
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TileBlock.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TileBlock.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TileBlock.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TileBlock.java Tue Mar 14 23:08:56 2006
@@ -34,8 +34,8 @@
/**
* Construct a tile block this represents a block of contigous
* tiles.
- * @param xloc The x index of left edge of the tile block.
- * @param yloc The y index of top edge of the tile block.
+ * @param xOff The x index of left edge of the tile block.
+ * @param yOff The y index of top edge of the tile block.
* @param w The number of tiles across in the block
* @param h The number of tiles down the block
* @param occupied Which entries in the block are already
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java Tue Mar 14 23:08:56 2006
@@ -79,14 +79,14 @@
/**
* Value beyond which values are wrapped on
* the x-axis.
- * @see #noise2Stitch
+ * @see TurbulencePatternRed#noise2Stitch
*/
int wrapX;
/**
* Value beyond which values are wrapped on
* the y-axis.
- * @see #noise2Stitch
+ * @see TurbulencePatternRed#noise2Stitch
*/
int wrapY;
@@ -140,8 +140,7 @@
private StitchInfo stitchInfo = null;
/**
- * Identity transform, default used when null input in generatePattern
- * @see #generatePattern
+ * Identity transform, default used when null input in the constructor.
*/
private static final AffineTransform IDENTITY = new AffineTransform();
@@ -210,8 +209,6 @@
private static final int BSize = 0x100;
private static final int BM = 0xff;
private static final double PerlinN = 0x1000;
- private static final int NP = 12 /* 2^PerlinN */;
- private static final int NM = 0xfff;
private final int latticeSelector[] = new int[BSize + 1];
private final double gradient[] = new double[(BSize+1)*8];
@@ -492,7 +489,8 @@
* 'turbFunctionResult', as defined in the spec. This is
* special case for 4 bands of output.
*
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @return The ARGB pixel value.
*/
@@ -600,7 +598,8 @@
* This is the heart of the turbulence calculation. It returns
* 'turbFunctionResult', as defined in the spec.
* @param rgb array for the four color components
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @param noise array used to avoid reallocating double array for
* each pixel
@@ -711,7 +710,8 @@
* This is the heart of the turbulence calculation. It returns
* 'turbFunctionResult', as defined in the spec.
* @param rgb array for the four color components
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @param noise array used to avoid reallocating double array for
* each pixel
@@ -825,7 +825,8 @@
* This is the heart of the turbulence calculation. It returns
* 'turbFunctionResult', as defined in the spec. This handles the
* case where we are generating 4 channels of noise.
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @return The ARGB pixel
*/
@@ -920,7 +921,8 @@
* This is the heart of the turbulence calculation. It returns
* 'turbFunctionResult', as defined in the spec.
* @param rgb array for the four color components
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @param noise array used to avoid reallocating double array for
* each pixel
@@ -978,7 +980,8 @@
* This is the heart of the turbulence calculation. It returns
* 'turbFunctionResult', as defined in the spec.
* @param rgb array for the four color components
- * @param point x and y coordinates of the point to process.
+ * @param pointX x coordinate of the point to process.
+ * @param pointY y coordinate of the point to process.
* @param fSum array used to avoid reallocating double array for each pixel
* @param noise array used to avoid reallocating double array for
* each pixel
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/ImageWriterRegistry.java Tue Mar 14 23:08:56 2006
@@ -17,11 +17,10 @@
*/
package org.apache.batik.ext.awt.image.spi;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.HashMap;
-import org.apache.batik.ext.awt.image.spi.RegistryEntry;
import org.apache.batik.util.Service;
public class ImageWriterRegistry {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java Tue Mar 14 23:08:56 2006
@@ -206,7 +206,7 @@
* @param exts Standard set of extensions
* @param mimeTypes array of supported MIME types
* @param offset Offset of magic number
- * @param magicNumber byte array to match.
+ * @param magicNumbers byte array to match.
*/
public MagicNumberRegistryEntry(String name,
String [] exts,
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/URLRegistryEntry.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/URLRegistryEntry.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/URLRegistryEntry.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/ext/awt/image/spi/URLRegistryEntry.java Tue Mar 14 23:08:56 2006
@@ -27,8 +27,8 @@
* these cases you should be aware that in order for the construction
* of the URL object to succeed you must register a @see
* URLStreamHandler using one of the methods listed in
- * @see java.net.URL#URL(java.lang.String, java.lang.String, int, java.lang.String).
- * */
+ * @see java.net.URL#URL(java.lang.String, java.lang.String, int, java.lang.String)
+ */
public interface URLRegistryEntry extends RegistryEntry {
/**
* Check if the URL references an image that can be
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/BatikDomExtension.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/BatikDomExtension.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/BatikDomExtension.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/BatikDomExtension.java Tue Mar 14 23:08:56 2006
@@ -17,13 +17,11 @@
*/
package org.apache.batik.extension.svg;
-import org.apache.batik.css.engine.value.LengthManager;
-import org.apache.batik.css.engine.value.svg.OpacityManager;
-import org.apache.batik.css.engine.value.svg.SVGColorManager;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.DomExtension;
import org.apache.batik.dom.ExtensibleDOMImplementation;
import org.apache.batik.dom.svg.SVGDOMImplementation;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtGlyphLayout.java Tue Mar 14 23:08:56 2006
@@ -18,20 +18,16 @@
package org.apache.batik.extension.svg;
-import java.awt.geom.Point2D;
import java.awt.font.FontRenderContext;
+import java.awt.geom.Point2D;
import java.text.AttributedCharacterIterator;
import java.util.Iterator;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
-import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTGlyphVector;
-import org.apache.batik.gvt.font.GVTLineMetrics;
import org.apache.batik.gvt.font.MultiGlyphVector;
import org.apache.batik.gvt.text.GlyphLayout;
-
-import org.apache.batik.gvt.TextNode;
/**
* A GlyphLayout class for SVG 1.2 flowing text.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtTextNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtTextNode.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtTextNode.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/extension/svg/FlowExtTextNode.java Tue Mar 14 23:08:56 2006
@@ -18,8 +18,6 @@
package org.apache.batik.extension.svg;
-import java.util.List;
-
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/event/AbstractAWTEventDispatcher.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/event/AbstractAWTEventDispatcher.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/event/AbstractAWTEventDispatcher.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/event/AbstractAWTEventDispatcher.java Tue Mar 14 23:08:56 2006
@@ -36,7 +36,6 @@
import javax.swing.event.EventListenerList;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.TextNode;
/**
* An EventDispatcher implementation based on AWT events.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowGlyphLayout.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowGlyphLayout.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowGlyphLayout.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowGlyphLayout.java Tue Mar 14 23:08:56 2006
@@ -18,20 +18,11 @@
package org.apache.batik.gvt.flow;
-import java.awt.geom.Point2D;
import java.awt.font.FontRenderContext;
+import java.awt.geom.Point2D;
import java.text.AttributedCharacterIterator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.LinkedList;
-import org.apache.batik.gvt.font.GVTFont;
-import org.apache.batik.gvt.font.GVTGlyphVector;
-import org.apache.batik.gvt.font.GVTLineMetrics;
-import org.apache.batik.gvt.font.MultiGlyphVector;
import org.apache.batik.gvt.text.GlyphLayout;
-
-import org.apache.batik.gvt.TextNode;
/**
* One line Class Desc
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextNode.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextNode.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextNode.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextNode.java Tue Mar 14 23:08:56 2006
@@ -18,29 +18,8 @@
package org.apache.batik.gvt.flow;
-import java.util.List;
-
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
-
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import java.awt.geom.Point2D;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextAttribute;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.apache.batik.gvt.font.GVTFont;
-import org.apache.batik.gvt.font.GVTGlyphVector;
-import org.apache.batik.gvt.font.GVTLineMetrics;
-import org.apache.batik.gvt.font.MultiGlyphVector;
-import org.apache.batik.gvt.text.GlyphLayout;
-import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-import org.apache.batik.gvt.renderer.StrokingTextPainter.TextRun;
/**
* One line Class Desc
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextPainter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextPainter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextPainter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/FlowTextPainter.java Tue Mar 14 23:08:56 2006
@@ -18,28 +18,25 @@
package org.apache.batik.gvt.flow;
-import java.text.AttributedCharacterIterator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-
-import org.apache.batik.gvt.TextNode;
-import org.apache.batik.gvt.TextPainter;
-import org.apache.batik.gvt.renderer.StrokingTextPainter;
-
-import java.awt.geom.Point2D;
import java.awt.font.FontRenderContext;
import java.awt.font.TextAttribute;
+import java.text.AttributedCharacterIterator;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Set;
+import org.apache.batik.gvt.TextNode;
+import org.apache.batik.gvt.TextPainter;
import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.font.GVTLineMetrics;
import org.apache.batik.gvt.font.MultiGlyphVector;
-import org.apache.batik.gvt.text.GlyphLayout;
+import org.apache.batik.gvt.renderer.StrokingTextPainter;
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
+import org.apache.batik.gvt.text.GlyphLayout;
/**
* One line Class Desc
@@ -130,7 +127,6 @@
List flowRects,
FontRenderContext frc) {
- int numChunks = acis.length;
// System.out.println("Len: " + acis.length + " Size: " +
// chunkLayouts.size());
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/LineInfo.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/LineInfo.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/LineInfo.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/flow/LineInfo.java Tue Mar 14 23:08:56 2006
@@ -129,7 +129,6 @@
double range = ranges[2*r+1]-ranges[2*r];
float adv=0;
float rangeAdvance = 0;
- double pdelta = range;
while (i<ggSz) {
GlyphGroupInfo ggi = ggis[i];
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/AWTGVTGlyphVector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/AWTGVTGlyphVector.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/AWTGVTGlyphVector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/AWTGVTGlyphVector.java Tue Mar 14 23:08:56 2006
@@ -27,7 +27,6 @@
import java.awt.font.GlyphJustificationInfo;
import java.awt.font.GlyphMetrics;
import java.awt.font.GlyphVector;
-import java.awt.font.TextAttribute;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
@@ -669,7 +668,7 @@
// if c is a transparent arabic char then need to shift the
// following glyphs left so that the current glyph is overwritten
- char c = ci.setIndex(i + ci.getBeginIndex());
+ /*char c =*/ ci.setIndex(i + ci.getBeginIndex());
/*
if (ArabicTextHandler.arabicCharTransparent(c)) {
int j;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/Glyph.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/Glyph.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/Glyph.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/Glyph.java Tue Mar 14 23:08:56 2006
@@ -18,9 +18,7 @@
package org.apache.batik.gvt.font;
import java.awt.Graphics2D;
-import java.awt.Paint;
import java.awt.Shape;
-import java.awt.Stroke;
import java.awt.font.GlyphMetrics;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
@@ -29,7 +27,6 @@
import java.util.Vector;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.gvt.text.ArabicTextHandler;
import org.apache.batik.gvt.text.TextPaintInfo;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/SVGGVTGlyphVector.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/SVGGVTGlyphVector.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/SVGGVTGlyphVector.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/font/SVGGVTGlyphVector.java Tue Mar 14 23:08:56 2006
@@ -255,20 +255,15 @@
// If these are both zero then it is axially aligned
// on it's "side"...
rotated[i] = false;
- double dx13 = p1.getX()-p3.getX();
- double dy12 = p1.getY()-p2.getY();
-
} else if ((Math.abs(tdx13) < 0.001) &&
(Math.abs(tdy12) < 0.001)) {
// If these are both zero then it is axially aligned
// vertically.
rotated[i] = false;
- double dx12 = p1.getX()-p2.getX();
- double dy13 = p1.getY()-p3.getY();
} else {
- rotated [i] = true;
+ rotated[i] = true;
}
-
+
Rectangle2D rectBounds;
rectBounds = tempLogicalBounds[i].getBounds2D();
if (rectBounds.getWidth() > maxWidth)
@@ -302,9 +297,6 @@
if ((i < getNumGlyphs()-1) &&
(tempLogicalBounds[i+1] != null)) {
- // make this glyph extend to the start of the next one
- Rectangle2D nextGlyphBounds =
- tempLogicalBounds[i+1].getBounds2D();
// make this glyph extend to the start of the next one
Rectangle2D ngb = tempLogicalBounds[i+1].getBounds2D();
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/DynamicRenderer.java Tue Mar 14 23:08:56 2006
@@ -20,15 +20,13 @@
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.RenderingHints;
-import java.awt.Shape;
import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.image.Raster;
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.ext.awt.image.GraphicsUtil;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/MacRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/MacRenderer.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/MacRenderer.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/MacRenderer.java Tue Mar 14 23:08:56 2006
@@ -17,17 +17,16 @@
*/
package org.apache.batik.gvt.renderer;
+import java.awt.AlphaComposite;
import java.awt.Color;
+import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Shape;
-import java.awt.Graphics2D;
-import java.awt.AlphaComposite;
import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
import java.awt.image.BufferedImage;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.ext.awt.image.GraphicsUtil;
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StaticRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StaticRenderer.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StaticRenderer.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StaticRenderer.java Tue Mar 14 23:08:56 2006
@@ -32,10 +32,10 @@
import java.awt.image.WritableRaster;
import java.awt.image.renderable.RenderContext;
import java.lang.ref.SoftReference;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
+import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.ext.awt.image.GraphicsUtil;
import org.apache.batik.ext.awt.image.PadMode;
import org.apache.batik.ext.awt.image.renderable.Filter;
@@ -43,7 +43,6 @@
import org.apache.batik.ext.awt.image.rendered.PadRed;
import org.apache.batik.ext.awt.image.rendered.TileCacheRed;
import org.apache.batik.ext.awt.image.rendered.TranslateRed;
-import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.HaltingThread;
@@ -55,13 +54,6 @@
* @version $Id$
*/
public class StaticRenderer implements ImageRenderer {
- /**
- * Error messages
- */
- private static final String ILLEGAL_ARGUMENT_NULL_OFFSCREEN =
- "offScreen should not be null";
- private static final String ILLEGAL_ARGUMENT_ZERO_WIDTH_OR_HEIGHT =
- "offScreen should have positive width/height";
/**
* Tree this Renderer paints.
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java Tue Mar 14 23:08:56 2006
@@ -18,7 +18,6 @@
package org.apache.batik.gvt.renderer;
-import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Paint;
import java.awt.RenderingHints;
@@ -37,7 +36,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.Vector;
import org.apache.batik.gvt.TextNode;
import org.apache.batik.gvt.TextPainter;
@@ -52,8 +50,8 @@
import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
import org.apache.batik.gvt.text.Mark;
import org.apache.batik.gvt.text.TextHit;
-import org.apache.batik.gvt.text.TextPath;
import org.apache.batik.gvt.text.TextPaintInfo;
+import org.apache.batik.gvt.text.TextPath;
import org.apache.batik.gvt.text.TextSpanLayout;
@@ -1113,7 +1111,6 @@
// the overall outline
for (int i = 0; i < textRuns.size(); ++i) {
TextRun textRun = (TextRun)textRuns.get(i);
- AttributedCharacterIterator textRunACI = textRun.getACI();
TextSpanLayout textRunLayout = textRun.getLayout();
Rectangle2D runBounds = textRunLayout.getBounds2D();
if (runBounds != null) {
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/ArabicTextHandler.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/ArabicTextHandler.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/ArabicTextHandler.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/ArabicTextHandler.java Tue Mar 14 23:08:56 2006
@@ -19,7 +19,6 @@
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
-import java.util.HashMap;
import java.util.Map;
@@ -37,8 +36,6 @@
private final static int arabicStart = 0x0600;
private final static int arabicEnd = 0x06FF;
- private final static Map charMap = new HashMap(54);
-
private static final AttributedCharacterIterator.Attribute ARABIC_FORM =
GVTAttributedCharacterIterator.TextAttribute.ARABIC_FORM;
private static final Integer ARABIC_NONE =
@@ -390,8 +387,8 @@
/**
* Will try and find a substitute character of the specified form.
*
- * @param unicode The unicode value of the glyph to try and replace. It
- * may be ligature and so may contain more than one character.
+ * @param ch1 The first character of two to replace.
+ * @param ch2 The second character of two to replace.
* @param form Indicates the required arabic form.
* (isolated = 1, final = 2, initial = 3, medial = 4)
*
Modified: xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java?rev=385983&r1=385982&r2=385983&view=diff
==============================================================================
--- xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java (original)
+++ xmlgraphics/batik/branches/anim/sources/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java Tue Mar 14 23:08:56 2006
@@ -43,7 +43,6 @@
private int chunkStart;
private int [] newCharOrder;
private final static Float FLOAT_NAN = new Float(Float.NaN);
- private final static Map mirroredGlyphs = new HashMap(50);
protected BidiAttributedCharacterIterator