You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by dv...@apache.org on 2006/11/22 15:50:52 UTC
svn commit: r478176 [1/3] - in
/xmlgraphics/batik/trunk/sources/org/apache/batik: svggen/ svggen/font/
svggen/font/table/ swing/ swing/gvt/ swing/svg/ transcoder/
transcoder/image/ transcoder/image/resources/ transcoder/print/
transcoder/svg2svg/ trans...
Author: dvholten
Date: Wed Nov 22 06:50:50 2006
New Revision: 478176
URL: http://svn.apache.org/viewvc?view=rev&rev=478176
Log:
some contribution to the general cleanup for the next version:
1.) replace some 'type var[]' with 'type[] var' - convention
2.) replace some StringBuffer.append( "x" ) with .append( 'x' )
3.) change order of (public/final/static/) modifiers to standard order
4.) replace some manual copy-loops with System.arraycopy()
5.) replace some statements of the form 'if ( func) == false )' to 'if ( ! func() ) '
6.) add '@version $Id$' to some class-javadoc
7.) remove redundant modifiers from interfaces:everything declared in an interface is implicitly public
8.) remove some obsolete semicolons
9.) trim trailing blanks
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DOMGroupManager.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorConstants.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ExtensionHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/GenericImageHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageCacher.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGColor.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGConverter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGDescriptor.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGFilterConverter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGeneratorContext.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContext.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGTransform.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/StyleHandler.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/Messages.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/SVGFont.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/GlyphDescription.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/LookupSubtableFactory.java
xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/Table.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/Messages.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/AbstractPanInteractor.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/JGVTComponentListener.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/gvt/TextSelectionManager.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/AbstractJSVGComponent.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/Messages.java
xmlgraphics/batik/trunk/sources/org/apache/batik/swing/svg/SVGUserAgentAdapter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/SVGAbstractTranscoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/image/ImageTranscoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/image/resources/Messages.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/print/PrintTranscoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/svg2svg/PrettyPrinter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/svg2svg/SVGTranscoder.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/WMFConstants.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFPainter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/AbstractWMFReader.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/RecordStore.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFHeaderProperties.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFRecordStore.java
xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/AbstractImageHandlerEncoder.java Wed Nov 22 06:50:50 2006
@@ -61,7 +61,7 @@
// for createGraphics method.
private static Method createGraphics = null;
private static boolean initDone = false;
- private final static Class[] paramc = new Class[] {BufferedImage.class};
+ private static final Class[] paramc = new Class[] {BufferedImage.class};
private static Object[] paramo = null;
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/CachedImageHandler.java Wed Nov 22 06:50:50 2006
@@ -31,7 +31,7 @@
* Returns the image cache instance in use by this handler
*
* @return the image cache
- */
- public ImageCacher getImageCacher();
-
+ */
+ ImageCacher getImageCacher();
+
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DOMGroupManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DOMGroupManager.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DOMGroupManager.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DOMGroupManager.java Wed Nov 22 06:50:50 2006
@@ -59,8 +59,8 @@
* @version $Id$
*/
public class DOMGroupManager implements SVGSyntax, ErrorConstants {
- public final static short DRAW = 0x01;
- public final static short FILL = 0x10;
+ public static final short DRAW = 0x01;
+ public static final short FILL = 0x10;
/**
* Reference to the GraphicContext this manager will use to
@@ -249,7 +249,7 @@
* given transform stack
*/
protected void setTransform(Element element,
- TransformStackElement transformStack[]) {
+ TransformStackElement[] transformStack) {
String transform = domTreeManager.gcConverter.
toSVG(transformStack).trim();
if (transform.length() > 0)
@@ -267,10 +267,10 @@
referenceGc.getGroupContext());
Map graphicElementDelta = gc.getGraphicElementContext();
- TransformStackElement gcTransformStack[] = gc.getTransformStack();
- TransformStackElement referenceStack[] = referenceGc.getTransformStack();
+ TransformStackElement[] gcTransformStack = gc.getTransformStack();
+ TransformStackElement[] referenceStack = referenceGc.getTransformStack();
int deltaStackLength = gcTransformStack.length - referenceStack.length;
- TransformStackElement deltaTransformStack[] =
+ TransformStackElement[] deltaTransformStack =
new TransformStackElement[deltaStackLength];
System.arraycopy(gcTransformStack, referenceStack.length,
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/DefaultCachedImageHandler.java Wed Nov 22 06:50:50 2006
@@ -40,8 +40,8 @@
* @version $Id$
* @see org.apache.batik.svggen.SVGGraphics2D
*/
-public abstract class DefaultCachedImageHandler
- implements CachedImageHandler,
+public abstract class DefaultCachedImageHandler
+ implements CachedImageHandler,
SVGSyntax,
ErrorConstants {
@@ -55,7 +55,7 @@
// for createGraphics method.
private static Method createGraphics = null;
private static boolean initDone = false;
- private final static Class[] paramc = new Class[] {BufferedImage.class};
+ private static final Class[] paramc = new Class[] {BufferedImage.class};
private static Object[] paramo = null;
protected ImageCacher imageCacher;
@@ -127,7 +127,7 @@
/**
* Creates an Element which can refer to an image.
* Note that no assumptions should be made by the caller about the
- * corresponding SVG tag. By default, an <image> tag is
+ * corresponding SVG tag. By default, an <image> tag is
* used, but the {@link CachedImageHandlerBase64Encoder}, for
* example, overrides this method to use a different tag.
*/
@@ -296,7 +296,7 @@
generatorContext.doubleString(dstHeight));
return null;
}
-
+
protected void handleEmptyImage(Element imageElement) {
imageElement.setAttributeNS(XLINK_NAMESPACE_URI,
XLINK_HREF_QNAME, "");
@@ -353,16 +353,16 @@
// Create an buffered image if necessary
//
BufferedImage buf = null;
- if (image instanceof BufferedImage
+ if (image instanceof BufferedImage
&&
((BufferedImage)image).getType() == getBufferedImageType()){
buf = (BufferedImage)image;
} else {
Dimension size = new Dimension(image.getWidth(), image.getHeight());
buf = buildBufferedImage(size);
-
+
Graphics2D g = createGraphics(buf);
-
+
g.drawRenderedImage(image, IDENTITY);
g.dispose();
}
@@ -397,12 +397,12 @@
BufferedImage buf,
SVGGeneratorContext generatorContext)
throws SVGGraphics2DIOException {
-
+
ByteArrayOutputStream os;
-
+
if (generatorContext == null)
throw new SVGGraphics2DRuntimeException(ERR_CONTEXT_NULL);
-
+
try {
os = new ByteArrayOutputStream();
// encode the image in memory
@@ -413,19 +413,19 @@
// should not happen since we do in-memory processing
throw new SVGGraphics2DIOException(ERR_UNEXPECTED, e);
}
-
+
// ask the cacher for a reference
String ref = imageCacher.lookup(os,
buf.getWidth(),
buf.getHeight(),
generatorContext);
-
+
// set the URL
imageElement.setAttributeNS(XLINK_NAMESPACE_URI,
XLINK_HREF_QNAME,
getRefPrefix() + ref);
- }
-
+ }
+
/**
* Should return the prefix with wich the image reference
* should be pre-concatenated.
@@ -438,11 +438,11 @@
*/
public abstract void encodeImage(BufferedImage buf, OutputStream os)
throws IOException;
-
+
/**
- * This template method should be overridden by derived classes to
+ * This template method should be overridden by derived classes to
* declare the image type they need for saving to file.
*/
public abstract int getBufferedImageType();
-
+
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorConstants.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorConstants.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorConstants.java Wed Nov 22 06:50:50 2006
@@ -21,89 +21,89 @@
public interface ErrorConstants {
// general errors
- public static final String ERR_UNEXPECTED =
+ String ERR_UNEXPECTED =
"unexpected exception";
- public static final String ERR_CONTEXT_NULL =
+ String ERR_CONTEXT_NULL =
"generatorContext should not be null";
/// image handling errors
- public static final String ERR_IMAGE_DIR_NULL =
+ String ERR_IMAGE_DIR_NULL =
"imageDir should not be null";
- public static final String ERR_IMAGE_DIR_DOES_NOT_EXIST =
+ String ERR_IMAGE_DIR_DOES_NOT_EXIST =
"imageDir does not exist";
- public static final String ERR_CANNOT_USE_IMAGE_DIR =
+ String ERR_CANNOT_USE_IMAGE_DIR =
"cannot convert imageDir to a URL value : ";
- public static final String ERR_IMAGE_NULL =
+ String ERR_IMAGE_NULL =
"image should not be null";
- public static final String ERR_WRITE =
+ String ERR_WRITE =
"could not write image File ";
- public static final String ERR_READ =
+ String ERR_READ =
"could not read image File ";
- public static final String ERR_IMAGE_HANDLER_NOT_SUPPORTED =
+ String ERR_IMAGE_HANDLER_NOT_SUPPORTED =
"imageHandler does not implement CachedImageHandler: ";
// SVGGraphics2D errors
- public static final String ERR_CANVAS_SIZE_NULL =
+ String ERR_CANVAS_SIZE_NULL =
"canvas size should not be null";
- public static final String ERR_XOR =
+ String ERR_XOR =
"XOR Mode is not supported by Graphics2D SVG Generator";
- public static final String ERR_ACI =
+ String ERR_ACI =
"AttributedCharacterIterator not supported yet";
// XmlWriter
- public static final String ERR_PROXY =
+ String ERR_PROXY =
"proxy should not be null";
- public static final String INVALID_NODE =
+ String INVALID_NODE =
"Unable to write node of type ";
// DOMGroup/TreeManager
- public static final String ERR_GC_NULL = "gc should not be null";
- public static final String ERR_DOMTREEMANAGER_NULL =
+ String ERR_GC_NULL = "gc should not be null";
+ String ERR_DOMTREEMANAGER_NULL =
"domTreeManager should not be null";
- public static final String ERR_MAXGCOVERRIDES_OUTOFRANGE =
+ String ERR_MAXGCOVERRIDES_OUTOFRANGE =
"maxGcOverrides should be greater than zero";
- public static final String ERR_TOP_LEVEL_GROUP_NULL =
+ String ERR_TOP_LEVEL_GROUP_NULL =
"topLevelGroup should not be null";
- public static final String ERR_TOP_LEVEL_GROUP_NOT_G =
+ String ERR_TOP_LEVEL_GROUP_NOT_G =
"topLevelGroup should be a group <g>";
// SVGClip/Font/Hint/Stroke descriptor
- public static final String ERR_CLIP_NULL = "clipPathValue should not be null";
- public static final String ERR_FONT_NULL =
+ String ERR_CLIP_NULL = "clipPathValue should not be null";
+ String ERR_FONT_NULL =
"none of the font description parameters should be null";
- public static final String ERR_HINT_NULL =
+ String ERR_HINT_NULL =
"none of the hints description parameters should be null";
- public static final String ERR_STROKE_NULL =
+ String ERR_STROKE_NULL =
"none of the stroke description parameters should be null";
// context
- public static final String ERR_MAP_NULL = "context map(s) should not be null";
- public static final String ERR_TRANS_NULL =
+ String ERR_MAP_NULL = "context map(s) should not be null";
+ String ERR_TRANS_NULL =
"transformer stack should not be null";
// SVGLookUp/RescaleOp
- public static final String ERR_ILLEGAL_BUFFERED_IMAGE_LOOKUP_OP =
+ String ERR_ILLEGAL_BUFFERED_IMAGE_LOOKUP_OP =
"BufferedImage LookupOp should have 1, 3 or 4 lookup arrays";
- public static final String ERR_SCALE_FACTORS_AND_OFFSETS_MISMATCH =
+ String ERR_SCALE_FACTORS_AND_OFFSETS_MISMATCH =
"RescapeOp offsets and scaleFactor array length do not match";
- public static final String ERR_ILLEGAL_BUFFERED_IMAGE_RESCALE_OP =
+ String ERR_ILLEGAL_BUFFERED_IMAGE_RESCALE_OP =
"BufferedImage RescaleOp should have 1, 3 or 4 scale factors";
// SVGGeneratorContext
- public static final String ERR_DOM_FACTORY_NULL =
+ String ERR_DOM_FACTORY_NULL =
"domFactory should not be null";
- public static final String ERR_IMAGE_HANDLER_NULL =
+ String ERR_IMAGE_HANDLER_NULL =
"imageHandler should not be null";
- public static final String ERR_EXTENSION_HANDLER_NULL =
+ String ERR_EXTENSION_HANDLER_NULL =
"extensionHandler should not be null";
- public static final String ERR_ID_GENERATOR_NULL =
+ String ERR_ID_GENERATOR_NULL =
"idGenerator should not be null";
- public static final String ERR_STYLE_HANDLER_NULL =
+ String ERR_STYLE_HANDLER_NULL =
"styleHandler should not be null";
- public static final String ERR_ERROR_HANDLER_NULL =
+ String ERR_ERROR_HANDLER_NULL =
"errorHandler should not be null";
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ErrorHandler.java Wed Nov 22 06:50:50 2006
@@ -29,12 +29,12 @@
/**
* This method handles the <code>SVGGraphics2DIOException</code>.
*/
- public void handleError(SVGGraphics2DIOException ex)
+ void handleError(SVGGraphics2DIOException ex)
throws SVGGraphics2DIOException;
/**
* This method handles the <code>SVGGraphics2DRuntimeException</code>.
*/
- public void handleError(SVGGraphics2DRuntimeException ex)
+ void handleError(SVGGraphics2DRuntimeException ex)
throws SVGGraphics2DRuntimeException;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ExtensionHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ExtensionHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ExtensionHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ExtensionHandler.java Wed Nov 22 06:50:50 2006
@@ -37,7 +37,7 @@
* @param generatorContext allows the handler to build DOM objects as needed.
* @return an SVGPaintDescriptor
*/
- public SVGPaintDescriptor handlePaint(Paint paint,
+ SVGPaintDescriptor handlePaint(Paint paint,
SVGGeneratorContext generatorContext);
/**
@@ -47,7 +47,7 @@
* or null if the composite cannot be handled
*
*/
- public SVGCompositeDescriptor handleComposite(Composite composite,
+ SVGCompositeDescriptor handleComposite(Composite composite,
SVGGeneratorContext generatorContext);
/**
@@ -59,7 +59,7 @@
* @return an SVGFilterDescriptor which contains a valid SVG filter,
* or null if the composite cannot be handled
*/
- public SVGFilterDescriptor handleFilter(BufferedImageOp filter,
+SVGFilterDescriptor handleFilter(BufferedImageOp filter,
Rectangle filterRect,
SVGGeneratorContext generatorContext);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/GenericImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/GenericImageHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/GenericImageHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/GenericImageHandler.java Wed Nov 22 06:50:50 2006
@@ -34,16 +34,16 @@
*/
public interface GenericImageHandler {
/**
- * Sets the DomTreeManager this image handler may need to
+ * Sets the DomTreeManager this image handler may need to
* interact with.
*/
- public void setDOMTreeManager(DOMTreeManager domTreeManager);
+ void setDOMTreeManager(DOMTreeManager domTreeManager);
/**
* Creates an Element suitable for referring to images.
* Note that no assumptions can be made about the name of this Element.
*/
- public Element createElement(SVGGeneratorContext generatorContext);
+ Element createElement(SVGGeneratorContext generatorContext);
/**
* The handler should set the xlink:href and return a transform
@@ -58,7 +58,7 @@
*
* @return transform converting the image dimension to rendered dimension
*/
- public AffineTransform handleImage(Image image, Element imageElement,
+ AffineTransform handleImage(Image image, Element imageElement,
int x, int y,
int width, int height,
SVGGeneratorContext generatorContext);
@@ -76,7 +76,7 @@
*
* @return transform converting the image dimension to rendered dimension
*/
- public AffineTransform handleImage(RenderedImage image, Element imageElement,
+ AffineTransform handleImage(RenderedImage image, Element imageElement,
int x, int y,
int width, int height,
SVGGeneratorContext generatorContext);
@@ -94,7 +94,7 @@
*
* @return transform converting the image dimension to rendered dimension
*/
- public AffineTransform handleImage(RenderableImage image, Element imageElement,
+ AffineTransform handleImage(RenderableImage image, Element imageElement,
double x, double y,
double width, double height,
SVGGeneratorContext generatorContext);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageCacher.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageCacher.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageCacher.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageCacher.java Wed Nov 22 06:50:50 2006
@@ -42,11 +42,11 @@
* @version $Id$
*/
public abstract class ImageCacher implements SVGSyntax, ErrorConstants {
-
+
DOMTreeManager domTreeManager = null;
Hashtable imageCache;
Checksum checkSum;
-
+
/**
* Creates an ImageCacher.
*/
@@ -92,7 +92,7 @@
*
* @return a URI for the image
* @throws SVGGraphics2DIOException if an error occurs during image file i/o
- */
+ */
public String lookup(ByteArrayOutputStream os,
int width, int height,
SVGGeneratorContext ctx)
@@ -104,9 +104,9 @@
int checksum = getChecksum(os.toByteArray());
Integer key = new Integer(checksum);
String href = null;
-
+
Object data = getCacheableData(os);
-
+
LinkedList list = (LinkedList) imageCache.get(key);
if(list == null) {
// Key not found: make a new key/value pair
@@ -122,7 +122,7 @@
}
}
}
-
+
if(href == null) {
// Still no hit: add our own
ImageCacheEntry newEntry = createEntry(checksum, data,
@@ -131,10 +131,10 @@
list.add(newEntry);
href = newEntry.href;
}
-
+
return href;
}
-
+
/**
* Returns an object which can be cached.
* Implementation must determine which information
@@ -143,7 +143,7 @@
* @param os the byte stream which is to be coerced
*/
abstract Object getCacheableData(ByteArrayOutputStream os);
-
+
/**
* Determines if two images are equal.
* Interpretation of the objects referred to by
@@ -189,10 +189,10 @@
/** A checksum calculated for the data cached */
public int checksum;
-
+
/** An implementation-dependent object referring to the data */
public Object src;
-
+
/** A uri identifying the data */
public String href;
@@ -212,7 +212,7 @@
* Cache implementation for images embedded in the SVG file.
*/
public static class Embedded extends ImageCacher {
-
+
/**
* Sets the DOMTreeManager this cacher should work on.
*
@@ -233,7 +233,7 @@
// so we can just pass a reference to the tree manager.
return DATA_PROTOCOL_PNG_PREFIX + os.toString();
}
-
+
boolean imagesMatch(Object o1, Object o2) {
return o1.equals(o2);
}
@@ -244,12 +244,12 @@
// Get a new unique id
String id = ctx.idGenerator.generateID(ID_PREFIX_IMAGE);
-
+
// Add the image data reference to the <defs> section
addToTree(id, (String) data, width, height, ctx);
// Create new cache entry
- return new ImageCacheEntry(checksum, data, SIGN_POUND + id);
+ return new ImageCacheEntry(checksum, data, SIGN_POUND + id); // <<<<<<<<<< error ??
}
/**
@@ -262,7 +262,7 @@
Document domFactory = domTreeManager.getDOMFactory();
// Element imageDefs = getImageDefs(domFactory, ctx);
-
+
// Create and initialize the new image element
Element imageElement = domFactory.createElementNS(SVG_NAMESPACE_URI,
SVG_IMAGE_TAG);
@@ -278,7 +278,7 @@
// imageDefs.appendChild(imageElement);
domTreeManager.addOtherDef(imageElement);
}
-
+
/**
* Returns the top level defs section dedicated to cached
@@ -290,28 +290,28 @@
*/
/*private Element getImageDefs(Document domFactory,
SVGGeneratorContext ctx) {
-
+
Element imageDefs = domFactory.createElementNS(SVG_NAMESPACE_URI,
SVG_DEFS_TAG);
- String id = ctx.idGenerator.generateID(ID_PREFIX_IMAGE_DEFS);
+ String id = ctx.idGenerator.generateID(ID_PREFIX_IMAGE_DEFS);
imageDefs.setAttributeNS(null, SVG_ID_ATTRIBUTE, id);
-
+
domTreeManager.appendGroup(imageDefs, null);
return imageDefs;
}*/
}
-
+
/**
* Cache implementation for file-based images.
*/
public static class External extends ImageCacher {
-
+
private String imageDir;
private String prefix;
private String suffix;
-
+
public External(String imageDir, String prefix, String suffix) {
super();
this.imageDir = imageDir;
@@ -322,24 +322,24 @@
Object getCacheableData(ByteArrayOutputStream os) {
return os;
}
-
+
boolean imagesMatch(Object o1, Object o2)
throws SVGGraphics2DIOException {
boolean match = false;
- try {
+ try {
FileInputStream imageStream =
new FileInputStream((File) o1);
int imageLen = imageStream.available();
byte[] imageBytes = new byte[imageLen];
byte[] candidateBytes =
((ByteArrayOutputStream) o2).toByteArray();
-
+
int bytesRead = 0;
while (bytesRead != imageLen) {
bytesRead += imageStream.read
(imageBytes, bytesRead, imageLen-bytesRead);
}
-
+
match = Arrays.equals(imageBytes, candidateBytes);
} catch(IOException e) {
throw new SVGGraphics2DIOException(
@@ -352,11 +352,11 @@
int width, int height,
SVGGeneratorContext ctx)
throws SVGGraphics2DIOException {
-
+
// Create a new file in image directory
File imageFile = null;
- try {
+ try {
// While the files we are generating exist, try to create
// another unique id.
while (imageFile == null) {
@@ -365,7 +365,7 @@
if (imageFile.exists())
imageFile = null;
}
-
+
// Write data to file
OutputStream outputStream = new FileOutputStream(imageFile);
((ByteArrayOutputStream) data).writeTo(outputStream);
@@ -373,9 +373,9 @@
} catch(IOException e) {
throw new SVGGraphics2DIOException(ERR_WRITE+imageFile.getName());
}
-
+
// Create new cache entry
- return new ImageCacheEntry(checksum, imageFile, imageFile.getName());
+ return new ImageCacheEntry(checksum, imageFile, imageFile.getName()); // <<<<<<<<<< error ??
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/ImageHandler.java Wed Nov 22 06:50:50 2006
@@ -41,20 +41,20 @@
* The handler should set the xlink:href tag and the width and
* height attributes.
*/
- public void handleImage(Image image, Element imageElement,
+ void handleImage(Image image, Element imageElement,
SVGGeneratorContext generatorContext);
/**
* The handler should set the xlink:href tag and the width and
* height attributes.
*/
- public void handleImage(RenderedImage image, Element imageElement,
+ void handleImage(RenderedImage image, Element imageElement,
SVGGeneratorContext generatorContext);
/**
* The handler should set the xlink:href tag and the width and
* height attributes.
*/
- public void handleImage(RenderableImage image, Element imageElement,
+ void handleImage(RenderableImage image, Element imageElement,
SVGGeneratorContext generatorContext);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGColor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGColor.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGColor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGColor.java Wed Nov 22 06:50:50 2006
@@ -46,7 +46,7 @@
public static final Color lime = new Color(0x00, 0xff, 0x00);
public static final Color maroon = new Color(0x80, 0x00, 0x00);
public static final Color navy = new Color(0x00, 0x00, 0x80);
- public static final Color olive = new Color(0x80, 0x80, 00);
+ public static final Color olive = new Color(0x80, 0x80, 0x00);
public static final Color purple = new Color(0x80, 0x00, 0x80);
public static final Color red = Color.red;
public static final Color silver = new Color(0xc0, 0xc0, 0xc0);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGConverter.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGConverter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGConverter.java Wed Nov 22 06:50:50 2006
@@ -41,7 +41,7 @@
* with the related definitions
* @see org.apache.batik.svggen.SVGDescriptor
*/
- public SVGDescriptor toSVG(GraphicContext gc);
+ SVGDescriptor toSVG(GraphicContext gc);
/**
* @return set of definitions referenced by the attribute
@@ -50,5 +50,5 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public List getDefinitionSet();
+ List getDefinitionSet();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGDescriptor.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGDescriptor.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGDescriptor.java Wed Nov 22 06:50:50 2006
@@ -38,7 +38,7 @@
* @return a map containing the SVG attributes needed by the
* descriptor.
*/
- public Map getAttributeMap(Map attrMap);
+ Map getAttributeMap(Map attrMap);
/**
* @param defSet if not null, definitions required to provide
@@ -49,5 +49,5 @@
* @return a set containing Elements that represent the definition
* of the descriptor's attribute values
*/
- public List getDefinitionSet(List defSet);
+ List getDefinitionSet(List defSet);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGFilterConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGFilterConverter.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGFilterConverter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGFilterConverter.java Wed Nov 22 06:50:50 2006
@@ -43,7 +43,7 @@
* the input filter
* @see org.apache.batik.svggen.SVGFilterDescriptor
*/
- public SVGFilterDescriptor toSVG(BufferedImageOp filter, Rectangle filterRect);
+ SVGFilterDescriptor toSVG(BufferedImageOp filter, Rectangle filterRect);
/**
* @return set of definitions referenced by the attribute
@@ -52,5 +52,5 @@
* If no definition is needed, an empty set should be
* returned.
*/
- public List getDefinitionSet();
+ List getDefinitionSet();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGeneratorContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGeneratorContext.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGeneratorContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGeneratorContext.java Wed Nov 22 06:50:50 2006
@@ -64,7 +64,7 @@
ImageHandler imageHandler;
/**
- * Generic image handler. This allows more sophisticated
+ * Generic image handler. This allows more sophisticated
* image handling strategies than the <tt>ImageHandler</tt>
* interfaces.
*/
@@ -119,7 +119,7 @@
/**
* Class to describe the GraphicContext defaults to
* be used. Note that this class does *not* contain
- * a default for the initial transform, as this
+ * a default for the initial transform, as this
* transform *has to be identity* for the SVGGraphics2D
* to operate (the TransformStacks operation is based
* on that assumption. See the DOMTreeManager class).
@@ -131,7 +131,7 @@
protected Shape clip;
protected RenderingHints hints;
protected Font font;
- protected Color background;
+ protected Color background;
public void setStroke(Stroke stroke){
this.stroke = stroke;
@@ -227,10 +227,10 @@
}
/**
- * Returns the set of defaults which should be used for the
+ * Returns the set of defaults which should be used for the
* GraphicContext.
*/
- final public GraphicContextDefaults getGraphicContextDefaults(){
+ public final GraphicContextDefaults getGraphicContextDefaults(){
return gcDefaults;
}
@@ -239,7 +239,7 @@
* Note that gcDefaults may be null and that any of its attributes
* may be null.
*/
- final public void setGraphicContextDefaults(GraphicContextDefaults gcDefaults){
+ public final void setGraphicContextDefaults(GraphicContextDefaults gcDefaults){
this.gcDefaults = gcDefaults;
}
@@ -247,7 +247,7 @@
* Returns the {@link org.apache.batik.svggen.SVGIDGenerator} that
* has been set.
*/
- final public SVGIDGenerator getIDGenerator() {
+ public final SVGIDGenerator getIDGenerator() {
return idGenerator;
}
@@ -255,7 +255,7 @@
* Sets the {@link org.apache.batik.svggen.SVGIDGenerator}
* to be used. It should not be <code>null</code>.
*/
- final public void setIDGenerator(SVGIDGenerator idGenerator) {
+ public final void setIDGenerator(SVGIDGenerator idGenerator) {
if (idGenerator == null)
throw new SVGGraphics2DRuntimeException(ERR_ID_GENERATOR_NULL);
this.idGenerator = idGenerator;
@@ -265,7 +265,7 @@
* Returns the DOM Factory that
* has been set.
*/
- final public Document getDOMFactory() {
+ public final Document getDOMFactory() {
return domFactory;
}
@@ -273,7 +273,7 @@
* Sets the DOM Factory
* to be used. It should not be <code>null</code>.
*/
- final public void setDOMFactory(Document domFactory) {
+ public final void setDOMFactory(Document domFactory) {
if (domFactory == null)
throw new SVGGraphics2DRuntimeException(ERR_DOM_FACTORY_NULL);
this.domFactory = domFactory;
@@ -283,7 +283,7 @@
* Returns the {@link org.apache.batik.svggen.ExtensionHandler} that
* has been set.
*/
- final public ExtensionHandler getExtensionHandler() {
+ public final ExtensionHandler getExtensionHandler() {
return extensionHandler;
}
@@ -291,7 +291,7 @@
* Sets the {@link org.apache.batik.svggen.ExtensionHandler}
* to be used. It should not be <code>null</code>.
*/
- final public void setExtensionHandler(ExtensionHandler extensionHandler) {
+ public final void setExtensionHandler(ExtensionHandler extensionHandler) {
if (extensionHandler == null)
throw new SVGGraphics2DRuntimeException(ERR_EXTENSION_HANDLER_NULL);
this.extensionHandler = extensionHandler;
@@ -301,7 +301,7 @@
* Returns the {@link org.apache.batik.svggen.ImageHandler} that
* has been set.
*/
- final public ImageHandler getImageHandler() {
+ public final ImageHandler getImageHandler() {
return imageHandler;
}
@@ -309,7 +309,7 @@
* Sets the {@link org.apache.batik.svggen.ImageHandler}
* to be used. It should not be <code>null</code>.
*/
- final public void setImageHandler(ImageHandler imageHandler) {
+ public final void setImageHandler(ImageHandler imageHandler) {
if (imageHandler == null)
throw new SVGGraphics2DRuntimeException(ERR_IMAGE_HANDLER_NULL);
this.imageHandler = imageHandler;
@@ -318,9 +318,9 @@
/**
* Sets the {@link org.apache.batik.svggen.GenericImageHandler}
- * to be used.
+ * to be used.
*/
- final public void setGenericImageHandler(GenericImageHandler genericImageHandler){
+ public final void setGenericImageHandler(GenericImageHandler genericImageHandler){
if (genericImageHandler == null){
throw new SVGGraphics2DRuntimeException(ERR_IMAGE_HANDLER_NULL);
}
@@ -332,7 +332,7 @@
* Returns the {@link org.apache.batik.svggen.StyleHandler} that
* has been set.
*/
- final public StyleHandler getStyleHandler() {
+ public final StyleHandler getStyleHandler() {
return styleHandler;
}
@@ -340,7 +340,7 @@
* Sets the {@link org.apache.batik.svggen.StyleHandler}
* to be used. It should not be <code>null</code>.
*/
- final public void setStyleHandler(StyleHandler styleHandler) {
+ public final void setStyleHandler(StyleHandler styleHandler) {
if (styleHandler == null)
throw new SVGGraphics2DRuntimeException(ERR_STYLE_HANDLER_NULL);
this.styleHandler = styleHandler;
@@ -349,7 +349,7 @@
/**
* Returns the comment to be generated in the SVG file.
*/
- final public String getComment() {
+ public final String getComment() {
return generatorComment;
}
@@ -357,7 +357,7 @@
* Sets the comment to be used. It can be <code>null</code> if you
* want to disable it.
*/
- final public void setComment(String generatorComment) {
+ public final void setComment(String generatorComment) {
this.generatorComment = generatorComment;
}
@@ -365,7 +365,7 @@
* Returns the {@link org.apache.batik.svggen.ErrorHandler} that
* has been set.
*/
- final public ErrorHandler getErrorHandler() {
+ public final ErrorHandler getErrorHandler() {
return errorHandler;
}
@@ -373,7 +373,7 @@
* Sets the {@link org.apache.batik.svggen.ErrorHandler}
* to be used. It should not be <code>null</code>.
*/
- final public void setErrorHandler(ErrorHandler errorHandler) {
+ public final void setErrorHandler(ErrorHandler errorHandler) {
if (errorHandler == null)
throw new SVGGraphics2DRuntimeException(ERR_ERROR_HANDLER_NULL);
this.errorHandler = errorHandler;
@@ -383,7 +383,7 @@
* Returns <code>true</code> if we should generate SVG Fonts for
* texts.
*/
- final public boolean isEmbeddedFontsOn() {
+ public final boolean isEmbeddedFontsOn() {
return svgFont;
}
@@ -391,14 +391,14 @@
* Sets if we should generate SVG Fonts for texts. Default value
* is <code>false</code>.
*/
- final public void setEmbeddedFontsOn(boolean svgFont) {
+ public final void setEmbeddedFontsOn(boolean svgFont) {
this.svgFont = svgFont;
}
/**
* Returns the current precision used by this context
*/
- final public int getPrecision() {
+ public final int getPrecision() {
return precision;
}
@@ -408,7 +408,7 @@
* output by the SVGGraphics2D generator.
* Note that the precision is clipped to the [0,12] range.
*/
- final public void setPrecision(int precision) {
+ public final void setPrecision(int precision) {
if (precision < 0) {
this.precision = 0;
} else if (precision > 12) {
@@ -420,10 +420,10 @@
}
/**
- * Converts the input double value to a string with a number of
+ * Converts the input double value to a string with a number of
* decimal places controlled by the precision attribute.
*/
- final public String doubleString(double value) {
+ public final String doubleString(double value) {
double absvalue = Math.abs(value);
// above 10e7 we do not output decimals as anyway
// in scientific notation they were not available
@@ -433,13 +433,13 @@
// under 10e-3 we have to put decimals
else {
return decimalFormat.format(value);
- }
+ }
}
- protected static DecimalFormatSymbols dsf
+ protected static DecimalFormatSymbols dsf
= new DecimalFormatSymbols(Locale.US);
- protected static DecimalFormat decimalFormats[] = new DecimalFormat[13];
+ protected static DecimalFormat[] decimalFormats = new DecimalFormat[13];
static {
decimalFormats[0] = new DecimalFormat("#", dsf);
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContext.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContext.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContext.java Wed Nov 22 06:50:50 2006
@@ -34,13 +34,13 @@
public class SVGGraphicContext implements SVGConstants, ErrorConstants {
// this properties can only be set of leaf nodes =>
// if they have default values they can be ignored
- private static final String leafOnlyAttributes[] = {
+ private static final String[] leafOnlyAttributes = {
SVG_OPACITY_ATTRIBUTE,
SVG_FILTER_ATTRIBUTE,
SVG_CLIP_PATH_ATTRIBUTE
};
- private static final String defaultValues[] = {
+ private static final String[] defaultValues = {
"1",
SVG_NONE_VALUE,
SVG_NONE_VALUE
@@ -49,7 +49,7 @@
private Map context;
private Map groupContext;
private Map graphicElementContext;
- private TransformStackElement transformStack[];
+ private TransformStackElement[] transformStack;
/**
* @param context Set of style attributes in this context.
@@ -57,7 +57,7 @@
* applied to create the context's current transform.
*/
public SVGGraphicContext(Map context,
- TransformStackElement transformStack[]) {
+ TransformStackElement[] transformStack) {
if (context == null)
throw new SVGGraphics2DRuntimeException(ERR_MAP_NULL);
if (transformStack == null)
@@ -75,7 +75,7 @@
* applied to create the context's current transform.
*/
public SVGGraphicContext(Map groupContext, Map graphicElementContext,
- TransformStackElement transformStack[]) {
+ TransformStackElement[] transformStack) {
if (groupContext == null || graphicElementContext == null)
throw new SVGGraphics2DRuntimeException(ERR_MAP_NULL);
if (transformStack == null)
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGGraphicContextConverter.java Wed Nov 22 06:50:50 2006
@@ -45,7 +45,7 @@
private SVGClip clipConverter;
private SVGRenderingHints hintsConverter;
private SVGFont fontConverter;
- private SVGConverter converters[] =
+ private SVGConverter[] converters =
new SVGConverter[GRAPHIC_CONTEXT_CONVERTER_COUNT];
public SVGTransform getTransformConverter() { return transformConverter; }
@@ -85,7 +85,7 @@
* @return a String containing the transform attribute value
* equivalent of the input transform stack.
*/
- public String toSVG(TransformStackElement transformStack[]) {
+ public String toSVG(TransformStackElement[] transformStack) {
return transformConverter.toSVGTransform(transformStack);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGTransform.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGTransform.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGTransform.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SVGTransform.java Wed Nov 22 06:50:50 2006
@@ -187,7 +187,7 @@
*/
final String convertTransform(TransformStackElement transformElement){
StringBuffer transformString = new StringBuffer();
- double transformParameters[] = transformElement.getTransformParameters();
+ double[] transformParameters = transformElement.getTransformParameters();
switch(transformElement.getType().toInt()){
case TransformType.TRANSFORM_TRANSLATE:
if(!transformElement.isIdentity()) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/StyleHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/StyleHandler.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/StyleHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/StyleHandler.java Wed Nov 22 06:50:50 2006
@@ -37,6 +37,6 @@
* @param styleMap the <code>Map</code> containing pairs of style
* property names, style values.
*/
- public void setStyle(Element element, Map styleMap,
+ void setStyle(Element element, Map styleMap,
SVGGeneratorContext generatorContext);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/SwingSVGPrettyPrint.java Wed Nov 22 06:50:50 2006
@@ -161,16 +161,14 @@
private static void paintChildren(JComponent cmp, SVGGraphics2D svgGen){
int i = cmp.getComponentCount() - 1;
- boolean isJComponent = false;
Rectangle tmpRect = new Rectangle();
for(; i>=0; i--){
Component comp = cmp.getComponent(i);
- if(comp != null && JComponent.isLightweightComponent(comp) &&
- (comp.isVisible() == true)) {
+ if( comp != null && JComponent.isLightweightComponent(comp) && comp.isVisible() ) {
Rectangle cr = null;
- isJComponent = (comp instanceof JComponent);
+ boolean isJComponent = (comp instanceof JComponent);
if(isJComponent) {
cr = tmpRect;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java Wed Nov 22 06:50:50 2006
@@ -46,14 +46,14 @@
*/
class XmlWriter implements SVGConstants {
- static private String EOL;
- static private final String TAG_END = "/>";
- static private final String TAG_START = "</";
+ private static String EOL;
+ private static final String TAG_END = "/>";
+ private static final String TAG_START = "</";
- static private final char[] SPACES =
+ private static final char[] SPACES =
{ ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ' };
- static private final int SPACES_LEN = SPACES.length;
+ private static final int SPACES_LEN = SPACES.length;
static {
String temp;
@@ -109,12 +109,12 @@
proxied.write(c);
}
- public void write(char cbuf[]) throws IOException {
+ public void write(char[] cbuf) throws IOException {
column+=cbuf.length;
proxied.write(cbuf);
}
- public void write(char cbuf[], int off, int len) throws IOException{
+ public void write(char[] cbuf, int off, int len) throws IOException{
column+=len;
proxied.write(cbuf, off, len);
}
@@ -139,8 +139,8 @@
}
}
- private static void writeXml(Attr attr, IndentWriter out,
- boolean escaped)
+ private static void writeXml(Attr attr, IndentWriter out,
+ boolean escaped)
throws IOException{
String name = attr.getName();
out.write (name);
@@ -152,10 +152,10 @@
/**
* Writes the attribute's value.
*/
- private static void writeChildrenXml(Attr attr, IndentWriter out,
+ private static void writeChildrenXml(Attr attr, IndentWriter out,
boolean escaped)
throws IOException {
- char data[] = attr.getValue().toCharArray();
+ char[] data = attr.getValue().toCharArray();
if (data == null) return;
int length = data.length;
@@ -166,31 +166,31 @@
case '<':
out.write (data, start, last - start);
start = last + 1;
- out.write ("<");
+ out.write ("<");
break;
- case '>':
+ case '>':
out.write (data, start, last - start);
start = last + 1;
- out.write (">");
+ out.write (">");
break;
- case '&':
+ case '&':
out.write (data, start, last - start);
start = last + 1;
- out.write ("&");
+ out.write ("&");
break;
- case '\'':
+ case '\'':
out.write (data, start, last - start);
start = last + 1;
- out.write ("'");
+ out.write ("'");
break;
- case '"':
+ case '"':
out.write (data, start, last - start);
start = last + 1;
- out.write (""");
+ out.write (""");
break;
default: // to be able to escape characters if allowed
if (escaped && (c > 0x007F)) {
- out.write (data, start, last - start);
+ out.write (data, start, last - start);
String hex = "0000"+Integer.toHexString(c);
out.write("&#x"+hex.substring(hex.length()-4)+";");
start = last + 1;
@@ -207,11 +207,11 @@
* prevent illegal comments: between consecutive dashes ("--")
* or if the last character of the comment is a dash.
*/
- private static void writeXml(Comment comment, IndentWriter out,
+ private static void writeXml(Comment comment, IndentWriter out,
boolean escaped)
throws IOException {
- char data[] = comment.getData().toCharArray();
+ char[] data = comment.getData().toCharArray();
if (data == null) {
out.write("<!---->");
@@ -222,7 +222,7 @@
boolean sawDash = false;
int length = data.length;
int start=0, last=0;
-
+
// "--" illegal in comments, insert a space.
while (last < length) {
char c = data[last];
@@ -249,10 +249,10 @@
writeXml(text, out, false, escaped);
}
- private static void writeXml(Text text, IndentWriter out, boolean trimWS,
+ private static void writeXml(Text text, IndentWriter out, boolean trimWS,
boolean escaped)
throws IOException {
- char data[] = text.getData().toCharArray();
+ char[] data = text.getData().toCharArray();
// XXX saw this once -- being paranoid
if (data == null)
@@ -271,7 +271,7 @@
}
start = last;
}
-
+
while (last < length) {
char c = data [last];
@@ -289,7 +289,7 @@
int wsStart = last; last++;
while (last < length) {
switch(data[last]) {
- case ' ': case '\t': case '\n': case '\r':
+ case ' ': case '\t': case '\n': case '\r':
last++; continue;
default: break;
}
@@ -332,7 +332,7 @@
out.write (data, start, last - start);
}
- private static void writeXml(CDATASection cdataSection, IndentWriter out,
+ private static void writeXml(CDATASection cdataSection, IndentWriter out,
boolean escaped)
throws IOException {
char[] data = cdataSection.getData().toCharArray();
@@ -350,7 +350,7 @@
// embedded "]]>" needs to be split into adjacent
// CDATA blocks ... can be split at either point
if (c == ']') {
- if (((last + 2) < data.length) &&
+ if (((last + 2) < data.length) &&
(data [last + 1] == ']') &&
(data [last + 2] == '>')) {
out.write (data, start, last - start);
@@ -365,7 +365,7 @@
out.write ("]]>");
}
- private static void writeXml(Element element, IndentWriter out,
+ private static void writeXml(Element element, IndentWriter out,
boolean escaped)
throws IOException, SVGGraphics2DIOException {
out.write (TAG_START, 0, 1); // "<"
@@ -389,12 +389,12 @@
// XML allows "<EMPTY/>" too, of course.
//
if (!element.hasChildNodes()) {
- if (lastElem)
+ if (lastElem)
out.setIndentLevel(out.getIndentLevel()-2);
out.printIndent ();
out.write(TAG_END, 0, 2); // "/>"
return;
- }
+ }
Node child = element.getFirstChild();
out.printIndent ();
out.write(TAG_END, 1, 1); // ">"
@@ -407,13 +407,13 @@
out.write (TAG_START, 0, 2); // "</"
out.write (element.getTagName());
- if (lastElem)
+ if (lastElem)
out.setIndentLevel(out.getIndentLevel()-2);
out.printIndent ();
out.write (TAG_END, 1, 1); // ">"
}
- private static void writeChildrenXml(Element element, IndentWriter out,
+ private static void writeChildrenXml(Element element, IndentWriter out,
boolean escaped)
throws IOException, SVGGraphics2DIOException {
Node child = element.getFirstChild();
@@ -444,14 +444,14 @@
// Write DOCTYPE declaration here. Skip until specification is released.
out.write ("<!DOCTYPE svg PUBLIC '");
out.write (SVG_PUBLIC_ID);
- out.write ("'"); out.write (EOL);
+ out.write ("'"); out.write (EOL);
out.write (" '");
out.write (SVG_SYSTEM_ID);
out.write ("'"); out.write (">"); out.write (EOL);
}
- private static void writeXml(Document document, IndentWriter out,
+ private static void writeXml(Document document, IndentWriter out,
boolean escaped)
throws IOException, SVGGraphics2DIOException {
writeDocumentHeader(out);
@@ -459,7 +459,7 @@
writeXml(childList, out, escaped);
}
- private static void writeXml(NodeList childList, IndentWriter out,
+ private static void writeXml(NodeList childList, IndentWriter out,
boolean escaped)
throws IOException, SVGGraphics2DIOException {
int length = childList.getLength ();
@@ -512,7 +512,7 @@
return "ISO-2022-JP";
if ("EUCJIS".equalsIgnoreCase (encodingName))
return "EUC-JP";
-
+
// else we force UTF-8 encoding, better than nothing...
return "UTF-8";
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/Messages.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/Messages.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/Messages.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/Messages.java Wed Nov 22 06:50:50 2006
@@ -39,7 +39,7 @@
/**
* The error messages bundle class name.
*/
- protected final static String RESOURCES =
+ protected static final String RESOURCES =
"org.apache.batik.svggen.font.resources.Messages";
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/SVGFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/SVGFont.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/SVGFont.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/SVGFont.java Wed Nov 22 06:50:50 2006
@@ -64,12 +64,12 @@
EOL = temp;
}
- static private String QUOT_EOL = XML_CHAR_QUOT + EOL;
+ private static String QUOT_EOL = XML_CHAR_QUOT + EOL;
/**
* Defines the application arguments.
*/
- static private String CONFIG_USAGE =
+ private static String CONFIG_USAGE =
"SVGFont.config.usage";
/**
@@ -77,21 +77,21 @@
* {0} SVG public ID
* {1} SVG system ID
*/
- static private String CONFIG_SVG_BEGIN =
+ private static String CONFIG_SVG_BEGIN =
"SVGFont.config.svg.begin";
/**
* Defines the SVG start fragment that exercise the generated
* Font.
*/
- static private String CONFIG_SVG_TEST_CARD_START =
+ private static String CONFIG_SVG_TEST_CARD_START =
"SVGFont.config.svg.test.card.start";
/**
* Defines the end of the SVG fragment that exercise the generated
* Font.
*/
- static private String CONFIG_SVG_TEST_CARD_END =
+ private static String CONFIG_SVG_TEST_CARD_END =
"SVGFont.config.svg.test.card.end";
protected static String encodeEntities(String s) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/GlyphDescription.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/GlyphDescription.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/GlyphDescription.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/GlyphDescription.java Wed Nov 22 06:50:50 2006
@@ -24,17 +24,17 @@
* @author <a href="mailto:david@steadystate.co.uk">David Schweinsberg</a>
*/
public interface GlyphDescription {
- public int getEndPtOfContours(int i);
- public byte getFlags(int i);
- public short getXCoordinate(int i);
- public short getYCoordinate(int i);
- public short getXMaximum();
- public short getXMinimum();
- public short getYMaximum();
- public short getYMinimum();
- public boolean isComposite();
- public int getPointCount();
- public int getContourCount();
+ int getEndPtOfContours(int i);
+ byte getFlags(int i);
+ short getXCoordinate(int i);
+ short getYCoordinate(int i);
+ short getXMaximum();
+ short getXMinimum();
+ short getYMaximum();
+ short getYMinimum();
+ boolean isComposite();
+ int getPointCount();
+ int getContourCount();
// public int getComponentIndex(int c);
// public int getComponentCount();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/LookupSubtableFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/LookupSubtableFactory.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/LookupSubtableFactory.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/LookupSubtableFactory.java Wed Nov 22 06:50:50 2006
@@ -15,18 +15,18 @@
See the License for the specific language governing permissions and
limitations under the License.
- */
+ */
package org.apache.batik.svggen.font.table;
import java.io.IOException;
import java.io.RandomAccessFile;
-/**
+/**
*
* @author <a href="mailto:david@steadystate.co.uk">David Schweinsberg</a>
* @version $Id$
*/
public interface LookupSubtableFactory {
- public LookupSubtable read(int type, RandomAccessFile raf, int offset)
+ LookupSubtable read(int type, RandomAccessFile raf, int offset)
throws IOException;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/Table.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/Table.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/font/table/Table.java Wed Nov 22 06:50:50 2006
@@ -25,181 +25,181 @@
public interface Table {
// Table constants
- public static final int BASE = 0x42415345; // Baseline data [OpenType]
- public static final int CFF = 0x43464620; // PostScript font program (compact font format) [PostScript]
- public static final int DSIG = 0x44534947; // Digital signature
- public static final int EBDT = 0x45424454; // Embedded bitmap data
- public static final int EBLC = 0x45424c43; // Embedded bitmap location data
- public static final int EBSC = 0x45425343; // Embedded bitmap scaling data
- public static final int GDEF = 0x47444546; // Glyph definition data [OpenType]
- public static final int GPOS = 0x47504f53; // Glyph positioning data [OpenType]
- public static final int GSUB = 0x47535542; // Glyph substitution data [OpenType]
- public static final int JSTF = 0x4a535446; // Justification data [OpenType]
- public static final int LTSH = 0x4c545348; // Linear threshold table
- public static final int MMFX = 0x4d4d4658; // Multiple master font metrics [PostScript]
- public static final int MMSD = 0x4d4d5344; // Multiple master supplementary data [PostScript]
- public static final int OS_2 = 0x4f532f32; // OS/2 and Windows specific metrics [r]
- public static final int PCLT = 0x50434c54; // PCL5
- public static final int VDMX = 0x56444d58; // Vertical Device Metrics table
- public static final int cmap = 0x636d6170; // character to glyph mapping [r]
- public static final int cvt = 0x63767420; // Control Value Table
- public static final int fpgm = 0x6670676d; // font program
- public static final int fvar = 0x66766172; // Apple's font variations table [PostScript]
- public static final int gasp = 0x67617370; // grid-fitting and scan conversion procedure (grayscale)
- public static final int glyf = 0x676c7966; // glyph data [r]
- public static final int hdmx = 0x68646d78; // horizontal device metrics
- public static final int head = 0x68656164; // font header [r]
- public static final int hhea = 0x68686561; // horizontal header [r]
- public static final int hmtx = 0x686d7478; // horizontal metrics [r]
- public static final int kern = 0x6b65726e; // kerning
- public static final int loca = 0x6c6f6361; // index to location [r]
- public static final int maxp = 0x6d617870; // maximum profile [r]
- public static final int name = 0x6e616d65; // naming table [r]
- public static final int prep = 0x70726570; // CVT Program
- public static final int post = 0x706f7374; // PostScript information [r]
- public static final int vhea = 0x76686561; // Vertical Metrics header
- public static final int vmtx = 0x766d7478; // Vertical Metrics
+ int BASE = 0x42415345; // Baseline data [OpenType]
+ int CFF = 0x43464620; // PostScript font program (compact font format) [PostScript]
+ int DSIG = 0x44534947; // Digital signature
+ int EBDT = 0x45424454; // Embedded bitmap data
+ int EBLC = 0x45424c43; // Embedded bitmap location data
+ int EBSC = 0x45425343; // Embedded bitmap scaling data
+ int GDEF = 0x47444546; // Glyph definition data [OpenType]
+ int GPOS = 0x47504f53; // Glyph positioning data [OpenType]
+ int GSUB = 0x47535542; // Glyph substitution data [OpenType]
+ int JSTF = 0x4a535446; // Justification data [OpenType]
+ int LTSH = 0x4c545348; // Linear threshold table
+ int MMFX = 0x4d4d4658; // Multiple master font metrics [PostScript]
+ int MMSD = 0x4d4d5344; // Multiple master supplementary data [PostScript]
+ int OS_2 = 0x4f532f32; // OS/2 and Windows specific metrics [r]
+ int PCLT = 0x50434c54; // PCL5
+ int VDMX = 0x56444d58; // Vertical Device Metrics table
+ int cmap = 0x636d6170; // character to glyph mapping [r]
+ int cvt = 0x63767420; // Control Value Table
+ int fpgm = 0x6670676d; // font program
+ int fvar = 0x66766172; // Apple's font variations table [PostScript]
+ int gasp = 0x67617370; // grid-fitting and scan conversion procedure (grayscale)
+ int glyf = 0x676c7966; // glyph data [r]
+ int hdmx = 0x68646d78; // horizontal device metrics
+ int head = 0x68656164; // font header [r]
+ int hhea = 0x68686561; // horizontal header [r]
+ int hmtx = 0x686d7478; // horizontal metrics [r]
+ int kern = 0x6b65726e; // kerning
+ int loca = 0x6c6f6361; // index to location [r]
+ int maxp = 0x6d617870; // maximum profile [r]
+ int name = 0x6e616d65; // naming table [r]
+ int prep = 0x70726570; // CVT Program
+ int post = 0x706f7374; // PostScript information [r]
+ int vhea = 0x76686561; // Vertical Metrics header
+ int vmtx = 0x766d7478; // Vertical Metrics
// Platform IDs
- public static final short platformAppleUnicode = 0;
- public static final short platformMacintosh = 1;
- public static final short platformISO = 2;
- public static final short platformMicrosoft = 3;
+ short platformAppleUnicode = 0;
+ short platformMacintosh = 1;
+ short platformISO = 2;
+ short platformMicrosoft = 3;
// Microsoft Encoding IDs
- public static final short encodingUndefined = 0;
- public static final short encodingUGL = 1;
+ short encodingUndefined = 0;
+ short encodingUGL = 1;
// Macintosh Encoding IDs
- public static final short encodingRoman = 0;
- public static final short encodingJapanese = 1;
- public static final short encodingChinese = 2;
- public static final short encodingKorean = 3;
- public static final short encodingArabic = 4;
- public static final short encodingHebrew = 5;
- public static final short encodingGreek = 6;
- public static final short encodingRussian = 7;
- public static final short encodingRSymbol = 8;
- public static final short encodingDevanagari = 9;
- public static final short encodingGurmukhi = 10;
- public static final short encodingGujarati = 11;
- public static final short encodingOriya = 12;
- public static final short encodingBengali = 13;
- public static final short encodingTamil = 14;
- public static final short encodingTelugu = 15;
- public static final short encodingKannada = 16;
- public static final short encodingMalayalam = 17;
- public static final short encodingSinhalese = 18;
- public static final short encodingBurmese = 19;
- public static final short encodingKhmer = 20;
- public static final short encodingThai = 21;
- public static final short encodingLaotian = 22;
- public static final short encodingGeorgian = 23;
- public static final short encodingArmenian = 24;
- public static final short encodingMaldivian = 25;
- public static final short encodingTibetan = 26;
- public static final short encodingMongolian = 27;
- public static final short encodingGeez = 28;
- public static final short encodingSlavic = 29;
- public static final short encodingVietnamese = 30;
- public static final short encodingSindhi = 31;
- public static final short encodingUninterp = 32;
+ short encodingRoman = 0;
+ short encodingJapanese = 1;
+ short encodingChinese = 2;
+ short encodingKorean = 3;
+ short encodingArabic = 4;
+ short encodingHebrew = 5;
+ short encodingGreek = 6;
+ short encodingRussian = 7;
+ short encodingRSymbol = 8;
+ short encodingDevanagari = 9;
+ short encodingGurmukhi = 10;
+ short encodingGujarati = 11;
+ short encodingOriya = 12;
+ short encodingBengali = 13;
+ short encodingTamil = 14;
+ short encodingTelugu = 15;
+ short encodingKannada = 16;
+ short encodingMalayalam = 17;
+ short encodingSinhalese = 18;
+ short encodingBurmese = 19;
+ short encodingKhmer = 20;
+ short encodingThai = 21;
+ short encodingLaotian = 22;
+ short encodingGeorgian = 23;
+ short encodingArmenian = 24;
+ short encodingMaldivian = 25;
+ short encodingTibetan = 26;
+ short encodingMongolian = 27;
+ short encodingGeez = 28;
+ short encodingSlavic = 29;
+ short encodingVietnamese = 30;
+ short encodingSindhi = 31;
+ short encodingUninterp = 32;
// ISO Encoding IDs
- public static final short encodingASCII = 0;
- public static final short encodingISO10646 = 1;
- public static final short encodingISO8859_1 = 2;
+ short encodingASCII = 0;
+ short encodingISO10646 = 1;
+ short encodingISO8859_1 = 2;
// Microsoft Language IDs
- public static final short languageSQI = 0x041c;
- public static final short languageEUQ = 0x042d;
- public static final short languageBEL = 0x0423;
- public static final short languageBGR = 0x0402;
- public static final short languageCAT = 0x0403;
- public static final short languageSHL = 0x041a;
- public static final short languageCSY = 0x0405;
- public static final short languageDAN = 0x0406;
- public static final short languageNLD = 0x0413;
- public static final short languageNLB = 0x0813;
- public static final short languageENU = 0x0409;
- public static final short languageENG = 0x0809;
- public static final short languageENA = 0x0c09;
- public static final short languageENC = 0x1009;
- public static final short languageENZ = 0x1409;
- public static final short languageENI = 0x1809;
- public static final short languageETI = 0x0425;
- public static final short languageFIN = 0x040b;
- public static final short languageFRA = 0x040c;
- public static final short languageFRB = 0x080c;
- public static final short languageFRC = 0x0c0c;
- public static final short languageFRS = 0x100c;
- public static final short languageFRL = 0x140c;
- public static final short languageDEU = 0x0407;
- public static final short languageDES = 0x0807;
- public static final short languageDEA = 0x0c07;
- public static final short languageDEL = 0x1007;
- public static final short languageDEC = 0x1407;
- public static final short languageELL = 0x0408;
- public static final short languageHUN = 0x040e;
- public static final short languageISL = 0x040f;
- public static final short languageITA = 0x0410;
- public static final short languageITS = 0x0810;
- public static final short languageLVI = 0x0426;
- public static final short languageLTH = 0x0427;
- public static final short languageNOR = 0x0414;
- public static final short languageNON = 0x0814;
- public static final short languagePLK = 0x0415;
- public static final short languagePTB = 0x0416;
- public static final short languagePTG = 0x0816;
- public static final short languageROM = 0x0418;
- public static final short languageRUS = 0x0419;
- public static final short languageSKY = 0x041b;
- public static final short languageSLV = 0x0424;
- public static final short languageESP = 0x040a;
- public static final short languageESM = 0x080a;
- public static final short languageESN = 0x0c0a;
- public static final short languageSVE = 0x041d;
- public static final short languageTRK = 0x041f;
- public static final short languageUKR = 0x0422;
+ short languageSQI = 0x041c;
+ short languageEUQ = 0x042d;
+ short languageBEL = 0x0423;
+ short languageBGR = 0x0402;
+ short languageCAT = 0x0403;
+ short languageSHL = 0x041a;
+ short languageCSY = 0x0405;
+ short languageDAN = 0x0406;
+ short languageNLD = 0x0413;
+ short languageNLB = 0x0813;
+ short languageENU = 0x0409;
+ short languageENG = 0x0809;
+ short languageENA = 0x0c09;
+ short languageENC = 0x1009;
+ short languageENZ = 0x1409;
+ short languageENI = 0x1809;
+ short languageETI = 0x0425;
+ short languageFIN = 0x040b;
+ short languageFRA = 0x040c;
+ short languageFRB = 0x080c;
+ short languageFRC = 0x0c0c;
+ short languageFRS = 0x100c;
+ short languageFRL = 0x140c;
+ short languageDEU = 0x0407;
+ short languageDES = 0x0807;
+ short languageDEA = 0x0c07;
+ short languageDEL = 0x1007;
+ short languageDEC = 0x1407;
+ short languageELL = 0x0408;
+ short languageHUN = 0x040e;
+ short languageISL = 0x040f;
+ short languageITA = 0x0410;
+ short languageITS = 0x0810;
+ short languageLVI = 0x0426;
+ short languageLTH = 0x0427;
+ short languageNOR = 0x0414;
+ short languageNON = 0x0814;
+ short languagePLK = 0x0415;
+ short languagePTB = 0x0416;
+ short languagePTG = 0x0816;
+ short languageROM = 0x0418;
+ short languageRUS = 0x0419;
+ short languageSKY = 0x041b;
+ short languageSLV = 0x0424;
+ short languageESP = 0x040a;
+ short languageESM = 0x080a;
+ short languageESN = 0x0c0a;
+ short languageSVE = 0x041d;
+ short languageTRK = 0x041f;
+ short languageUKR = 0x0422;
// Macintosh Language IDs
- public static final short languageEnglish = 0;
- public static final short languageFrench = 1;
- public static final short languageGerman = 2;
- public static final short languageItalian = 3;
- public static final short languageDutch = 4;
- public static final short languageSwedish = 5;
- public static final short languageSpanish = 6;
- public static final short languageDanish = 7;
- public static final short languagePortuguese = 8;
- public static final short languageNorwegian = 9;
- public static final short languageHebrew = 10;
- public static final short languageJapanese = 11;
- public static final short languageArabic = 12;
- public static final short languageFinnish = 13;
- public static final short languageGreek = 14;
- public static final short languageIcelandic = 15;
- public static final short languageMaltese = 16;
- public static final short languageTurkish = 17;
- public static final short languageYugoslavian = 18;
- public static final short languageChinese = 19;
- public static final short languageUrdu = 20;
- public static final short languageHindi = 21;
- public static final short languageThai = 22;
+ short languageEnglish = 0;
+ short languageFrench = 1;
+ short languageGerman = 2;
+ short languageItalian = 3;
+ short languageDutch = 4;
+ short languageSwedish = 5;
+ short languageSpanish = 6;
+ short languageDanish = 7;
+ short languagePortuguese = 8;
+ short languageNorwegian = 9;
+ short languageHebrew = 10;
+ short languageJapanese = 11;
+ short languageArabic = 12;
+ short languageFinnish = 13;
+ short languageGreek = 14;
+ short languageIcelandic = 15;
+ short languageMaltese = 16;
+ short languageTurkish = 17;
+ short languageYugoslavian = 18;
+ short languageChinese = 19;
+ short languageUrdu = 20;
+ short languageHindi = 21;
+ short languageThai = 22;
// Name IDs
- public static final short nameCopyrightNotice = 0;
- public static final short nameFontFamilyName = 1;
- public static final short nameFontSubfamilyName = 2;
- public static final short nameUniqueFontIdentifier = 3;
- public static final short nameFullFontName = 4;
- public static final short nameVersionString = 5;
- public static final short namePostscriptName = 6;
- public static final short nameTrademark = 7;
+ short nameCopyrightNotice = 0;
+ short nameFontFamilyName = 1;
+ short nameFontSubfamilyName = 2;
+ short nameUniqueFontIdentifier = 3;
+ short nameFullFontName = 4;
+ short nameVersionString = 5;
+ short namePostscriptName = 6;
+ short nameTrademark = 7;
/**
* Get the table type, as a table directory value.
* @return The table type
*/
- public int getType();
+ int getType();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java Wed Nov 22 06:50:50 2006
@@ -194,7 +194,7 @@
* This is used as the value in the toolTipDocs WeakHashMap.
* This way we can tell if a document has already been added.
*/
- protected final static Object MAP_TOKEN = new Object();
+ protected static final Object MAP_TOKEN = new Object();
/**
* The time of the last tool tip event.
*/
@@ -836,12 +836,12 @@
// Don't handle tool tips unless we are interactive.
if (!isInteractive()) return;
-
+
if (!SVGConstants.SVG_NAMESPACE_URI.equals(elt.getNamespaceURI()))
return;
// Don't handle tool tips for the root SVG element.
- if (elt.getParentNode() ==
+ if (elt.getParentNode() ==
elt.getOwnerDocument().getDocumentElement()) {
return;
}
@@ -855,13 +855,13 @@
Element descPeer = null;
Element titlePeer = null;
if (elt.getLocalName().equals(SVGConstants.SVG_TITLE_TAG)) {
- if (data == Boolean.TRUE)
+ if (data == Boolean.TRUE)
titlePeer = elt;
descPeer = getPeerWithTag(parent,
SVGConstants.SVG_NAMESPACE_URI,
SVGConstants.SVG_DESC_TAG);
} else if (elt.getLocalName().equals(SVGConstants.SVG_DESC_TAG)) {
- if (data == Boolean.TRUE)
+ if (data == Boolean.TRUE)
descPeer = elt;
titlePeer = getPeerWithTag(parent,
SVGConstants.SVG_NAMESPACE_URI,
@@ -977,7 +977,7 @@
String nameSpaceURI,
String localName) {
- Element p = (Element)parent;
+ Element p = parent;
if (p == null) {
return null;
}
@@ -1108,8 +1108,8 @@
protected int lastX, lastY;
- public LocationListener () {
- lastX = 0; lastY = 0;
+ public LocationListener () {
+ lastX = 0; lastY = 0;
}
public void mouseMoved(MouseEvent evt) {
@@ -1127,13 +1127,13 @@
}
/**
- * Sets a specific tooltip on the JSVGCanvas when a given event occurs.
- * This listener is used in the handleElement method to set, remove or
+ * Sets a specific tooltip on the JSVGCanvas when a given event occurs.
+ * This listener is used in the handleElement method to set, remove or
* modify the JSVGCanvas tooltip on mouseover and on mouseout.<br/>
*
* Because we are on a single <tt>JComponent</tt> we trigger an artificial
- * <tt>MouseEvent</tt> when the toolTip is set to a non-null value, so as
- * to make sure it will show after the <tt>ToolTipManager</tt>'s default
+ * <tt>MouseEvent</tt> when the toolTip is set to a non-null value, so as
+ * to make sure it will show after the <tt>ToolTipManager</tt>'s default
* delay.
*/
protected class ToolTipModifier implements EventListener {
@@ -1163,7 +1163,7 @@
// related target is one it is entering or null.
org.w3c.dom.events.MouseEvent mouseEvt;
mouseEvt = ((org.w3c.dom.events.MouseEvent)evt);
- lastTarget = mouseEvt.getRelatedTarget();
+ lastTarget = mouseEvt.getRelatedTarget();
}
if (toolTipMap != null) {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java?view=diff&rev=478176&r1=478175&r2=478176
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGScrollPane.java Wed Nov 22 06:50:50 2006
@@ -203,7 +203,7 @@
} // handleEvent()
}, false, null);
}// documentLoadingCompleted()
- };
+ }
/**
@@ -211,8 +211,7 @@
* releasing any cached data and recomputing
* scroll extents.
*/
- public void reset()
- {
+ public void reset() {
viewBox = null;
updateScrollbarState(false, false);
revalidate();