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 16:19:22 UTC
svn commit: r478188 [2/3] - in
/xmlgraphics/batik/trunk/sources/org/apache/batik: gvt/ gvt/event/
gvt/filter/ gvt/flow/ gvt/font/ gvt/renderer/ gvt/text/ i18n/ parser/
script/ script/jacl/ script/jpython/ script/rhino/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/Renderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/Renderer.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/Renderer.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/Renderer.java Wed Nov 22 07:19:17 2006
@@ -37,56 +37,56 @@
* Any previous tree association is forgotten.
* Not certain if this should be just GraphicsNode, or CanvasGraphicsNode.
*/
- public void setTree(GraphicsNode treeRoot);
+ void setTree(GraphicsNode treeRoot);
/**
* Returns the GVT tree associated with this renderer
*/
- public GraphicsNode getTree();
+ GraphicsNode getTree();
/**
* Repaints the associated GVT tree at least under <tt>area</tt>.
- *
+ *
* @param area the region to be repainted, in the current user
- * space coordinate system.
+ * space coordinate system.
*/
- public void repaint(Shape area);
+ void repaint(Shape area);
/**
* Repaints the associated GVT tree at least in areas under the
* list of <tt>areas</tt>.
- *
+ *
* @param areas a List of regions to be repainted, in the current
- * user space coordinate system.
+ * user space coordinate system.
*/
- public void repaint(RectListManager areas);
+ void repaint(RectListManager areas);
/**
* Sets the transform from the current user space (as defined by
* the top node of the GVT tree, to the associated device space.
*/
- public void setTransform(AffineTransform usr2dev);
+ void setTransform(AffineTransform usr2dev);
/**
* Returns a copy of the transform from the current user space (as
* defined by the top node of the GVT tree) to the device space (1
* unit = 1/72nd of an inch / 1 pixel, roughly speaking
*/
- public AffineTransform getTransform();
+ AffineTransform getTransform();
/**
* Returns true if the Renderer is currently doubleBuffering is
* rendering requests. If it is then getOffscreen will only
- * return completed renderings (or null if nothing is available).
+ * return completed renderings (or null if nothing is available).
*/
- public boolean isDoubleBuffered();
+ boolean isDoubleBuffered();
/**
* Turns on/off double buffering in renderer. Turning off
* double buffering makes it possible to see the ongoing results
* of a render operation.
*/
- public void setDoubleBuffered(boolean isDoubleBuffered);
+ void setDoubleBuffered(boolean isDoubleBuffered);
/**
* Cause the renderer to ask to be removed from external reference
@@ -94,7 +94,7 @@
* in the absence of other existing references, it can be
* removed by the garbage collector.
*/
- public void dispose();
+ void dispose();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java Wed Nov 22 07:19:17 2006
@@ -69,43 +69,43 @@
*/
public class StrokingTextPainter extends BasicTextPainter {
- public static final
+ public static final
AttributedCharacterIterator.Attribute PAINT_INFO =
GVTAttributedCharacterIterator.TextAttribute.PAINT_INFO;
- public static final
+ public static final
AttributedCharacterIterator.Attribute FLOW_REGIONS =
GVTAttributedCharacterIterator.TextAttribute.FLOW_REGIONS;
- public static final
+ public static final
AttributedCharacterIterator.Attribute FLOW_PARAGRAPH =
GVTAttributedCharacterIterator.TextAttribute.FLOW_PARAGRAPH;
- public static final
- AttributedCharacterIterator.Attribute TEXT_COMPOUND_ID
+ public static final
+ AttributedCharacterIterator.Attribute TEXT_COMPOUND_ID
= GVTAttributedCharacterIterator.TextAttribute.TEXT_COMPOUND_ID;
- public static final
- AttributedCharacterIterator.Attribute GVT_FONT
+ public static final
+ AttributedCharacterIterator.Attribute GVT_FONT
= GVTAttributedCharacterIterator.TextAttribute.GVT_FONT;
- public static final
+ public static final
AttributedCharacterIterator.Attribute GVT_FONTS
= GVTAttributedCharacterIterator.TextAttribute.GVT_FONTS;
- public static final
+ public static final
AttributedCharacterIterator.Attribute BIDI_LEVEL
= GVTAttributedCharacterIterator.TextAttribute.BIDI_LEVEL;
- public static final
+ public static final
AttributedCharacterIterator.Attribute XPOS
= GVTAttributedCharacterIterator.TextAttribute.X;
- public static final
+ public static final
AttributedCharacterIterator.Attribute YPOS
= GVTAttributedCharacterIterator.TextAttribute.Y;
- public static final
+ public static final
AttributedCharacterIterator.Attribute TEXTPATH
= GVTAttributedCharacterIterator.TextAttribute.TEXTPATH;
@@ -119,7 +119,7 @@
public static final Integer WRITING_MODE_RTL
= GVTAttributedCharacterIterator.TextAttribute.WRITING_MODE_RTL;
- public static final
+ public static final
AttributedCharacterIterator.Attribute ANCHOR_TYPE
= GVTAttributedCharacterIterator.TextAttribute.ANCHOR_TYPE;
@@ -205,7 +205,7 @@
return node.getTextRuns();
}
- public List computeTextRuns(TextNode node,
+ public List computeTextRuns(TextNode node,
AttributedCharacterIterator aci,
AttributedCharacterIterator [] chunkACIs) {
int [][] chunkCharMaps = new int[chunkACIs.length][];
@@ -225,7 +225,7 @@
// t0=t1;
chunkACIs [i] = createModifiedACIForFontMatching
(chunkACIs[i]);
-
+
chunkStart += (chunkACIs[i].getEndIndex()-
chunkACIs[i].getBeginIndex());
// t1 = System.currentTimeMillis();
@@ -244,12 +244,12 @@
// create from the ACI.
chunkACIs[currentChunk].first();
- chunk = getTextChunk(node,
- chunkACIs[currentChunk],
+ chunk = getTextChunk(node,
+ chunkACIs[currentChunk],
chunkCharMaps[currentChunk],
textRuns,
prevChunk);
-
+
// Adjust according to text-anchor property value
chunkACIs[currentChunk].first();
if (chunk != null) {
@@ -257,7 +257,7 @@
}
prevChunk = chunk;
currentChunk++;
-
+
} while (chunk != null && currentChunk < chunkACIs.length);
return textRuns;
@@ -278,7 +278,7 @@
while (aci.setIndex(chunkStartIndex) != CharacterIterator.DONE) {
TextPath prevTextPath = null;
- for (int start=chunkStartIndex, end=0;
+ for (int start=chunkStartIndex, end=0;
aci.setIndex(start) != CharacterIterator.DONE; start=end) {
TextPath textPath = (TextPath) aci.getAttribute(TEXTPATH);
@@ -331,7 +331,7 @@
// we don't have any absolute positioning so there
// is no reason to consider spliting the chunk further.
continue;
-
+
// We are starting a new chunk
// So check if we need to split it further...
TextNode.Anchor anchor;
@@ -376,10 +376,10 @@
chunkStartIndex = i;
}
}
-
+
// found the end of a text chunck
int chunkEndIndex = aci.getIndex();
- // System.out.println("Bounds: " + chunkStartIndex +
+ // System.out.println("Bounds: " + chunkStartIndex +
// "," + chunkEndIndex);
aciList.add(new AttributedCharacterSpanIterator
(aci, chunkStartIndex, chunkEndIndex));
@@ -388,7 +388,7 @@
}
// copy the text chunks into an array
- AttributedCharacterIterator[] aciArray =
+ AttributedCharacterIterator[] aciArray =
new AttributedCharacterIterator[aciList.size()];
Iterator iter = aciList.iterator();
for (int i=0; iter.hasNext(); ++i) {
@@ -402,17 +402,16 @@
* attributes. This is then used when creating the text runs so that the
* text can be split on changes of font as well as tspans and trefs.
*
- * @param node The text node that the aci belongs to.
* @param aci The aci to be modified should already be split into
* text chunks.
*
- * @return The new modified aci.
+ * @return The new modified aci.
*/
protected static AttributedCharacterIterator createModifiedACIForFontMatching
(AttributedCharacterIterator aci) {
aci.first();
- AttributedString as = null;
+ AttributedString as = null;
int asOff = 0;
int begin = aci.getBeginIndex();
boolean moreChunks = true;
@@ -494,7 +493,7 @@
if (fontAssigned[j - start]) {
if (runStart != -1) {
// System.out.println("Font 1: " + font);
- as.addAttribute(GVT_FONT, font,
+ as.addAttribute(GVT_FONT, font,
runStart-begin, j-begin);
runStart=-1;
}
@@ -507,8 +506,8 @@
}
if (runStart != -1) {
// System.out.println("Font 2: " + font);
- as.addAttribute(GVT_FONT, font,
- runStart-begin,
+ as.addAttribute(GVT_FONT, font,
+ runStart-begin,
displayUpToIndex-begin);
}
@@ -530,7 +529,7 @@
if (fontAssigned[i]) {
if (runStart != -1) {
// System.out.println("Font 3: " + prevF);
- as.addAttribute(GVT_FONT, prevF,
+ as.addAttribute(GVT_FONT, prevF,
runStart+asOff, i+asOff);
runStart = -1;
prevF = null;
@@ -553,9 +552,9 @@
} else if (prevFF != fontFamily) {
// Font family changed...
// System.out.println("Font 4: " + prevF);
- as.addAttribute(GVT_FONT, prevF,
+ as.addAttribute(GVT_FONT, prevF,
runStart+asOff, i+asOff);
-
+
runStart = i;
prevFF = fontFamily;
if (prevFF == null)
@@ -567,7 +566,7 @@
}
if (runStart != -1) {
// System.out.println("Font 5: " + prevF);
- as.addAttribute(GVT_FONT, prevF,
+ as.addAttribute(GVT_FONT, prevF,
runStart+asOff, aciLength+asOff);
}
@@ -596,7 +595,7 @@
int endChunk = beginChunk;
int begin = aci.getIndex();
// System.out.println("New Chunk");
- if (aci.current() == CharacterIterator.DONE)
+ if (aci.current() == CharacterIterator.DONE)
return null;
// we now lay all aci's out at 0,0 then move them
@@ -613,9 +612,7 @@
runaci = new AttributedCharacterSpanIterator(aci, start, end);
int [] subCharMap = new int[end-start];
- for (int i=0; i<subCharMap.length; i++) {
- subCharMap[i] = charMap[i+start-begin];
- }
+ System.arraycopy( charMap, start - begin, subCharMap, 0, subCharMap.length );
FontRenderContext frc = fontRenderContext;
RenderingHints rh = node.getRenderingHints();
@@ -633,7 +630,7 @@
(runaci, subCharMap, offset, frc);
textRuns.add(new TextRun(layout, runaci, isChunkStart));
- // System.out.println("TextRun: " + start + "->" + end +
+ // System.out.println("TextRun: " + start + "->" + end +
// " Start: " + isChunkStart);
Point2D layoutAdvance = layout.getAdvance2D();
@@ -645,9 +642,9 @@
if (aci.setIndex(end) == CharacterIterator.DONE) break;
isChunkStart = false;
} while (true);
-
+
// System.out.println("Adv: " + advance);
- // System.out.println("Chunks: [" + beginChunk + ", " +
+ // System.out.println("Chunks: [" + beginChunk + ", " +
// endChunk + "]");
return new TextChunk(beginChunk, endChunk, advance);
}
@@ -659,7 +656,7 @@
* to account for any text anchor properties.
*/
protected Point2D adjustChunkOffsets(Point2D location,
- List textRuns,
+ List textRuns,
TextChunk chunk) {
TextRun r = (TextRun) textRuns.get(chunk.begin);
int anchorType = r.getAnchorType();
@@ -669,16 +666,16 @@
boolean doAdjust = true;
if ((length == null) || length.isNaN())
doAdjust = false;
-
+
int numChars = 0;
for (int n=chunk.begin; n<chunk.end; ++n) {
r = (TextRun) textRuns.get(n);
AttributedCharacterIterator aci = r.getACI();
numChars += aci.getEndIndex()-aci.getBeginIndex();
}
- if ((lengthAdj ==
+ if ((lengthAdj ==
GVTAttributedCharacterIterator.TextAttribute.ADJUST_SPACING) &&
- (numChars == 1))
+ (numChars == 1))
doAdjust = false;
float xScale = 1;
@@ -686,7 +683,7 @@
r = (TextRun)textRuns.get(chunk.end-1);
TextSpanLayout layout = r.getLayout();
- GVTGlyphMetrics lastMetrics =
+ GVTGlyphMetrics lastMetrics =
layout.getGlyphMetrics(layout.getGlyphCount()-1);
GVTLineMetrics lastLineMetrics = layout.getLineMetrics();
Rectangle2D lastBounds = lastMetrics.getBounds2D();
@@ -697,14 +694,14 @@
float lastH = (float)(halfLeading + lastLineMetrics.getAscent() +
(lastBounds.getHeight() + lastBounds.getY()));
Point2D visualAdvance;
-
+
if (!doAdjust) {
// System.err.println("Anchor: " + anchorType);
// System.err.println("Advance: " + chunk.advance);
// System.err.println("LastBounds: " + lastBounds);
- // System.err.println("LastMetrics.hadv: " +
+ // System.err.println("LastMetrics.hadv: " +
// lastMetrics.getHorizontalAdvance());
- // System.err.println("LastMetrics.vadv: " +
+ // System.err.println("LastMetrics.vadv: " +
// lastMetrics.getVerticalAdvance());
visualAdvance = new Point2D.Float
@@ -773,7 +770,7 @@
}
// System.out.println("DX/DY: [" + dx + ", " + dy + "]");
-
+
r = (TextRun) textRuns.get(chunk.begin);
layout = r.getLayout();
AttributedCharacterIterator runaci = r.getACI();
@@ -797,7 +794,7 @@
absX = runX.floatValue();
tpShiftX = absX;
}
-
+
if ((runY != null) && (!runY.isNaN())) {
absY = runY.floatValue();
tpShiftY = absY;
@@ -815,8 +812,8 @@
tpShiftY = 0;
}
- // System.out.println("ABS: [" + absX + "," + absY + "," +
- // visualAdvance.getX() + "," +
+ // System.out.println("ABS: [" + absX + "," + absY + "," +
+ // visualAdvance.getX() + "," +
// visualAdvance.getY() + "]");
for (int n=chunk.begin; n<chunk.end; ++n) {
r = (TextRun) textRuns.get(n);
@@ -860,7 +857,7 @@
/**
* Paints decorations of the specified type.
*/
- protected void paintDecorations(List textRuns,
+ protected void paintDecorations(List textRuns,
Graphics2D g2d,
int decorationType) {
Paint prevPaint = null;
@@ -868,12 +865,12 @@
Stroke prevStroke = null;
Rectangle2D decorationRect = null;
double yLoc = 0, height = 0;
-
+
for (int i = 0; i < textRuns.size(); i++) {
TextRun textRun = (TextRun)textRuns.get(i);
AttributedCharacterIterator runaci = textRun.getACI();
runaci.first();
-
+
TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
if ((tpi != null) && (tpi.composite != null)) {
g2d.setComposite(tpi.composite);
@@ -912,10 +909,10 @@
yLoc = r2d.getY();
height = r2d.getHeight();
}
-
+
if (textRun.isFirstRunInChunk() ||
(paint != prevPaint) ||
- (stroke != prevStroke) ||
+ (stroke != prevStroke) ||
(strokePaint != prevStrokePaint)) {
// if there is a current decoration, draw it now
if (decorationRect != null) {
@@ -940,11 +937,11 @@
&& !textRun.getLayout().isOnATextPath()) {
// this text run should be decorated with the
- // specified decoration type
+ // specified decoration type
// NOTE: decorations are only supported for plain
// horizontal layouts
- Shape decorationShape =
+ Shape decorationShape =
textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
// create a new one
@@ -954,9 +951,9 @@
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
- double minX = Math.min(decorationRect.getX(),
+ double minX = Math.min(decorationRect.getX(),
bounds.getX());
- double maxX = Math.max(decorationRect.getMaxX(),
+ double maxX = Math.max(decorationRect.getMaxX(),
bounds.getMaxX());
decorationRect.setRect(minX, yLoc, maxX-minX, height);
}
@@ -988,7 +985,7 @@
/**
* Paints the text in each text run. Decorations are not painted here.
*/
- protected void paintTextRuns(List textRuns,
+ protected void paintTextRuns(List textRuns,
Graphics2D g2d) {
for (int i = 0; i < textRuns.size(); i++) {
TextRun textRun = (TextRun)textRuns.get(i);
@@ -1024,7 +1021,7 @@
for (int i = 0; i < textRuns.size(); ++i) {
TextRun textRun = (TextRun)textRuns.get(i);
TextSpanLayout textRunLayout = textRun.getLayout();
- GeneralPath textRunOutline =
+ GeneralPath textRunOutline =
new GeneralPath(textRunLayout.getOutline());
if (outline == null) {
@@ -1041,10 +1038,10 @@
Shape strikeThrough = getDecorationOutline
(textRuns, TextSpanLayout.DECORATION_STRIKETHROUGH);
-
+
Shape overline = getDecorationOutline
(textRuns, TextSpanLayout.DECORATION_OVERLINE);
-
+
if (underline != null) {
if (outline == null) {
outline = new GeneralPath(underline);
@@ -1193,10 +1190,10 @@
yLoc = r2d.getY();
height = r2d.getHeight();
}
-
- if (textRun.isFirstRunInChunk() ||
- paint != prevPaint ||
- stroke != prevStroke ||
+
+ if (textRun.isFirstRunInChunk() ||
+ paint != prevPaint ||
+ stroke != prevStroke ||
strokePaint != prevStrokePaint) {
// if there is a current decoration, added it to the overall
@@ -1219,7 +1216,7 @@
// decoration type note: decorations are only supported for
// plain horizontal layouts
- Shape decorationShape =
+ Shape decorationShape =
textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
// create a new one
@@ -1229,9 +1226,9 @@
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
- double minX = Math.min(decorationRect.getX(),
+ double minX = Math.min(decorationRect.getX(),
bounds.getX());
- double maxX = Math.max(decorationRect.getMaxX(),
+ double maxX = Math.max(decorationRect.getMaxX(),
bounds.getMaxX());
decorationRect.setRect(minX, yLoc, maxX-minX, height);
}
@@ -1315,32 +1312,32 @@
yLoc = r2d.getY();
height = r2d.getHeight();
}
-
- if (textRun.isFirstRunInChunk() ||
- paint != prevPaint ||
- stroke != prevStroke ||
+
+ if (textRun.isFirstRunInChunk() ||
+ paint != prevPaint ||
+ stroke != prevStroke ||
strokePaint != prevStrokePaint) {
// if there is a current decoration, added it to the overall
// outline
if (decorationRect != null) {
-
+
Shape s = null;
- if (prevStroke != null &&
+ if (prevStroke != null &&
prevStrokePaint != null)
s = prevStroke.createStrokedShape(decorationRect);
- else if (prevPaint != null)
+ else if (prevPaint != null)
s = decorationRect;
if (s != null) {
if (outline == null)
outline = new GeneralPath(s);
- else
+ else
outline.append(s, false);
}
decorationRect = null;
}
}
-
+
if ((paint != null || strokePaint != null)
&& !textRun.getLayout().isVertical()
&& !textRun.getLayout().isOnATextPath()) {
@@ -1349,7 +1346,7 @@
// decoration type note: decorations are only supported for
// plain horizontal layouts
- Shape decorationShape =
+ Shape decorationShape =
textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
@@ -1360,9 +1357,9 @@
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
- double minX = Math.min(decorationRect.getX(),
+ double minX = Math.min(decorationRect.getX(),
bounds.getX());
- double maxX = Math.max(decorationRect.getMaxX(),
+ double maxX = Math.max(decorationRect.getMaxX(),
bounds.getMaxX());
decorationRect.setRect(minX, yLoc, maxX-minX, height);
}
@@ -1377,15 +1374,15 @@
// outline
if (decorationRect != null) {
Shape s = null;
- if (prevStroke != null &&
+ if (prevStroke != null &&
prevStrokePaint != null)
s = prevStroke.createStrokedShape(decorationRect);
- else if (prevPaint != null)
+ else if (prevPaint != null)
s = decorationRect;
if (s != null) {
if (outline == null)
outline = new GeneralPath(s);
- else
+ else
outline.append(s, false);
}
}
@@ -1413,7 +1410,7 @@
aci = node.getAttributedCharacterIterator();
if (aci == null)
return null;
-
+
// get the list of text runs
List textRuns = getTextRuns(node, aci);
@@ -1482,14 +1479,14 @@
TextNode textNode = start.getTextNode();
if (textNode == null)
return null;
- if (textNode != finish.getTextNode())
+ if (textNode != finish.getTextNode())
throw new Error("Markers are from different TextNodes!");
AttributedCharacterIterator aci;
aci = textNode.getAttributedCharacterIterator();
if (aci == null)
return null;
-
+
int[] result = new int[2];
result[0] = start.getHit().getCharIndex();
result[1] = finish.getHit().getCharIndex();
@@ -1508,7 +1505,7 @@
if (startGlyphIndex != -1)
startLayout = tsl;
}
-
+
if (endGlyphIndex == -1) {
endGlyphIndex = tsl.getGlyphIndex(result[1]);
if (endGlyphIndex != -1)
@@ -1519,7 +1516,7 @@
}
if ((startLayout == null) || (endLayout == null))
return null;
-
+
int startCharCount = startLayout.getCharacterCount
(startGlyphIndex, startGlyphIndex);
int endCharCount = endLayout.getCharacterCount
@@ -1564,10 +1561,10 @@
("This Mark was not instantiated by this TextPainter class!");
}
- TextNode textNode = begin.getTextNode();
+ TextNode textNode = begin.getTextNode();
if (textNode == null)
return null;
- if (textNode != end.getTextNode())
+ if (textNode != end.getTextNode())
throw new Error("Markers are from different TextNodes!");
AttributedCharacterIterator aci;
@@ -1602,7 +1599,7 @@
// append the highlighted shape of this layout to the
// overall hightlighted shape
- if (( layoutHighlightedShape != null) &&
+ if (( layoutHighlightedShape != null) &&
(!layoutHighlightedShape.getBounds().isEmpty())) {
highlightedShape.append(layoutHighlightedShape, false);
}
@@ -1640,8 +1637,8 @@
protected Float length;
protected Integer lengthAdjust;
- public TextRun(TextSpanLayout layout,
- AttributedCharacterIterator aci,
+ public TextRun(TextSpanLayout layout,
+ AttributedCharacterIterator aci,
boolean firstRunInChunk) {
this.layout = layout;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/ArabicTextHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/ArabicTextHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/ArabicTextHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/ArabicTextHandler.java Wed Nov 22 07:19:17 2006
@@ -34,8 +34,8 @@
*/
public class ArabicTextHandler {
- private final static int arabicStart = 0x0600;
- private final static int arabicEnd = 0x06FF;
+ private static final int arabicStart = 0x0600;
+ private static final int arabicEnd = 0x06FF;
private static final AttributedCharacterIterator.Attribute ARABIC_FORM =
GVTAttributedCharacterIterator.TextAttribute.ARABIC_FORM;
@@ -79,13 +79,13 @@
// construct the reordered ACI
AttributedCharacterIterator aci = as.getIterator();
int numChars = aci.getEndIndex() - aci.getBeginIndex();
- int charOrder[] = null;
+ int[] charOrder = null;
if (numChars >= 3) {
char prevChar = aci.first();
- char c = aci.next();
+ char c = aci.next();
int i = 1;
- for (char nextChar = aci.next();
- nextChar != AttributedCharacterIterator.DONE;
+ for (char nextChar = aci.next();
+ nextChar != AttributedCharacterIterator.DONE;
prevChar = c, c = nextChar, nextChar = aci.next(), i++) {
if (arabicCharTransparent(c)) {
if (hasSubstitute(prevChar, nextChar)) {
@@ -155,7 +155,7 @@
aci = as.getIterator();
int runStart = -1;
int idx = aci.getBeginIndex();
- for (int c = aci.first();
+ for (int c = aci.first();
c != AttributedCharacterIterator.DONE;
c = aci.next(), idx++) {
if ((c >= arabicStart) && (c <= arabicEnd)) {
@@ -166,7 +166,7 @@
runStart = -1;
}
}
- if (runStart != -1)
+ if (runStart != -1)
as.addAttribute(ARABIC_FORM, ARABIC_NONE, runStart, idx);
aci = as.getIterator(); // Make sure ACI tracks ARABIC_FORM
@@ -265,7 +265,7 @@
* @return True if at least one char is arabic, false otherwise.
*/
public static boolean containsArabic(AttributedCharacterIterator aci) {
- for (char c = aci.first();
+ for (char c = aci.first();
c != AttributedCharacterIterator.DONE;
c = aci.next()) {
if (arabicChar(c)) {
@@ -413,7 +413,7 @@
if (form == 0) return -1;
if ((ch < singleCharFirst) || (ch > singleCharLast)) return -1;
- int chars[] = singleCharRemappings[ch-singleCharFirst];
+ int[] chars = singleCharRemappings[ch-singleCharFirst];
if (chars == null) return -1;
return chars[form-1];
@@ -556,7 +556,7 @@
// ligature to their various forms
// NOTE: the unicode values for ligatures are stored here in
// visual order (not logical order)
-
+
// Single char remappings:
static int singleCharFirst=0x0621;
static int singleCharLast =0x064A;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java Wed Nov 22 07:19:17 2006
@@ -41,12 +41,12 @@
/**
* Sets this iterator's contents to an unattributed copy of String s.
*/
- public void setString(String s);
+ void setString(String s);
/**
* Assigns this iterator's contents to be equivalent to AttributedString s.
*/
- public void setString(AttributedString s);
+ void setString(AttributedString s);
/**
* Sets values of a per-character attribute associated with the content
@@ -61,7 +61,7 @@
* Note that if either beginIndex or endIndex are outside the bounds
* of the current character array they are clipped accordingly.
*/
- public void setAttributeArray(TextAttribute attr,
+ void setAttributeArray(TextAttribute attr,
Object[] attValues, int beginIndex, int endIndex);
//From java.text.AttributedCharacterIterator
@@ -69,46 +69,46 @@
/**
* Get the keys of all attributes defined on the iterator's text range.
*/
- public Set getAllAttributeKeys();
+ Set getAllAttributeKeys();
/**
* Get the value of the named attribute for the current
* character.
*/
- public Object getAttribute(AttributedCharacterIterator.Attribute attribute);
+ Object getAttribute(AttributedCharacterIterator.Attribute attribute);
/**
* Returns a map with the attributes defined on the current
* character.
*/
- public Map getAttributes();
+ Map getAttributes();
/**
* Get the index of the first character following the
* run with respect to all attributes containing the current
* character.
*/
- public int getRunLimit();
+ int getRunLimit();
/**
* Get the index of the first character following the
* run with respect to the given attribute containing the current
* character.
*/
- public int getRunLimit(AttributedCharacterIterator.Attribute attribute);
+ int getRunLimit(AttributedCharacterIterator.Attribute attribute);
/**
* Get the index of the first character following the
* run with respect to the given attributes containing the current
* character.
*/
- public int getRunLimit(Set attributes);
+ int getRunLimit(Set attributes);
/**
* Get the index of the first character of the run with
* respect to all attributes containing the current character.
*/
- public int getRunStart();
+ int getRunStart();
/**
* Get the index of the first character of the run with
@@ -116,74 +116,74 @@
* @param attribute The attribute for whose appearance the first offset
* is requested.
*/
- public int getRunStart(AttributedCharacterIterator.Attribute attribute);
+ int getRunStart(AttributedCharacterIterator.Attribute attribute);
/**
* Get the index of the first character of the run with
* respect to the given attributes containing the current character.
* @param attributes the Set of attributes which begins at the returned index.
*/
- public int getRunStart(Set attributes);
+ int getRunStart(Set attributes);
//From CharacterIterator
/**
* Create a copy of this iterator
*/
- public Object clone();
+ Object clone();
/**
* Get the character at the current position (as returned
* by getIndex()).
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char current();
+ char current();
/**
* Sets the position to getBeginIndex().
* @return the character at the start index of the text.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char first();
+ char first();
/**
* Get the start index of the text.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public int getBeginIndex();
+ int getBeginIndex();
/**
* Get the end index of the text.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public int getEndIndex();
+ int getEndIndex();
/**
* Get the current index.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public int getIndex();
+ int getIndex();
/**
* Sets the position to getEndIndex()-1 (getEndIndex() if
* the text is empty) and returns the character at that position.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char last();
+ char last();
/**
* Increments the iterator's index by one, returning the next character.
* @return the character at the new index.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char next();
+ char next();
/**
* Decrements the iterator's index by one and returns
* the character at the new index.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char previous();
+ char previous();
/**
* Sets the position to the specified position in the text.
@@ -191,7 +191,7 @@
* @return the character at new index <em>position</em>.
* <br><b>Specified by:</b> java.text.CharacterIterator.
*/
- public char setIndex(int position);
+ char setIndex(int position);
//Inner classes:
@@ -202,194 +202,194 @@
* We duplicate the features of java.awt.font.TextAttribute rather than
* subclassing because java.awt.font.TextAttribute is <em>final</em>.
*/
- public static class TextAttribute extends AttributedCharacterIterator.Attribute {
+ class TextAttribute extends AttributedCharacterIterator.Attribute {
/** Construct a TextAttribute key with name s */
public TextAttribute(String s) {
super(s);
}
- public final static TextAttribute FLOW_PARAGRAPH =
+ public static final TextAttribute FLOW_PARAGRAPH =
new TextAttribute("FLOW_PARAGRAPH");
- public final static TextAttribute FLOW_EMPTY_PARAGRAPH =
+ public static final TextAttribute FLOW_EMPTY_PARAGRAPH =
new TextAttribute("FLOW_EMPTY_PARAGRAPH");
- public final static TextAttribute FLOW_LINE_BREAK =
+ public static final TextAttribute FLOW_LINE_BREAK =
new TextAttribute("FLOW_LINE_BREAK");
- public final static TextAttribute FLOW_REGIONS =
+ public static final TextAttribute FLOW_REGIONS =
new TextAttribute("FLOW_REGIONS");
- public final static TextAttribute LINE_HEIGHT =
+ public static final TextAttribute LINE_HEIGHT =
new TextAttribute("LINE_HEIGHT");
- public final static TextAttribute PREFORMATTED =
+ public static final TextAttribute PREFORMATTED =
new TextAttribute("PREFORMATTED");
/** Attribute span delimiter - new tspan, tref, or textelement.*/
- public final static TextAttribute TEXT_COMPOUND_DELIMITER =
+ public static final TextAttribute TEXT_COMPOUND_DELIMITER =
new TextAttribute("TEXT_COMPOUND_DELIMITER");
/** Element identifier all chars from same element will share an
* ID. */
- public final static TextAttribute TEXT_COMPOUND_ID =
+ public static final TextAttribute TEXT_COMPOUND_ID =
new TextAttribute("TEXT_COMPOUND_ID");
/** Anchor type.*/
- public final static TextAttribute ANCHOR_TYPE =
+ public static final TextAttribute ANCHOR_TYPE =
new TextAttribute("ANCHOR_TYPE");
/** Marker attribute indicating explicit glyph layout.*/
- public final static TextAttribute EXPLICIT_LAYOUT =
+ public static final TextAttribute EXPLICIT_LAYOUT =
new TextAttribute("EXPLICIT_LAYOUT");
/** User-space X coordinate for character.*/
- public final static TextAttribute X = new TextAttribute("X");
+ public static final TextAttribute X = new TextAttribute("X");
/** User-space Y coordinate for character.*/
- public final static TextAttribute Y = new TextAttribute("Y");
+ public static final TextAttribute Y = new TextAttribute("Y");
/** User-space relative X coordinate for character.*/
- public final static TextAttribute DX = new TextAttribute("DX");
+ public static final TextAttribute DX = new TextAttribute("DX");
/** User-space relative Y coordinate for character.*/
- public final static TextAttribute DY = new TextAttribute("DY");
+ public static final TextAttribute DY = new TextAttribute("DY");
/** Rotation for character, in degrees.*/
- public final static TextAttribute ROTATION =
+ public static final TextAttribute ROTATION =
new TextAttribute("ROTATION");
/** All the paint attributes for the text.*/
- public final static TextAttribute PAINT_INFO =
+ public static final TextAttribute PAINT_INFO =
new TextAttribute("PAINT_INFO");
/** Author-expected width for bounding box containing
* all text string glyphs.
*/
- public final static TextAttribute BBOX_WIDTH =
+ public static final TextAttribute BBOX_WIDTH =
new TextAttribute("BBOX_WIDTH");
/** Method specified for adjusting text element layout size.
*/
- public final static TextAttribute LENGTH_ADJUST =
+ public static final TextAttribute LENGTH_ADJUST =
new TextAttribute("LENGTH_ADJUST");
/** Convenience flag indicating that non-default glyph spacing is needed.
*/
- public final static TextAttribute CUSTOM_SPACING =
+ public static final TextAttribute CUSTOM_SPACING =
new TextAttribute("CUSTOM_SPACING");
/** User-specified inter-glyph kerning value.
*/
- public final static TextAttribute KERNING =
+ public static final TextAttribute KERNING =
new TextAttribute("KERNING");
/** User-specified inter-glyph spacing value.
*/
- public final static TextAttribute LETTER_SPACING =
+ public static final TextAttribute LETTER_SPACING =
new TextAttribute("LETTER_SPACING");
/** User-specified width for whitespace characters.
*/
- public final static TextAttribute WORD_SPACING =
+ public static final TextAttribute WORD_SPACING =
new TextAttribute("WORD_SPACING");
/** Path along which text is to be laid out */
- public final static TextAttribute TEXTPATH =
+ public static final TextAttribute TEXTPATH =
new TextAttribute("TEXTPATH");
/** Font variant to be used for this character span.
* @see org.apache.batik.gvt.text.GVTAttributedCharacterIterator.TextAttribute#SMALL_CAPS
*/
- public final static TextAttribute FONT_VARIANT =
+ public static final TextAttribute FONT_VARIANT =
new TextAttribute("FONT_VARIANT");
/** Baseline adjustment to be applied to this character span.
*/
- public final static TextAttribute BASELINE_SHIFT =
+ public static final TextAttribute BASELINE_SHIFT =
new TextAttribute("BASELINE_SHIFT");
/** Directional writing mode applied to this character span.
*/
- public final static TextAttribute WRITING_MODE =
+ public static final TextAttribute WRITING_MODE =
new TextAttribute("WRITING_MODE");
- public final static TextAttribute VERTICAL_ORIENTATION =
+ public static final TextAttribute VERTICAL_ORIENTATION =
new TextAttribute("VERTICAL_ORIENTATION");
- public final static TextAttribute VERTICAL_ORIENTATION_ANGLE =
+ public static final TextAttribute VERTICAL_ORIENTATION_ANGLE =
new TextAttribute("VERTICAL_ORIENTATION_ANGLE");
- public final static TextAttribute HORIZONTAL_ORIENTATION_ANGLE =
+ public static final TextAttribute HORIZONTAL_ORIENTATION_ANGLE =
new TextAttribute("HORIZONTAL_ORIENTATION_ANGLE");
- public final static TextAttribute GVT_FONT_FAMILIES =
+ public static final TextAttribute GVT_FONT_FAMILIES =
new TextAttribute("GVT_FONT_FAMILIES");
- public final static TextAttribute GVT_FONTS =
+ public static final TextAttribute GVT_FONTS =
new TextAttribute("GVT_FONTS");
- public final static TextAttribute GVT_FONT =
+ public static final TextAttribute GVT_FONT =
new TextAttribute("GVT_FONT");
- public final static TextAttribute ALT_GLYPH_HANDLER =
+ public static final TextAttribute ALT_GLYPH_HANDLER =
new TextAttribute("ALT_GLYPH_HANDLER");
- public final static TextAttribute BIDI_LEVEL =
+ public static final TextAttribute BIDI_LEVEL =
new TextAttribute("BIDI_LEVEL");
- public final static TextAttribute CHAR_INDEX =
+ public static final TextAttribute CHAR_INDEX =
new TextAttribute("CHAR_INDEX");
- public final static TextAttribute ARABIC_FORM =
+ public static final TextAttribute ARABIC_FORM =
new TextAttribute("ARABIC_FORM");
// VALUES
/** Value for WRITING_MODE indicating left-to-right */
- public final static Integer WRITING_MODE_LTR = new Integer(0x1);
+ public static final Integer WRITING_MODE_LTR = new Integer(0x1);
/** Value for WRITING_MODE indicating right-to-left */
- public final static Integer WRITING_MODE_RTL = new Integer(0x2);
+ public static final Integer WRITING_MODE_RTL = new Integer(0x2);
/** Value for WRITING_MODE indicating top-to-botton */
- public final static Integer WRITING_MODE_TTB = new Integer(0x3);
+ public static final Integer WRITING_MODE_TTB = new Integer(0x3);
/** Value for VERTICAL_ORIENTATION indicating an angle */
- public final static Integer ORIENTATION_ANGLE = new Integer(0x1);
+ public static final Integer ORIENTATION_ANGLE = new Integer(0x1);
/** Value for VERTICAL_ORIENTATION indicating auto */
- public final static Integer ORIENTATION_AUTO = new Integer(0x2);
+ public static final Integer ORIENTATION_AUTO = new Integer(0x2);
/** Value for FONT_VARIANT specifying small caps */
- public final static Integer SMALL_CAPS = new Integer(0x10);
+ public static final Integer SMALL_CAPS = new Integer(0x10);
/** Value for UNDERLINE specifying underlining-on */
- public final static Integer UNDERLINE_ON =
+ public static final Integer UNDERLINE_ON =
java.awt.font.TextAttribute.UNDERLINE_ON;
/** Value for OVERLINE specifying overlining-on */
- public final static Boolean OVERLINE_ON = Boolean.TRUE;
+ public static final Boolean OVERLINE_ON = Boolean.TRUE;
/** Value for STRIKETHROUGH specifying strikethrough-on */
- public final static Boolean STRIKETHROUGH_ON =
+ public static final Boolean STRIKETHROUGH_ON =
java.awt.font.TextAttribute.STRIKETHROUGH_ON;
/** Value for LENGTH_ADJUST specifying adjustment to inter-glyph spacing */
- public final static Integer ADJUST_SPACING =
+ public static final Integer ADJUST_SPACING =
new Integer(0x0);
/** Value for LENGTH_ADJUST specifying overall scaling of layout outlines */
- public final static Integer ADJUST_ALL =
+ public static final Integer ADJUST_ALL =
new Integer(0x01);
// constant values for the arabic glyph forms
- public final static Integer ARABIC_NONE = new Integer(0x0);
- public final static Integer ARABIC_ISOLATED = new Integer(0x1);
- public final static Integer ARABIC_TERMINAL = new Integer(0x2);
- public final static Integer ARABIC_INITIAL = new Integer(0x3);
- public final static Integer ARABIC_MEDIAL = new Integer(0x4);
+ public static final Integer ARABIC_NONE = new Integer(0x0);
+ public static final Integer ARABIC_ISOLATED = new Integer(0x1);
+ public static final Integer ARABIC_TERMINAL = new Integer(0x2);
+ public static final Integer ARABIC_INITIAL = new Integer(0x3);
+ public static final Integer ARABIC_MEDIAL = new Integer(0x4);
}
@@ -400,7 +400,7 @@
* TextAttribute.TRANSFORM attributes, or convert between implementations
* of AttributedCharacterIterator.Attribute.
*/
- public interface AttributeFilter {
+ interface AttributeFilter {
/**
* Modify an AttributedCharacterIterator's attributes systematically.
@@ -412,7 +412,7 @@
* @return an instance of AttributedCharacterIterator with mutated
* attributes.
*/
- public AttributedCharacterIterator
+ AttributedCharacterIterator
mutateAttributes(AttributedCharacterIterator aci);
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GlyphLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GlyphLayout.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GlyphLayout.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/GlyphLayout.java Wed Nov 22 07:19:17 2006
@@ -88,25 +88,25 @@
public static final AttributedCharacterIterator.Attribute FLOW_LINE_BREAK
= GVTAttributedCharacterIterator.TextAttribute.FLOW_LINE_BREAK;
- public static final AttributedCharacterIterator.Attribute FLOW_PARAGRAPH
+ public static final AttributedCharacterIterator.Attribute FLOW_PARAGRAPH
= GVTAttributedCharacterIterator.TextAttribute.FLOW_PARAGRAPH;
- public static final AttributedCharacterIterator.Attribute
- FLOW_EMPTY_PARAGRAPH
+ public static final AttributedCharacterIterator.Attribute
+ FLOW_EMPTY_PARAGRAPH
= GVTAttributedCharacterIterator.TextAttribute.FLOW_EMPTY_PARAGRAPH;
public static final AttributedCharacterIterator.Attribute LINE_HEIGHT
= GVTAttributedCharacterIterator.TextAttribute.LINE_HEIGHT;
- public static final AttributedCharacterIterator.Attribute
- VERTICAL_ORIENTATION
+ public static final AttributedCharacterIterator.Attribute
+ VERTICAL_ORIENTATION
= GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION;
- public static final
+ public static final
AttributedCharacterIterator.Attribute VERTICAL_ORIENTATION_ANGLE =
GVTAttributedCharacterIterator.TextAttribute.VERTICAL_ORIENTATION_ANGLE;
- public static final
+ public static final
AttributedCharacterIterator.Attribute HORIZONTAL_ORIENTATION_ANGLE =
GVTAttributedCharacterIterator.TextAttribute.HORIZONTAL_ORIENTATION_ANGLE;
@@ -140,7 +140,7 @@
public static final AttributedCharacterIterator.Attribute GVT_FONT
= GVTAttributedCharacterIterator.TextAttribute.GVT_FONT;
- static protected Set runAtts = new HashSet();
+ protected static Set runAtts = new HashSet();
static {
runAtts.add(X);
@@ -151,7 +151,7 @@
runAtts.add(BASELINE_SHIFT);
}
- static protected Set szAtts = new HashSet();
+ protected static Set szAtts = new HashSet();
static {
szAtts.add(TextAttribute.SIZE);
@@ -191,7 +191,7 @@
this.textPath = (TextPath) aci.getAttribute
(GVTAttributedCharacterIterator.TextAttribute.TEXTPATH);
- AltGlyphHandler altGlyphHandler
+ AltGlyphHandler altGlyphHandler
= (AltGlyphHandler)this.aci.getAttribute
(GVTAttributedCharacterIterator.TextAttribute.ALT_GLYPH_HANDLER);
if (altGlyphHandler != null) {
@@ -234,7 +234,7 @@
* ).
* @param xScale Scale factor to apply in X direction.
* @param yScale Scale factor to apply in Y direction.
- * @param adjSpacing True if only spaces should be adjusted.
+ * @param adjSpacing True if only spaces should be adjusted.
*/
public void setScale(float xScale, float yScale, boolean adjSpacing) {
// Fix the off axis scale factor.
@@ -347,7 +347,7 @@
*/
public boolean isLeftToRight() {
aci.first();
- int bidiLevel =
+ int bidiLevel =
((Integer)aci.getAttribute
(GVTAttributedCharacterIterator.TextAttribute.BIDI_LEVEL))
.intValue();
@@ -359,7 +359,7 @@
/**
- * This method makes certain that the layout has been
+ * This method makes certain that the layout has been
* completed at this point (much of the layout is done lazily).
*/
private final void syncLayout() {
@@ -577,7 +577,7 @@
if ((glyphCharIndex >= beginCharIndex) &&
(glyphCharIndex <= endCharIndex) &&
gv.isGlyphVisible(i)) {
-
+
Shape gbounds = gv.getGlyphLogicalBounds(i);
if (gbounds != null) {
// We got something...
@@ -973,7 +973,7 @@
aci.first();
GVTFont gvtFont = (GVTFont)aci.getAttribute(GVT_FONT);
- if (gvtFont != null)
+ if (gvtFont != null)
return gvtFont;
// shouldn't get here
@@ -1069,7 +1069,7 @@
this.gv.performDefaultLayout();
- float baselineAscent
+ float baselineAscent
= vertical ?
(float) gv.getLogicalBounds().getWidth() :
(metrics.getAscent() + Math.abs(metrics.getDescent()));
@@ -1143,7 +1143,7 @@
}
} else {
if ((glyphOrientationAngle == 270)) {
- horizontalFirstOffset =
+ horizontalFirstOffset =
(float)gm.getBounds2D().getHeight();
} else {
// 0, 90, 180
@@ -1151,7 +1151,7 @@
}
}
} else {
- if (glyphOrientationAuto &&
+ if (glyphOrientationAuto &&
(verticalFirstOffset == 0f) && !isLatinChar(ch)) {
float advY = gm.getVerticalAdvance();
float asc = metrics.getAscent();
@@ -1202,19 +1202,19 @@
}
if ((x != null) && !x.isNaN()) {
- if (i == 0)
+ if (i == 0)
shift_x_pos = (float)(x.floatValue()-offset.getX());
curr_x_pos = x.floatValue()-shift_x_pos;
- }
+ }
if (dx != null && !dx.isNaN()) {
curr_x_pos += dx.floatValue();
}
if ((y != null) && !y.isNaN()) {
- if (i == 0)
+ if (i == 0)
shift_y_pos = (float)(y.floatValue()-offset.getY());
curr_y_pos = y.floatValue()-shift_y_pos;
- }
+ }
if (dy != null && !dy.isNaN()) {
curr_y_pos += dy.floatValue();
} else if (i > 0) {
@@ -1247,20 +1247,20 @@
if (isLatinChar(ch)) {
ox += metrics.getStrikethroughOffset();
} else {
- Rectangle2D glyphBounds
+ Rectangle2D glyphBounds
= gv.getGlyphVisualBounds(i).getBounds2D();
- ox -= (float)((glyphBounds.getMaxX() - gp[2*i]) -
+ ox -= (float)((glyphBounds.getMaxX() - gp[2*i]) -
glyphBounds.getWidth()/2);
}
} else {
// center the character if it's not auto orient
- Rectangle2D glyphBounds
+ Rectangle2D glyphBounds
= gv.getGlyphVisualBounds(i).getBounds2D();
if (glyphOrientationAngle == 0) {
- ox -= (float)((glyphBounds.getMaxX() - gp[2*i]) -
+ ox -= (float)((glyphBounds.getMaxX() - gp[2*i]) -
glyphBounds.getWidth()/2);
} else if (glyphOrientationAngle == 180) {
- ox += (float)((glyphBounds.getMaxX() - gp[2*i]) -
+ ox += (float)((glyphBounds.getMaxX() - gp[2*i]) -
glyphBounds.getWidth()/2);
} else if (glyphOrientationAngle == 90) {
ox += metrics.getStrikethroughOffset();
@@ -1364,7 +1364,7 @@
pos.y = curr_y_pos;
gv.setGlyphPosition(i, pos);
- advance = new Point2D.Float((float)(curr_x_pos - offset.getX()),
+ advance = new Point2D.Float((float)(curr_x_pos - offset.getX()),
(float)(curr_y_pos - offset.getY()));
@@ -1385,7 +1385,7 @@
int tyS=0, txS=0;
float advX=0, advY=0;
if (vertical) {
- if (glyphOrientationAuto ||
+ if (glyphOrientationAuto ||
(glyphOrientationAngle == 90))
advY = gm.getHorizontalAdvance();
else if (glyphOrientationAngle == 270)
@@ -1414,7 +1414,7 @@
float tx=0, ty=0;
float advT = gmT.getHorizontalAdvance();
if (vertical) {
- if (glyphOrientationAuto ||
+ if (glyphOrientationAuto ||
(glyphOrientationAngle == 90))
locY = baseY-advT;
else if (glyphOrientationAngle == 270)
@@ -1433,7 +1433,7 @@
else // 270
locY = baseY+advT;
}
-
+
locT = new Point2D.Double(locX, locY);
gv.setGlyphPosition(j, locT);
if ((txS != 0) || (tyS != 0)) {
@@ -1453,7 +1453,7 @@
ch = aci.setIndex(aciIndex+aciStart);
i++;
}
-
+
}
@@ -1468,7 +1468,7 @@
*/
protected void adjustTextSpacing() {
- if (spacingApplied)
+ if (spacingApplied)
// Nothing to do...
return;
@@ -1534,7 +1534,7 @@
float dx = 0f;
float dy = 0f;
- Point2D newPositions[] = new Point2D[numGlyphs+1];
+ Point2D[] newPositions = new Point2D[numGlyphs+1];
Point2D prevPos = gv.getGlyphPosition(0);
int prevCode = gv.getGlyphCode(0);
float x = (float) prevPos.getX();
@@ -1562,12 +1562,12 @@
// removing any auto-kern values
if (vertical) {
float vKern = 0;
- if (currCode != -1)
+ if (currCode != -1)
vKern = font.getVKern(prevCode, currCode);
dy += kernVal - vKern + letterSpacingVal;
} else {
float hKern = 0;
- if (currCode != -1)
+ if (currCode != -1)
hKern = font.getHKern(prevCode, currCode);
dx += kernVal - hKern + letterSpacingVal;
}
@@ -1593,7 +1593,7 @@
lastCharAdvance.getY() + kernVal + letterSpacingVal);
} else {
lastCharAdvance.setLocation
- (lastCharAdvance.getX() + kernVal + letterSpacingVal,
+ (lastCharAdvance.getX() + kernVal + letterSpacingVal,
lastCharAdvance.getY());
}
@@ -1686,10 +1686,10 @@
* each glyphs transform.
*/
protected void applyStretchTransform(boolean stretchGlyphs) {
- if ((xScale == 1) && (yScale==1))
+ if ((xScale == 1) && (yScale==1))
return;
- AffineTransform scaleAT =
+ AffineTransform scaleAT =
AffineTransform.getScaleInstance(xScale, yScale);
int numGlyphs = gv.getNumGlyphs();
@@ -1727,10 +1727,10 @@
/**
* If this layout is on a text path, positions the characters
- * along the path.
+ * along the path.
*/
protected void doPathLayout() {
- if (pathApplied)
+ if (pathApplied)
return;
if (!spacingApplied)
@@ -1842,12 +1842,12 @@
glyphMidY -= (float)currentGlyphPos.getY();
}
- // System.err.println("GMX: " + glyphMidX +
+ // System.err.println("GMX: " + glyphMidX +
// " W2: " + (glyphWidth/2) +
// " PosX: " + currentGlyphPos.getX() +
// " BX: " + glyphBounds.getX());
- //
- // System.err.println("GMY: " + glyphMidY +
+ //
+ // System.err.println("GMY: " + glyphMidY +
// " H2: " + (glyphHeight/2) +
// " PosY: " + currentGlyphPos.getY() +
// " BY: " + glyphBounds.getY());
@@ -1940,7 +1940,7 @@
layoutApplied = false;
// The spacing stuff is junk now.
spacingApplied = false;
- pathApplied = true;
+ pathApplied = true;
}
/**
@@ -2014,13 +2014,13 @@
glyphOrientationAngle -= 360;
}
- if ((glyphOrientationAngle <= 45) ||
+ if ((glyphOrientationAngle <= 45) ||
(glyphOrientationAngle > 315)) {
glyphOrientationAngle = 0;
- } else if ((glyphOrientationAngle > 45) &&
+ } else if ((glyphOrientationAngle > 45) &&
(glyphOrientationAngle <= 135)) {
glyphOrientationAngle = 90;
- } else if ((glyphOrientationAngle > 135) &&
+ } else if ((glyphOrientationAngle > 135) &&
(glyphOrientationAngle <= 225)) {
glyphOrientationAngle = 180;
} else {
@@ -2031,7 +2031,7 @@
}
/**
- * Return true is the character index is represented by glyphs
+ * Return true is the character index is represented by glyphs
* in this layout.
*
* @param index index of the character in the ACI.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/Mark.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/Mark.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/Mark.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/Mark.java Wed Nov 22 07:19:17 2006
@@ -24,18 +24,18 @@
* selection gesture.
*
* @author <a href="mailto:bill.haneman@ireland.sun.com">Bill Haneman</a>
- * @version $Id$
+ * @version $Id$
*/
public interface Mark {
/*
- * Return the TextNode this Mark is associated with
+ * Return the TextNode this Mark is associated with
*/
- public TextNode getTextNode();
+ TextNode getTextNode();
/**
* Returns the index of the character that has been hit.
*
* @return The character index.
*/
- public int getCharIndex();
+ int getCharIndex();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/TextSpanLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/TextSpanLayout.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/TextSpanLayout.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/gvt/text/TextSpanLayout.java Wed Nov 22 07:19:17 2006
@@ -43,10 +43,10 @@
*/
public interface TextSpanLayout {
- public int DECORATION_UNDERLINE = 0x1;
- public int DECORATION_STRIKETHROUGH = 0x2;
- public int DECORATION_OVERLINE = 0x4;
- public int DECORATION_ALL = DECORATION_UNDERLINE |
+ int DECORATION_UNDERLINE = 0x1;
+ int DECORATION_STRIKETHROUGH = 0x2;
+ int DECORATION_OVERLINE = 0x4;
+ int DECORATION_ALL = DECORATION_UNDERLINE |
DECORATION_OVERLINE |
DECORATION_STRIKETHROUGH;
@@ -55,7 +55,7 @@
* specified Graphics2D and rendering context.
* @param g2d the Graphics2D to use
*/
- public void draw(Graphics2D g2d);
+ void draw(Graphics2D g2d);
/**
* Returns the outline of the specified decorations on the glyphs,
@@ -65,26 +65,26 @@
* values together:
* e.g. <tt>DECORATION_UNDERLINE | DECORATION_STRIKETHROUGH</tt>
*/
- public Shape getDecorationOutline(int decorationType);
+ Shape getDecorationOutline(int decorationType);
/**
* Returns the rectangular bounds of the completed glyph layout.
* This includes stroking information, this does not include
* deocrations.
*/
- public Rectangle2D getBounds2D();
+ Rectangle2D getBounds2D();
/**
* Returns the bounds of the geometry (this is always the bounds
* of the outline).
*/
- public Rectangle2D getGeometricBounds();
+ Rectangle2D getGeometricBounds();
/**
* Returns the outline of the completed glyph layout, transformed
* by an AffineTransform.
*/
- public Shape getOutline();
+ Shape getOutline();
/**
* Returns the current text position at the completion
@@ -92,31 +92,31 @@
* (This is the position that should be used for positioning
* adjacent layouts.)
*/
- public Point2D getAdvance2D();
+ Point2D getAdvance2D();
/**
* Returns the advance between each glyph in text progression direction.
*/
- public float [] getGlyphAdvances();
+ float [] getGlyphAdvances();
/**
* Returns the Metrics for a particular glyph.
*/
- public GVTGlyphMetrics getGlyphMetrics(int glyphIndex);
+ GVTGlyphMetrics getGlyphMetrics(int glyphIndex);
/**
* Returns the Line metrics for this text span.
*/
- public GVTLineMetrics getLineMetrics();
+ GVTLineMetrics getLineMetrics();
- public Point2D getTextPathAdvance();
+ Point2D getTextPathAdvance();
/**
* Returns the current text position at the completion beginning
* of glyph layout, before the application of explicit
* glyph positioning attributes.
*/
- public Point2D getOffset();
+ Point2D getOffset();
/**
* Sets the scaling factor to use for string. if ajdSpacing is
@@ -127,7 +127,7 @@
* @param yScale Scale factor to apply in Y direction.
* @param adjSpacing True if only spaces should be adjusted.
*/
- public void setScale(float xScale, float yScale, boolean adjSpacing);
+ void setScale(float xScale, float yScale, boolean adjSpacing);
/**
* Sets the text position used for the implicit origin
@@ -135,7 +135,7 @@
* positioning attributes are present in ACI
* (e.g. if the aci has multiple X or Y values).
*/
- public void setOffset(Point2D offset);
+ void setOffset(Point2D offset);
/**
* Returns a Shape which encloses the currently selected glyphs
@@ -145,7 +145,7 @@
* @param endCharIndex the index of the last glyph in the contiguous
* selection.
*/
- public Shape getHighlightShape(int beginCharIndex, int endCharIndex);
+ Shape getHighlightShape(int beginCharIndex, int endCharIndex);
/**
* Perform hit testing for coordinate at x, y.
@@ -155,22 +155,22 @@
* @param x the x coordinate of the point to be tested.
* @param y the y coordinate of the point to be tested.
*/
- public TextHit hitTestChar(float x, float y);
+ TextHit hitTestChar(float x, float y);
/**
* Returns true if the advance direction of this text is vertical.
*/
- public boolean isVertical();
+ boolean isVertical();
/**
* Returns true if this layout in on a text path.
*/
- public boolean isOnATextPath();
+ boolean isOnATextPath();
/**
* Returns the number of glyphs in this layout.
*/
- public int getGlyphCount();
+ int getGlyphCount();
/**
* Returns the number of chars represented by the glyphs within the
@@ -179,7 +179,7 @@
* @param endGlyphIndex The index of the last glyph in the range.
* @return The number of chars.
*/
- public int getCharacterCount(int startGlyphIndex, int endGlyphIndex);
+ int getCharacterCount(int startGlyphIndex, int endGlyphIndex);
/**
* Returns the glyph index of the glyph that has the specified char index.
@@ -189,21 +189,21 @@
* @return The index of the matching glyph in this layout's glyph vector,
* or -1 if a matching glyph could not be found.
*/
- public int getGlyphIndex(int charIndex);
+ int getGlyphIndex(int charIndex);
/**
* Returns true if the text direction in this layout is from left to right.
*/
- public boolean isLeftToRight();
+ boolean isLeftToRight();
/**
- * Return true is the character index is represented by glyphs
+ * Return true is the character index is represented by glyphs
* in this layout.
*
* @param index index of the character in the ACI.
* @return true if the layout represents that character.
*/
- public boolean hasCharacterIndex(int index);
+ boolean hasCharacterIndex(int index);
/**
@@ -211,7 +211,7 @@
*
* @return glyph vector
*/
- public GVTGlyphVector getGlyphVector();
+ GVTGlyphVector getGlyphVector();
/**
* Return the rotation angle applied to the
@@ -220,11 +220,11 @@
* @param index index of the character in the ACI
* @return rotation angle
*/
- public double getComputedOrientationAngle(int index);
+ double getComputedOrientationAngle(int index);
/**
* Return true if this text run represents
* an alt glyph.
*/
- public boolean isAltGlyph();
+ boolean isAltGlyph();
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/i18n/LocaleGroup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/i18n/LocaleGroup.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/i18n/LocaleGroup.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/i18n/LocaleGroup.java Wed Nov 22 07:19:17 2006
@@ -31,7 +31,7 @@
/**
* The default group.
*/
- public final static LocaleGroup DEFAULT = new LocaleGroup();
+ public static final LocaleGroup DEFAULT = new LocaleGroup();
/**
* The shared Locale.
@@ -40,7 +40,7 @@
/**
* Sets the default locale for all the instances of ExtendedLocalizable
- * in this group.
+ * in this group.
*/
public void setLocale(Locale l) {
locale = l;
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractParser.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractParser.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractParser.java Wed Nov 22 07:19:17 2006
@@ -41,7 +41,7 @@
/**
* The default resource bundle base name.
*/
- public final static String BUNDLE_CLASSNAME =
+ public static final String BUNDLE_CLASSNAME =
"org.apache.batik.parser.resources.Messages";
/**
@@ -53,7 +53,7 @@
* The localizable support.
*/
protected LocalizableSupport localizableSupport =
- new LocalizableSupport(BUNDLE_CLASSNAME,
+ new LocalizableSupport(BUNDLE_CLASSNAME,
AbstractParser.class.getClassLoader());
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractScanner.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractScanner.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractScanner.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/AbstractScanner.java Wed Nov 22 07:19:17 2006
@@ -64,7 +64,7 @@
* The previous lexical unit type that was scanned.
*/
protected int previousType;
-
+
/**
* The start offset of the last lexical unit.
*/
@@ -115,7 +115,7 @@
public AbstractScanner(String s) throws ParseException {
try {
reader = new StringNormalizingReader(s);
- current = nextChar();
+ current = nextChar();
} catch (IOException e) {
throw new ParseException(e);
}
@@ -223,10 +223,8 @@
}
if (position == buffer.length) {
- char[] t = new char[position * 3 / 2];
- for (int i = 0; i < position; i++) {
- t[i] = buffer[i];
- }
+ char[] t = new char[ 1 + position + position / 2];
+ System.arraycopy( buffer, 0, t, 0, position );
buffer = t;
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultAngleHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultAngleHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultAngleHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultAngleHandler.java Wed Nov 22 07:19:17 2006
@@ -28,7 +28,7 @@
/**
* The only instance of this class.
*/
- public final static AngleHandler INSTANCE
+ public static final AngleHandler INSTANCE
= new DefaultAngleHandler();
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultFragmentIdentifierHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultFragmentIdentifierHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultFragmentIdentifierHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultFragmentIdentifierHandler.java Wed Nov 22 07:19:17 2006
@@ -31,7 +31,7 @@
/**
* The only instance of this class.
*/
- public final static FragmentIdentifierHandler INSTANCE
+ public static final FragmentIdentifierHandler INSTANCE
= new DefaultFragmentIdentifierHandler();
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthHandler.java Wed Nov 22 07:19:17 2006
@@ -28,7 +28,7 @@
/**
* The only instance of this class.
*/
- public final static LengthHandler INSTANCE = new DefaultLengthHandler();
+ public static final LengthHandler INSTANCE = new DefaultLengthHandler();
/**
* This class does not need to be instantiated.
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthListHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthListHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthListHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultLengthListHandler.java Wed Nov 22 07:19:17 2006
@@ -30,7 +30,7 @@
/**
* The only instance of this class.
*/
- public final static LengthListHandler INSTANCE
+ public static final LengthListHandler INSTANCE
= new DefaultLengthListHandler();
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultNumberListHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultNumberListHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultNumberListHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultNumberListHandler.java Wed Nov 22 07:19:17 2006
@@ -26,21 +26,21 @@
/**
* The only instance of this class.
*/
- public final static NumberListHandler INSTANCE
+ public static final NumberListHandler INSTANCE
= new DefaultNumberListHandler();
-
+
/**
* This class does not need to be instantiated.
*/
protected DefaultNumberListHandler() {
}
-
+
/**
* Implements {@link NumberListHandler#startNumberList()}.
*/
public void startNumberList() throws ParseException {
}
-
+
/**
* Implements {@link NumberListHandler#endNumberList()}.
*/
@@ -52,20 +52,20 @@
*/
public void startNumber() throws ParseException {
}
-
+
/**
* Implements {@link NumberListHandler#numberValue(float)}.
*/
public void numberValue(float v) throws ParseException {
- }
-
+ }
+
/**
* Implements {@link NumberListHandler#endNumber()}.
*/
public void endNumber() throws ParseException {
- }
-
-
-
-
+ }
+
+
+
+
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPathHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPathHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPathHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPathHandler.java Wed Nov 22 07:19:17 2006
@@ -29,7 +29,7 @@
/**
* The only instance of this class.
*/
- public final static PathHandler INSTANCE
+ public static final PathHandler INSTANCE
= new DefaultPathHandler();
/**
@@ -108,8 +108,8 @@
* Implements {@link
* PathHandler#curvetoCubicRel(float,float,float,float,float,float)}.
*/
- public void curvetoCubicRel(float x1, float y1,
- float x2, float y2,
+ public void curvetoCubicRel(float x1, float y1,
+ float x2, float y2,
float x, float y) throws ParseException {
}
@@ -117,8 +117,8 @@
* Implements {@link
* PathHandler#curvetoCubicAbs(float,float,float,float,float,float)}.
*/
- public void curvetoCubicAbs(float x1, float y1,
- float x2, float y2,
+ public void curvetoCubicAbs(float x1, float y1,
+ float x2, float y2,
float x, float y) throws ParseException {
}
@@ -126,7 +126,7 @@
* Implements {@link
* PathHandler#curvetoCubicSmoothRel(float,float,float,float)}.
*/
- public void curvetoCubicSmoothRel(float x2, float y2,
+ public void curvetoCubicSmoothRel(float x2, float y2,
float x, float y) throws ParseException {
}
@@ -134,7 +134,7 @@
* Implements {@link
* PathHandler#curvetoCubicSmoothAbs(float,float,float,float)}.
*/
- public void curvetoCubicSmoothAbs(float x2, float y2,
+ public void curvetoCubicSmoothAbs(float x2, float y2,
float x, float y) throws ParseException {
}
@@ -142,7 +142,7 @@
* Implements {@link
* PathHandler#curvetoQuadraticRel(float,float,float,float)}.
*/
- public void curvetoQuadraticRel(float x1, float y1,
+ public void curvetoQuadraticRel(float x1, float y1,
float x, float y) throws ParseException {
}
@@ -150,7 +150,7 @@
* Implements {@link
* PathHandler#curvetoQuadraticAbs(float,float,float,float)}.
*/
- public void curvetoQuadraticAbs(float x1, float y1,
+ public void curvetoQuadraticAbs(float x1, float y1,
float x, float y) throws ParseException {
}
@@ -172,9 +172,9 @@
* Implements {@link
* PathHandler#arcRel(float,float,float,boolean,boolean,float,float)}.
*/
- public void arcRel(float rx, float ry,
- float xAxisRotation,
- boolean largeArcFlag, boolean sweepFlag,
+ public void arcRel(float rx, float ry,
+ float xAxisRotation,
+ boolean largeArcFlag, boolean sweepFlag,
float x, float y) throws ParseException {
}
@@ -182,9 +182,9 @@
* Implements {@link
* PathHandler#arcAbs(float,float,float,boolean,boolean,float,float)}.
*/
- public void arcAbs(float rx, float ry,
- float xAxisRotation,
- boolean largeArcFlag, boolean sweepFlag,
+ public void arcAbs(float rx, float ry,
+ float xAxisRotation,
+ boolean largeArcFlag, boolean sweepFlag,
float x, float y) throws ParseException {
}
}
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPointsHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPointsHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPointsHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPointsHandler.java Wed Nov 22 07:19:17 2006
@@ -28,7 +28,7 @@
/**
* The only instance of this class.
*/
- public final static DefaultPointsHandler INSTANCE
+ public static final DefaultPointsHandler INSTANCE
= new DefaultPointsHandler();
/**
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPreserveAspectRatioHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPreserveAspectRatioHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPreserveAspectRatioHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultPreserveAspectRatioHandler.java Wed Nov 22 07:19:17 2006
@@ -29,7 +29,7 @@
/**
* The only instance of this class.
*/
- public final static PreserveAspectRatioHandler INSTANCE
+ public static final PreserveAspectRatioHandler INSTANCE
= new DefaultPreserveAspectRatioHandler();
/**
@@ -44,7 +44,7 @@
*/
public void startPreserveAspectRatio() throws ParseException {
}
-
+
/**
* Implements {@link PreserveAspectRatioHandler#none()}.
*/
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierHandler.java Wed Nov 22 07:19:17 2006
@@ -31,7 +31,7 @@
/**
* The default handler.
*/
- public final static TimingSpecifierHandler INSTANCE
+ public static final TimingSpecifierHandler INSTANCE
= new DefaultTimingSpecifierHandler();
protected DefaultTimingSpecifierHandler() {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierListHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierListHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierListHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTimingSpecifierListHandler.java Wed Nov 22 07:19:17 2006
@@ -31,7 +31,7 @@
/**
* The default handler.
*/
- public final static TimingSpecifierListHandler INSTANCE
+ public static final TimingSpecifierListHandler INSTANCE
= new DefaultTimingSpecifierListHandler();
protected DefaultTimingSpecifierListHandler() {
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTransformListHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTransformListHandler.java?view=diff&rev=478188&r1=478187&r2=478188
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTransformListHandler.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/parser/DefaultTransformListHandler.java Wed Nov 22 07:19:17 2006
@@ -29,7 +29,7 @@
/**
* The only instance of this class.
*/
- public final static TransformListHandler INSTANCE
+ public static final TransformListHandler INSTANCE
= new DefaultTransformListHandler();
/**