You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/07/25 14:46:22 UTC
svn commit: r679781 [29/34] - in
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ ...
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,33 +29,33 @@
// FOP
import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfExternalGraphic;
-/**
- * Class which contains a linear text run. It has methods to add attributes,
+/**
+ * Class which contains a linear text run. It has methods to add attributes,
* text, paragraph breaks....
* @author Peter Herweg, pherweg@web.de
*/
public class RtfTextrun extends RtfContainer {
private boolean bSuppressLastPar = false;
private RtfListItem rtfListItem;
-
+
/** Manager for handling space-* property. */
private RtfSpaceManager rtfSpaceManager = new RtfSpaceManager();
-
+
/** Class which represents the opening of a RTF group mark.*/
private class RtfOpenGroupMark extends RtfElement {
-
+
RtfOpenGroupMark(RtfContainer parent, Writer w, RtfAttributes attr)
throws IOException {
super(parent, w, attr);
}
-
+
/**
* @return true if this element would generate no "useful" RTF content
*/
public boolean isEmpty() {
return false;
}
-
+
/**
* write RTF code of all our children
* @throws IOException for I/O problems
@@ -65,22 +65,22 @@
writeAttributes(getRtfAttributes(), null);
}
}
-
+
/** Class which represents the closing of a RTF group mark.*/
private class RtfCloseGroupMark extends RtfElement {
-
+
RtfCloseGroupMark(RtfContainer parent, Writer w)
throws IOException {
super(parent, w);
}
-
+
/**
* @return true if this element would generate no "useful" RTF content
*/
public boolean isEmpty() {
return false;
}
-
+
/**
* write RTF code of all our children
* @throws IOException for I/O problems
@@ -92,19 +92,19 @@
/** Class which represents a paragraph break.*/
private class RtfParagraphBreak extends RtfElement {
-
+
RtfParagraphBreak(RtfContainer parent, Writer w)
throws IOException {
super(parent, w);
}
-
+
/**
* @return true if this element would generate no "useful" RTF content
*/
public boolean isEmpty() {
return false;
}
-
+
/**
* write RTF code of all our children
* @throws IOException for I/O problems
@@ -113,16 +113,16 @@
writeControlWord("par");
}
}
-
+
/** Create an RTF container as a child of given container */
RtfTextrun(RtfContainer parent, Writer w, RtfAttributes attrs) throws IOException {
super(parent, w, attrs);
}
-
-
+
+
/**
* Adds instance of <code>OpenGroupMark</code> as a child with attributes.
- *
+ *
* @param attrs attributes to add
* @throws IOException for I/O problems
*/
@@ -132,17 +132,17 @@
/**
* Adds instance of <code>CloseGroupMark</code> as a child.
- *
+ *
* @throws IOException for I/O problems
*/
private void addCloseGroupMark() throws IOException {
RtfCloseGroupMark r = new RtfCloseGroupMark(this, writer);
}
-
+
/**
- * Pushes block attributes, notifies all opened blocks about pushing block
+ * Pushes block attributes, notifies all opened blocks about pushing block
* attributes, adds <code>OpenGroupMark</code> as a child.
- *
+ *
* @param attrs the block attributes to push
* @throws IOException for I/O problems
*/
@@ -151,11 +151,11 @@
RtfSpaceSplitter splitter = rtfSpaceManager.pushRtfSpaceSplitter(attrs);
addOpenGroupMark(splitter.getCommonAttributes());
}
-
+
/**
- * Pops block attributes, notifies all opened blocks about pushing block
+ * Pops block attributes, notifies all opened blocks about pushing block
* attributes, adds <code>CloseGroupMark</code> as a child.
- *
+ *
* @throws IOException for I/O problems
*/
public void popBlockAttributes() throws IOException {
@@ -166,7 +166,7 @@
/**
* Pushes inline attributes.
- *
+ *
* @param attrs the inline attributes to push
* @throws IOException for I/O problems
*/
@@ -177,17 +177,17 @@
/**
* Pop inline attributes.
- *
+ *
* @throws IOException for I/O problems
*/
public void popInlineAttributes() throws IOException {
rtfSpaceManager.popInlineAttributes();
addCloseGroupMark();
}
-
+
/**
* Add string to children list.
- *
+ *
* @param s string to add
* @throws IOException for I/O problems
*/
@@ -202,20 +202,20 @@
RtfString r = new RtfString(this, writer, s);
rtfSpaceManager.popRtfSpaceSplitter();
}
-
+
/**
* Inserts a footnote.
- *
+ *
* @return inserted footnote
* @throws IOException for I/O problems
*/
public RtfFootnote addFootnote() throws IOException {
return new RtfFootnote(this, writer);
}
-
+
/**
* Inserts paragraph break before all close group marks.
- *
+ *
* @throws IOException for I/O problems
*/
public void addParagraphBreak() throws IOException {
@@ -241,7 +241,7 @@
}
}
}
-
+
/**
* Inserts a page number.
* @param attr Attributes for the page number to insert.
@@ -250,7 +250,7 @@
public void addPageNumber(RtfAttributes attr) throws IOException {
RtfPageNumber r = new RtfPageNumber(this, writer, attr);
}
-
+
/**
* Inserts a hyperlink.
* @param attr Attributes for the hyperlink to insert.
@@ -260,7 +260,7 @@
public RtfHyperLink addHyperlink(RtfAttributes attr) throws IOException {
return new RtfHyperLink(this, writer, attr);
}
-
+
/**
* Inserts a bookmark.
* @param id Id for the inserted bookmark
@@ -294,7 +294,7 @@
throws IOException {
List list = container.getChildren();
-
+
if (list.size() == 0) {
//add a new RtfTextrun
RtfTextrun textrun = new RtfTextrun(container, writer, attrs);
@@ -302,7 +302,7 @@
return textrun;
}
-
+
Object obj = list.get(list.size() - 1);
if (obj instanceof RtfTextrun) {
@@ -313,18 +313,18 @@
//add a new RtfTextrun as the last child
RtfTextrun textrun = new RtfTextrun(container, writer, attrs);
list.add(textrun);
-
+
return textrun;
}
-
+
/**
* specify, if the last paragraph control word (\par) should be suppressed.
* @param bSuppress true, if the last \par should be suppressed
- */
+ */
public void setSuppressLastPar(boolean bSuppress) {
bSuppressLastPar = bSuppress;
}
-
+
/**
* write RTF code of all our children
* @throws IOException for I/O problems
@@ -336,7 +336,7 @@
* 2. To write the children
* Maybe this can be done more efficient.
*/
-
+
boolean bHasTableCellParent =
this.getParentOfClass(RtfTableCell.class) != null;
RtfAttributes attrBlockLevel = new RtfAttributes();
@@ -349,7 +349,7 @@
break;
}
}
-
+
//get last RtfParagraphBreak, which is not followed by any visible child
RtfParagraphBreak lastParagraphBreak = null;
if (bLast) {
@@ -366,10 +366,10 @@
}
}
}
-
+
//may contain for example \intbl
writeAttributes(attrib, null);
-
+
if (rtfListItem != null) {
rtfListItem.getRtfListStyle().writeParagraphPrefix(this);
}
@@ -384,8 +384,8 @@
if (bHasTableCellParent) {
attrBlockLevel.set(e.getRtfAttributes());
}
-
-
+
+
/**
* -Write RtfParagraphBreak only, if the previous visible child
* was't also a RtfParagraphBreak.
@@ -396,21 +396,21 @@
*/
boolean bHide = false;
bHide = bRtfParagraphBreak;
- bHide = bHide
- && (bPrevPar
- || bFirst
- || (bSuppressLastPar && bLast && lastParagraphBreak != null
+ bHide = bHide
+ && (bPrevPar
+ || bFirst
+ || (bSuppressLastPar && bLast && lastParagraphBreak != null
&& e == lastParagraphBreak));
-
+
if (!bHide) {
newLine();
- e.writeRtf();
-
+ e.writeRtf();
+
if (rtfListItem != null && e instanceof RtfParagraphBreak) {
rtfListItem.getRtfListStyle().writeParagraphPrefix(this);
}
}
-
+
if (e instanceof RtfParagraphBreak) {
bPrevPar = true;
} else if (e instanceof RtfCloseGroupMark) {
@@ -422,26 +422,26 @@
bFirst = bFirst && e.isEmpty();
}
} //for (Iterator it = ...)
-
+
//
if (bHasTableCellParent) {
writeAttributes(attrBlockLevel, null);
}
-
+
}
-
+
/**
* Set the parent list-item of the textrun.
- *
+ *
* @param listItem parent list-item of the textrun
*/
public void setRtfListItem(RtfListItem listItem) {
rtfListItem = listItem;
}
-
+
/**
- * Gets the parent list-item of the textrun.
- *
+ * Gets the parent list-item of the textrun.
+ *
* @return parent list-item of the textrun
*/
public RtfListItem getRtfListItem() {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
txt.setText(newString);
}
}
-
+
/** process one RtfString from our container */
private void processString(RtfString txt) {
final String newString = processString(txt.getText());
@@ -71,7 +71,7 @@
txt.setText(newString);
}
}
-
+
/** process one String */
private String processString(String txt) {
final String orig = txt;
@@ -80,7 +80,7 @@
// to collapse multiple spaces into one
if (orig == null) {
return null;
- } else if (orig.length() > 0) {
+ } else if (orig.length() > 0) {
final boolean allSpaces = orig.trim().length() == 0;
final boolean endSpace = allSpaces
|| Character.isWhitespace(orig.charAt(orig.length() - 1));
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
} else {
//for example "600.0pt" has to be exited,
//when the dot is reached.
- break;
+ break;
}
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,7 +60,7 @@
* as a number-rows-spanned attribute has been found.
*/
private final List colRowSpanningAttrs = new java.util.ArrayList();
-
+
/**
* This ArrayList contains one element for each column in the table.
* value == true means, it's the first of multiple spanned columns
@@ -71,7 +71,7 @@
private boolean bNextRowBelongsToHeader = false;
/**
- *
+ *
* @param value Specifies, if next row belongs to header
*/
public void setNextRowBelongsToHeader(boolean value) {
@@ -79,7 +79,7 @@
}
/**
- *
+ *
* @return true, if next row belongs to header
*/
public boolean getNextRowBelongsToHeader() {
@@ -87,7 +87,7 @@
}
/**
- *
+ *
* @param ctx BuilderContext
*/
public TableContext(BuilderContext ctx) {
@@ -95,7 +95,7 @@
}
/**
- * Adds a column and sets its width.
+ * Adds a column and sets its width.
* @param width Width of next column
*/
public void setNextColumnWidth(Float width) {
@@ -103,7 +103,7 @@
}
/**
- *
+ *
* @return RtfAttributes of current row-spanning cell
*/
public RtfAttributes getColumnRowSpanningAttrs() {
@@ -111,15 +111,15 @@
}
/**
- *
+ *
* @return Number of currently spanned rows
*/
public Integer getColumnRowSpanningNumber() {
return (Integer)colRowSpanningNumber.get(colIndex);
}
-
+
/**
- *
+ *
* @return true, if it's the first of multiple spanning columns
*/
public boolean getFirstSpanningCol() {
@@ -128,7 +128,7 @@
}
/**
- *
+ *
* @param iRowSpanning number of rows to span
* @param attrs RtfAttributes of row-spanning cell
*/
@@ -145,7 +145,7 @@
}
/**
- *
+ *
* @param iRowSpanning number of rows to span in next column
* @param attrs RtfAttributes of row-spanning cell
*/
@@ -154,10 +154,10 @@
colRowSpanningNumber.add(iRowSpanning);
colRowSpanningAttrs.add(colIndex, attrs);
}
-
+
/**
- *
- * @param bFirstSpanningCol specifies, if it's the first of
+ *
+ * @param bFirstSpanningCol specifies, if it's the first of
* multiple spanned columns
*/
public void setCurrentFirstSpanningCol(
@@ -174,8 +174,8 @@
}
/**
- *
- * @param bFirstSpanningCol specifies, if it's the first of
+ *
+ * @param bFirstSpanningCol specifies, if it's the first of
* multiple spanned columns
*/
public void setNextFirstSpanningCol(
@@ -234,7 +234,7 @@
if (colIndex < 0) {
throw new IllegalStateException("colIndex must not be negative!");
} else if (colIndex >= getNumberOfColumns()) {
- log.warn("Column width for column " + (colIndex + 1) + " is not defined, using "
+ log.warn("Column width for column " + (colIndex + 1) + " is not defined, using "
+ INVALID_COLUMN_WIDTH);
while (colIndex >= getNumberOfColumns()) {
setNextColumnWidth(new Float(INVALID_COLUMN_WIDTH));
@@ -250,9 +250,9 @@
public void setColumnIndex(int index) {
colIndex = index;
}
-
+
/**
- * @return Index of current column
+ * @return Index of current column
*/
public int getColumnIndex() {
return colIndex;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/Helper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/Helper.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/Helper.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/Helper.java Fri Jul 25 05:44:20 2008
@@ -30,9 +30,9 @@
private Helper() { }
/**
- * Returns nearest integer to <code>x</code>, divisible by
- * <code>quantum</code>.
- *
+ * Returns nearest integer to <code>x</code>, divisible by
+ * <code>quantum</code>.
+ *
* @param x integer for quantization
* @param quantum integer, representing quantization
* @return computed nearest integer
@@ -44,9 +44,9 @@
}
/**
- * Returns minimal possible integer, greater or equal than
+ * Returns minimal possible integer, greater or equal than
* <code>x</code>, divisible by <code>quantum</code>.
- *
+ *
* @param x integer for quantization
* @param quantum integer, representing quantization
* @return computed nearest integer
@@ -59,7 +59,7 @@
/**
* Returns maximum possible integer, less or equal than
* <code>oldValue</code>, divisible by <code>quantum</code>.
- *
+ *
* @param x integer for quantization
* @param quantum integer, representing quantization
* @return computed nearest integer
@@ -71,9 +71,9 @@
/**
* Returns the closest integer to <code>x/y</code> fraction.
- * It's possible to consider this methos as a analog of Math.round(x/y),
+ * It's possible to consider this methos as a analog of Math.round(x/y),
* without having deal with non-integer.
- *
+ *
* @param x integer, fraction numerator
* @param y integer, fraction denominator
* @return the value of the fraction rounded to the nearest
@@ -84,31 +84,31 @@
}
/**
- * Returns the smallest integer that is greater than or equal to the
+ * Returns the smallest integer that is greater than or equal to the
* <code>x/y</code> fraction.
- * It's possible to consider this function as a analog of Math.ceil(x/y),
+ * It's possible to consider this function as a analog of Math.ceil(x/y),
* without having deal with non-integer.
- *
+ *
* @param x integer, fraction numerator
* @param y integer, fraction denominator
- * @return the smallest integer that is greater than or equal to
+ * @return the smallest integer that is greater than or equal to
* <code>x/y</code> fraction
* @see java.lang.Math#ceil(double)
*/
public static int ceilPosition(int x, int y) {
return ceil(x, y) / y;
}
-
-
+
+
/**
* Returns the largest integer that is less than or equal to the
* argument and is equal to <code>x/y</code> fraction.
- * It's possible to consider this function as a analog of Math.floor(x/y),
+ * It's possible to consider this function as a analog of Math.floor(x/y),
* without having deal with non-integer.
- *
+ *
* @param x integer, fraction numerator
* @param y integer, fraction denominator
- * @return the largest integer that is less than or equal to
+ * @return the largest integer that is less than or equal to
* the argument and is equal to <code>x/y</code> fraction
* @see java.lang.Math#floor(double)
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRenderer.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.txt;
import java.awt.Color;
@@ -40,17 +40,17 @@
/**
* Renderer that renders areas to plain text.
- *
+ *
* @author Art Welch
* @author <a href="mailto:mark-fop@inomial.com">Mark Lillywhite</a> (to use
* the new Renderer interface)
*/
public class TXTRenderer extends AbstractPathOrientedRenderer {
-
+
private static final char LIGHT_SHADE = '\u2591';
-
+
private static final char MEDIUM_SHADE = '\u2592';
-
+
private static final char DARK_SHADE = '\u2593';
private static final char FULL_BLOCK = '\u2588';
@@ -95,7 +95,7 @@
/** Manager for storing border's information. */
private BorderManager bm;
-
+
/** Char for current filling. */
private char fillChar;
@@ -103,7 +103,7 @@
private TXTState currentState = new TXTState();
private String encoding;
-
+
/**
* Constructs a newly allocated <code>TXTRenderer</code> object.
*/
@@ -114,7 +114,7 @@
public String getMimeType() {
return "text/plain";
}
-
+
/**
* Sets the encoding of the target file.
* @param encoding the encoding, null to select the default encoding (UTF-8)
@@ -125,7 +125,7 @@
/**
* Indicates if point (x, y) lay inside currentPage.
- *
+ *
* @param x x coordinate
* @param y y coordinate
* @return <b>true</b> if point lay inside page
@@ -136,7 +136,7 @@
/**
* Add char to text buffer.
- *
+ *
* @param x x coordinate
* @param y y coordinate
* @param ch char to add
@@ -149,7 +149,7 @@
/**
* Add char to text or background buffer.
- *
+ *
* @param x x coordinate
* @param y x coordinate
* @param ch char to add
@@ -168,7 +168,7 @@
/**
* Adds string to text buffer (<code>charData</code>). <p>
* Chars of string map in turn.
- *
+ *
* @param row x coordinate
* @param col y coordinate
* @param s string to add
@@ -181,7 +181,7 @@
/**
* Render TextArea to Text.
- *
+ *
* @param area inline area to render
*/
protected void renderText(TextArea area) {
@@ -211,7 +211,7 @@
pageWidth = Helper.ceilPosition((int) width, CHAR_WIDTH);
pageHeight = Helper.ceilPosition((int) height, CHAR_HEIGHT);
-
+
// init buffers
charData = new StringBuffer[pageHeight];
decoData = new StringBuffer[pageHeight];
@@ -229,8 +229,8 @@
}
/**
- * Projects current page borders (i.e.<code>bm</code>) to buffer for
- * background and images (i.e.<code>decoData</code>).
+ * Projects current page borders (i.e.<code>bm</code>) to buffer for
+ * background and images (i.e.<code>decoData</code>).
*/
private void flushBorderToBuffer() {
for (int x = 0; x < pageWidth; x++) {
@@ -363,14 +363,14 @@
}
/**
- * Does nothing.
+ * Does nothing.
* {@inheritDoc}
*/
protected void moveTo(float x, float y) {
}
/**
- * Does nothing.
+ * Does nothing.
* {@inheritDoc}
*/
protected void lineTo(float x, float y) {
@@ -384,16 +384,16 @@
}
/**
- * Fills rectangle startX, startY, width, height with char
+ * Fills rectangle startX, startY, width, height with char
* <code>charToFill</code>.
- *
+ *
* @param startX x-coordinate of upper left point
* @param startY y-coordinate of upper left point
* @param width width of rectangle
* @param height height of rectangle
- * @param charToFill filling char
+ * @param charToFill filling char
*/
- private void fillRect(int startX, int startY, int width, int height,
+ private void fillRect(int startX, int startY, int width, int height,
char charToFill) {
for (int x = startX; x < startX + width; x++) {
for (int y = startY; y < startY + height; y++) {
@@ -401,7 +401,7 @@
}
}
}
-
+
/**
* Fills a rectangular area with the current filling char.
* {@inheritDoc}
@@ -410,7 +410,7 @@
fillRect(bm.getStartX(), bm.getStartY(), bm.getWidth(), bm.getHeight(),
fillChar);
}
-
+
/**
* Changes current filling char.
* {@inheritDoc}
@@ -423,11 +423,11 @@
// TODO: This fillShase is catually the luminance component of the color
// transformed to the YUV (YPrBb) Colorspace. It should use standard
// Java methods for its conversion instead of the formula given here.
- double fillShade = 0.30f / 255f * col.getRed()
- + 0.59f / 255f * col.getGreen()
+ double fillShade = 0.30f / 255f * col.getRed()
+ + 0.59f / 255f * col.getGreen()
+ 0.11f / 255f * col.getBlue();
fillShade = 1 - fillShade;
-
+
if (fillShade > 0.8f) {
fillChar = FULL_BLOCK;
} else if (fillShade > 0.6f) {
@@ -445,10 +445,10 @@
protected void drawImage(String url, Rectangle2D pos, Map foreignAttributes) {
//No images are painted here
}
-
+
/**
* Fills image rectangle with a <code>IMAGE_CHAR</code>.
- *
+ *
* @param image the base image
* @param pos the position of the image
*/
@@ -457,17 +457,17 @@
int y1 = Helper.ceilPosition(currentBPPosition, CHAR_HEIGHT);
int width = Helper.ceilPosition((int) pos.getWidth(), CHAR_WIDTH);
int height = Helper.ceilPosition((int) pos.getHeight(), CHAR_HEIGHT);
-
+
fillRect(x1, y1, width, height, IMAGE_CHAR);
}
-
+
/**
* Returns the closest integer to the multiplication of a number and 1000.
- *
- * @param x the value of the argument, multiplied by
+ *
+ * @param x the value of the argument, multiplied by
* 1000 and rounded
- * @return the value of the argument multiplied by
+ * @return the value of the argument multiplied by
* 1000 and rounded to the nearest integer
*/
protected int toMilli(float x) {
@@ -476,11 +476,11 @@
/**
* Adds one element of border.
- *
+ *
* @param x x coordinate
* @param y y coordinate
* @param style integer, representing border style
- * @param type integer, representing border element type
+ * @param type integer, representing border element type
*/
private void addBitOfBorder(int x, int y, int style, int type) {
Point point = currentState.transformPoint(x, y);
@@ -542,7 +542,7 @@
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
protected void drawBackAndBorders(Area area, float startx, float starty,
float width, float height) {
@@ -567,10 +567,10 @@
protected void endVParea() {
currentState.pop();
}
-
+
/** {@inheritDoc} */
protected void concatenateTransformationMatrix(AffineTransform at) {
currentState.push(new CTM(ptToMpt(at)));
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,7 +26,7 @@
import org.apache.fop.render.Renderer;
/**
- * TXT Renderer configurator
+ * TXT Renderer configurator
*/
public class TXTRendererConfigurator extends PrintRendererConfigurator {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererMaker.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTRendererMaker.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
public class TXTRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_PLAIN_TEXT};
-
+
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
return new TXTRenderer();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTState.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTState.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTState.java Fri Jul 25 05:44:20 2008
@@ -27,7 +27,7 @@
import org.apache.fop.area.CTM;
/**
- * This keeps information about the current state when writing to txt, i.e.
+ * This keeps information about the current state when writing to txt, i.e.
* manages coordinate transformation matrices for getting absolute coordinates.
*/
public class TXTState {
@@ -36,7 +36,7 @@
private LinkedList stackCTM = new LinkedList();
/**
- * Current result coordinate transformation matrix. It's product of
+ * Current result coordinate transformation matrix. It's product of
* all matrices in order, saved in <code>stackCTM</code>.
*/
private CTM resultCTM = new CTM();
@@ -48,9 +48,9 @@
}
/**
- * Updates result coordinate transformation matrix
+ * Updates result coordinate transformation matrix
* (i.e. <code>resultCTM</code>), multipliing it by given matrix.
- *
+ *
* @param ctm CTM
*/
private void updateResultCTM(CTM ctm) {
@@ -68,9 +68,9 @@
}
/**
- * Push the current coordinate transformation matrix onto the stack and
+ * Push the current coordinate transformation matrix onto the stack and
* reevaluate <code>resultCTM</code>.
- *
+ *
* @param ctm instance of CTM
*/
public void push(CTM ctm) {
@@ -86,11 +86,11 @@
stackCTM.removeLast();
calcResultCTM();
}
-
+
/**
- * Modifies coordinate transformation matrix in such a way, so
+ * Modifies coordinate transformation matrix in such a way, so
* x-shift and y-shift will be transformed in text positions.
- *
+ *
* @param ctm CTM to modify
* @return instance of CTM
*/
@@ -100,13 +100,13 @@
da[4] = Helper.roundPosition((int) da[4], TXTRenderer.CHAR_WIDTH);
// refine y-shift
da[5] = Helper.roundPosition((int) da[5], TXTRenderer.CHAR_HEIGHT);
-
+
return new CTM(da[0], da[1], da[2], da[3], da[4], da[5]);
}
/**
* Transforms <code>point</code> using <code>ctm</code>.
- *
+ *
* @param p Point
* @param ctm CTM
* @return transformed Point
@@ -120,7 +120,7 @@
/**
* Transforms point (x, y) using <code>resultCTM</code>.
- *
+ *
* @param x x-coordinate
* @param y y-coordinate
* @return transformed Point
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTStream.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTStream.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/TXTStream.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.render.txt;
import java.io.IOException;
@@ -26,9 +26,9 @@
* Helper class for text streams.
*/
public class TXTStream {
-
+
private static final String DEFAULT_ENCODING = "UTF-8";
-
+
private OutputStream out = null;
private boolean doOutput = true;
private String encoding = DEFAULT_ENCODING;
@@ -65,7 +65,7 @@
public void setDoOutput(boolean doout) {
doOutput = doout;
}
-
+
/**
* Set the encoding for the text stream.
* @param encoding the encoding, if null, "UTF-8" is chosen as default
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java Fri Jul 25 05:44:20 2008
@@ -33,25 +33,25 @@
public abstract class AbstractBorderElement implements Constants {
/**
- * Constant for a line segment, directing from a center of symbol up
+ * Constant for a line segment, directing from a center of symbol up
* the the symbol boundary.
*/
public static final int UP = 0;
/**
- * Constant for a line segment, directing from a center of symbol right
+ * Constant for a line segment, directing from a center of symbol right
* the the symbol boundary.
*/
public static final int RIGHT = 1;
/**
- * Constant for a line segment, directing from a center of symbol down
+ * Constant for a line segment, directing from a center of symbol down
* the the symbol boundary.
*/
public static final int DOWN = 2;
/**
- * Constant for a line segment, directing from a center of symbol left
+ * Constant for a line segment, directing from a center of symbol left
* the the symbol boundary.
*/
public static final int LEFT = 3;
@@ -63,7 +63,7 @@
protected int[] data = {0, 0, 0, 0};
/**
- * Initializes a newly created <code>AbstractBorderElement</code> object
+ * Initializes a newly created <code>AbstractBorderElement</code> object
* so that it represents an empty border element.
*/
public AbstractBorderElement() {
@@ -71,9 +71,9 @@
/**
* Constructs a newly allocated <code>AbstractBorderElement</code> object.
- * Fills array <code>data</code> using binary representation of
+ * Fills array <code>data</code> using binary representation of
* <code>type</code>.
- *
+ *
* @param type binary representation of type gives <code>data</code>
*/
public AbstractBorderElement(int type) {
@@ -84,7 +84,7 @@
/**
* Returns value of side's element of <code>data</code>.
- *
+ *
* @param side integer, representing side
* @return value of side's element
*/
@@ -94,7 +94,7 @@
/**
* Sets a value for <code>data[side]</code>.
- *
+ *
* @param side integer, representing side
* @param value a new value for <code>data[side]</code>
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/BorderManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/BorderManager.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/BorderManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/BorderManager.java Fri Jul 25 05:44:20 2008
@@ -32,7 +32,7 @@
/** Width of current processed border. */
private int width;
-
+
/** Height of current processed border. */
private int height;
@@ -46,9 +46,9 @@
private TXTState state;
/**
- * Constructs BorderManger, using <code>pageWidth</code> and
+ * Constructs BorderManger, using <code>pageWidth</code> and
* <code>pageHeight</code> for creating <code>borderInfo</code>.
- *
+ *
* @param pageWidth page width
* @param pageHeight page height
* @param state TXTState
@@ -60,12 +60,12 @@
/**
* Adds border element to <code>borderInfo</code>.
- *
+ *
* @param x x-coordinate
* @param y y-coordinate
* @param style border-style
- * @param type border element type, binary representation of wich gives
- * information about availability or absence of corresponding side.
+ * @param type border element type, binary representation of wich gives
+ * information about availability or absence of corresponding side.
*/
public void addBorderElement(int x, int y, int style, int type) {
AbstractBorderElement be = null;
@@ -91,9 +91,9 @@
/**
* @param x x-coordinate
* @param y y-coordinate
- * @return if border element at point (x,y) is available, returns instance
- * of Character, created on char, given by corresponding border element,
- * otherwise returns null.
+ * @return if border element at point (x,y) is available, returns instance
+ * of Character, created on char, given by corresponding border element,
+ * otherwise returns null.
*/
public Character getCharacter(int x, int y) {
Character c = null;
@@ -109,7 +109,7 @@
public int getWidth() {
return width;
}
-
+
/**
* Sets width of current processed border.
* @param width width of border
@@ -117,7 +117,7 @@
public void setWidth(int width) {
this.width = width;
}
-
+
/**
* @return height of current processed border.
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java Fri Jul 25 05:44:20 2008
@@ -25,39 +25,39 @@
* This class is responsible for managing of dashed border elements.
*/
public class DashedBorderElement extends AbstractBorderElement {
-
+
private static final char DASH_HORIZONTAL = '-';
private static final char DASH_VERTICAL = '|';
-
+
private static final char UNDEFINED = '?';
-
+
private static final int UP2 = 1;
-
+
private static final int RIGHT2 = 2;
-
+
private static final int DOWN2 = 4;
-
+
private static final int LEFT2 = 8;
-
+
private static char[] map = new char[20];
-
+
static {
Arrays.fill(map, UNDEFINED);
map[0] = ' ';
map[UP2] = DASH_VERTICAL;
map[DOWN2] = DASH_VERTICAL;
map[UP2 + DOWN2] = DASH_VERTICAL;
-
+
map[LEFT2] = DASH_HORIZONTAL;
map[RIGHT2] = DASH_HORIZONTAL;
map[LEFT2 + RIGHT2] = DASH_HORIZONTAL;
}
-
+
/**
* Constructs a newly allocated <code>DashedBorderElement</code> object.
* Fills <code>data</code> using superclass constructor.
- *
+ *
* @param type binary representation of type gives <code>data</code>
*/
public DashedBorderElement(int type) {
@@ -66,8 +66,8 @@
/**
* Merges dashed border element with instance of solid and double border
- * element, returns instance of <code>SolidAndDoubleBorderElement</code>.
- *
+ * element, returns instance of <code>SolidAndDoubleBorderElement</code>.
+ *
* @param sdb instance of <code>SolidAndDoubleBorderElement</code> to merge
* @return merged border element
*/
@@ -76,13 +76,13 @@
for (int i = 0; i < 4; i++) {
e.setData(i, Math.max(data[i], sdb.getData(i)));
}
- return e;
+ return e;
}
/**
- * Merges dashed border element with dashed border element and returns
- * instance of <code>DashedBorderElement</code>.
- *
+ * Merges dashed border element with dashed border element and returns
+ * instance of <code>DashedBorderElement</code>.
+ *
* @param dbe instance of <code>DashedBorderElement</code> to merge
* @return merged border element
*/
@@ -92,11 +92,11 @@
}
return this;
}
-
+
/**
- * Converts dashed border element to
+ * Converts dashed border element to
* <code>SolidAndDoubleBorderElement</code>.
- *
+ *
* @return converted instance of <code>SolidAndDoubleBorderElement</code>
*/
private AbstractBorderElement toSolidAndDouble() {
@@ -104,7 +104,7 @@
for (int i = 0; i < 4; i++) {
e.setData(i, data[i]);
}
- return e;
+ return e;
}
/**
@@ -124,7 +124,7 @@
return abe;
}
- /**
+ /**
* {@inheritDoc}
*/
public char convert2Char() {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java Fri Jul 25 05:44:20 2008
@@ -23,13 +23,13 @@
* This class is responsible for managing of dotted border elements.
*/
public class DottedBorderElement extends AbstractBorderElement {
-
+
private static final char MIDDLE_DOT = '\u00B7';
/**
* Merges dotted border element with another border element. Here merging
* is quite simple: returning <code>this</code> without any comparing.
- *
+ *
* @param e instance of AbstractBorderElement
* @return instance of DottedBorderElement
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java Fri Jul 25 05:44:20 2008
@@ -47,67 +47,67 @@
private static final char LIGHT_UP_AND_HORIZONTAL = '\u2534';
private static final char LIGHT_VERTICAL_AND_HORIZONTAL = '\u253C';
-
+
private static final char DOUBLE_HORIZONTAL = '\u2550';
private static final char DOUBLE_VERTICAL = '\u2551';
-
- private static final char DOUBLE_DOWN_AND_RIGHT = '\u2554';
+
+ private static final char DOUBLE_DOWN_AND_RIGHT = '\u2554';
private static final char DOUBLE_DOWN_AND_LEFT = '\u2557';
private static final char DOUBLE_UP_AND_RIGHT = '\u255A';
private static final char DOUBLE_UP_AND_LEFT = '\u255D';
-
+
private static final char DOUBLE_VERTICAL_AND_RIGHT = '\u2560';
-
+
private static final char DOUBLE_VERTICAL_AND_LEFT = '\u2563';
-
+
private static final char DOUBLE_DOWN_AND_HORIZONTAL = '\u2566';
-
+
private static final char DOUBLE_UP_AND_HORIZONTAL = '\u2569';
-
+
private static final char DOUBLE_VERTICAL_AND_HORIZONTAL = '\u256C';
-
+
private static final char DOWN_SINGLE_AND_RIGHT_DOUBLE = '\u2552';
-
+
private static final char DOWN_DOUBLE_AND_RIGHT_SINGLE = '\u2553';
private static final char DOWN_SINGLE_AND_LEFT_DOUBLE = '\u2555';
private static final char DOWN_DOUBLE_AND_LEFT_SINGLE = '\u2556';
-
+
private static final char UP_SINGLE_AND_RIGHT_DOUBLE = '\u2558';
-
+
private static final char UP_DOUBLE_AND_RIGHT_SINGLE = '\u2559';
-
+
private static final char UP_SINGLE_AND_LEFT_DOUBLE = '\u255B';
-
+
private static final char UP_DOUBLE_AND_LEFT_SINGLE = '\u255C';
-
+
private static final char VERTICAL_SINGLE_AND_RIGHT_DOUBLE = '\u255E';
-
+
private static final char VERTICAL_DOUBLE_AND_RIGHT_SINGLE = '\u255F';
-
+
private static final char VERTICAL_SINGLE_AND_LEFT_DOUBLE = '\u2561';
-
+
private static final char VERTICAL_DOUBLE_AND_LEFT_SINGLE = '\u2562';
-
+
private static final char DOWN_SINGLE_AND_HORIZONTAL_DOUBLE = '\u2564';
-
+
private static final char DOWN_DOUBLE_AND_HORIZONTAL_SINGLE = '\u2565';
-
+
private static final char UP_SINGLE_AND_HORIZONTAL_DOUBLE = '\u2567';
-
+
private static final char UP_DOUBLE_AND_HORIZONTAL_SINGLE = '\u2568';
-
+
private static final char VERTICAL_SINGLE_AND_HORIZONTAL_DOUBLE = '\u256A';
-
+
private static final char VERTICAL_DOUBLE_AND_HORIZONTAL_SINGLE = '\u256B';
-
+
private static final char UNDEFINED = '?';
-
+
private static final int UP3 = 1;
private static final int DOWN3 = 3;
@@ -174,19 +174,19 @@
}
/**
- * Initializes a newly created <code>SolidAndDoubleBorderElement</code>
+ * Initializes a newly created <code>SolidAndDoubleBorderElement</code>
* object so that it represents an empty border element.
*/
public SolidAndDoubleBorderElement() {
}
/**
- * Constructs a newly allocated <code>SolidAndDoubleBorderElement</code>
- * object. Fills <code>data</code> using binary representation of
- * <code>type</code>. If border style is EN_DOUBLE, multiplies
- * <code>data[side]</code> by 2 for every side to distinguish EN_SOLID and
+ * Constructs a newly allocated <code>SolidAndDoubleBorderElement</code>
+ * object. Fills <code>data</code> using binary representation of
+ * <code>type</code>. If border style is EN_DOUBLE, multiplies
+ * <code>data[side]</code> by 2 for every side to distinguish EN_SOLID and
* EN_DOUBLE.
- *
+ *
* @param style integer, representing border style.
* @param type binary representation of type gives <code>data</code>
*/
@@ -198,7 +198,7 @@
}
}
}
-
+
/**
* Merges with <code>sde</code>.
* @param sde instance of SolidAndDoubleBorderElement
@@ -232,10 +232,10 @@
}
return abe;
}
-
+
/**
* Maps to char.
- * @return resulting mapping char
+ * @return resulting mapping char
*/
private char map2Char() {
int key = 0;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -88,7 +88,7 @@
* @param comment the comment
*/
protected void comment(String comment) {
- if (handler instanceof LexicalHandler) {
+ if (handler instanceof LexicalHandler) {
try {
((LexicalHandler) handler).comment(comment.toCharArray(), 0, comment.length());
} catch (SAXException saxe) {
@@ -96,7 +96,7 @@
}
}
}
-
+
/**
* Starts a new element (without attributes).
* @param tagName tag name of the element
@@ -158,7 +158,7 @@
* @param value value of the attribute
*/
protected void addAttribute(QName name, String value) {
- atts.addAttribute(name.getNamespaceURI(), name.getLocalName(), name.getQName(),
+ atts.addAttribute(name.getNamespaceURI(), name.getLocalName(), name.getQName(),
CDATA, value);
}
@@ -175,7 +175,7 @@
return "" + (int) rect.getX() + " " + (int) rect.getY() + " "
+ (int) rect.getWidth() + " " + (int) rect.getHeight();
}
-
+
/**
* Adds a new attribute to the protected member variable "atts".
* @param name name of the attribute
@@ -259,7 +259,7 @@
* @param attachments a list of extension attachments
*/
protected abstract void handleExtensionAttachments(List attachments);
-
+
/**
* Renders a bookmark tree
* @param odi the bookmark data
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRenderer.java Fri Jul 25 05:44:20 2008
@@ -92,7 +92,7 @@
* Renderer that renders areas to XML for debugging purposes.
* This creates an xml that contains the information of the area
* tree. It does not output any state or derived information.
- * The output can be used to build a new area tree which can be
+ * The output can be used to build a new area tree which can be
* rendered to any renderer.
*/
public class XMLRenderer extends AbstractXMLRenderer {
@@ -148,7 +148,7 @@
public void setCompactFormat(boolean compact) {
this.compactFormat = compact;
}
-
+
private boolean isDetailedFormat() {
return !this.compactFormat;
}
@@ -243,7 +243,7 @@
}
}
}
-
+
transferForeignObjects(area);
}
@@ -261,7 +261,7 @@
while (iter.hasNext()) {
Map.Entry entry = (Map.Entry)iter.next();
String qn = "xmlns:" + (String)entry.getKey();
- atts.addAttribute("", (String)entry.getKey(), qn,
+ atts.addAttribute("", (String)entry.getKey(), qn,
CDATA, (String)entry.getValue());
}
}
@@ -606,7 +606,7 @@
renderBlocks(block, children);
}
}
-
+
/** {@inheritDoc} */
protected void renderBlock(Block block) {
atts.clear();
@@ -779,7 +779,7 @@
protected void renderWord(WordArea word) {
atts.clear();
addAttribute("offset", word.getOffset());
- int[] letterAdjust = word.getLetterAdjustArray();
+ int[] letterAdjust = word.getLetterAdjustArray();
if (letterAdjust != null) {
StringBuffer sb = new StringBuffer(64);
boolean nonZeroFound = false;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRendererMaker.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRendererMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/xml/XMLRendererMaker.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
public class XMLRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_FOP_AREA_TREE};
-
+
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
return new XMLRenderer();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopPrintServlet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopPrintServlet.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopPrintServlet.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopPrintServlet.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -53,31 +53,31 @@
* <br/>
* Example URL: http://servername/fop/servlet/FopPrintServlet?xml=data.xml&xsl=format.xsl
* <br/>
- * <b>Note:</b> This servlet is derived from FopServlet. Most methods are inherited from the
+ * <b>Note:</b> This servlet is derived from FopServlet. Most methods are inherited from the
* superclass. Only the differences to the base class are necessary.
- *
+ *
* @author <a href="mailto:fop-dev@xmlgraphics.apache.org">Apache FOP Development Team</a>
* @version $Id$
*/
public class FopPrintServlet extends FopServlet {
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
protected void render(Source src, Transformer transformer, HttpServletResponse response)
throws FOPException, TransformerException, IOException {
FOUserAgent foUserAgent = getFOUserAgent();
-
+
//Setup FOP
Fop fop = fopFactory.newFop(MimeConstants.MIME_FOP_PRINT, foUserAgent);
-
+
//Make sure the XSL transformation's result is piped through to FOP
Result res = new SAXResult(fop.getDefaultHandler());
-
+
//Start the transformation and rendering process
transformer.transform(src, res);
-
+
//Return the result
reportOK(response);
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopServlet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopServlet.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopServlet.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/FopServlet.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -85,7 +85,7 @@
/** The FopFactory used to create Fop instances */
protected FopFactory fopFactory = null;
/** URIResolver for use by this servlet */
- protected URIResolver uriResolver;
+ protected URIResolver uriResolver;
/**
* {@inheritDoc}
@@ -101,7 +101,7 @@
this.fopFactory.setURIResolver(this.uriResolver);
configureFopFactory();
}
-
+
/**
* This method is called right after the FopFactory is instantiated and can be overridden
* by subclasses to perform additional configuration.
@@ -111,7 +111,7 @@
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
@@ -163,7 +163,7 @@
response.getOutputStream().write(content);
response.getOutputStream().flush();
}
-
+
/**
* Renders an XSL-FO file into a PDF file. The PDF is written to a byte
* array that is returned as the method's result.
@@ -252,7 +252,7 @@
//Return the result
sendPDF(out.toByteArray(), response);
}
-
+
/** @return a new FOUserAgent for FOP */
protected FOUserAgent getFOUserAgent() {
FOUserAgent userAgent = fopFactory.newFOUserAgent();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/ServletContextURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/ServletContextURIResolver.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/ServletContextURIResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/servlet/ServletContextURIResolver.java Fri Jul 25 05:44:20 2008
@@ -37,9 +37,9 @@
/** The protocol name for the servlet context URIs. */
public static final String SERVLET_CONTEXT_PROTOCOL = "servlet-context:";
-
+
private ServletContext servletContext;
-
+
/**
* Main constructor
* @param servletContext the servlet context to access the resources through
@@ -47,14 +47,14 @@
public ServletContextURIResolver(ServletContext servletContext) {
this.servletContext = servletContext;
}
-
+
/** {@inheritDoc} */
public Source resolve(String href, String base) throws TransformerException {
if (href.startsWith(SERVLET_CONTEXT_PROTOCOL)) {
return resolveServletContextURI(href.substring(SERVLET_CONTEXT_PROTOCOL.length()));
} else {
- if (base != null
- && base.startsWith(SERVLET_CONTEXT_PROTOCOL)
+ if (base != null
+ && base.startsWith(SERVLET_CONTEXT_PROTOCOL)
&& (href.indexOf(':') < 0)) {
String abs = base + href;
return resolveServletContextURI(
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/ACIUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/ACIUtils.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/ACIUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/ACIUtils.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@
Map.Entry entry = (Map.Entry)i.next();
if (entry.getValue() != null) {
System.out.println(entry.getKey() + ": " + entry.getValue());
- }
+ }
}
int start = aci.getBeginIndex();
System.out.print("AttrRuns: ");
@@ -54,7 +54,7 @@
aci.setIndex(end);
if (start == end) {
break;
- }
+ }
start = end;
}
System.out.println("");
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.svg;
import org.apache.batik.bridge.UserAgent;
@@ -40,7 +40,7 @@
public abstract class AbstractFOPTranscoder extends SVGAbstractTranscoder {
/**
- * The key to specify whether to stroke text instead of using text
+ * The key to specify whether to stroke text instead of using text
* operations.
*/
public static final TranscodingHints.Key KEY_STROKE_TEXT = new BooleanKey();
@@ -69,7 +69,7 @@
hints.put(KEY_DOM_IMPLEMENTATION,
SVGDOMImplementation.getDOMImplementation());
}
-
+
/**
* Creates and returns the default user agent for this transcoder. Override
* this method if you need non-default behaviour.
@@ -78,7 +78,7 @@
protected UserAgent createUserAgent() {
return new FOPTranscoderUserAgent();
}
-
+
/**
* @param logger
*/
@@ -93,9 +93,9 @@
public void setEntityResolver(EntityResolver resolver) {
this.resolver = resolver;
}
-
+
/**
- * Returns the logger associated with this transcoder. It returns a
+ * Returns the logger associated with this transcoder. It returns a
* SimpleLog if no logger has been explicitly set.
* @return Logger the logger for the transcoder.
*/
@@ -106,7 +106,7 @@
}
return this.logger;
}
-
+
/**
* Creates a <tt>DocumentFactory</tt> that is used to create an SVG DOM
* tree. The specified DOM Implementation is ignored and the Batik
@@ -118,7 +118,7 @@
*/
protected DocumentFactory createDocumentFactory(DOMImplementation domImpl,
String parserClassname) {
- final FOPSAXSVGDocumentFactory factory
+ final FOPSAXSVGDocumentFactory factory
= new FOPSAXSVGDocumentFactory(parserClassname);
if (this.resolver != null) {
factory.setAdditionalEntityResolver(this.resolver);
@@ -141,18 +141,18 @@
}
return stroke;
}
-
+
// --------------------------------------------------------------------
// FOP's default error handler (for transcoders)
// --------------------------------------------------------------------
/**
* This is the default transcoder error handler for FOP. It logs error
- * to an Commons Logger instead of to System.out. The remaining behaviour
+ * to an Commons Logger instead of to System.out. The remaining behaviour
* is the same as Batik's DefaultErrorHandler.
- */
+ */
protected class FOPErrorHandler implements ErrorHandler {
-
+
/**
* {@inheritDoc}
*/
@@ -244,5 +244,5 @@
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.svg;
import java.io.IOException;
@@ -41,7 +41,7 @@
public FOPSAXSVGDocumentFactory(String parser) {
super(parser);
}
-
+
/**
* Sets an additional entity resolver. It will be used before the default
* entity resolving.
@@ -50,9 +50,9 @@
public void setAdditionalEntityResolver(EntityResolver resolver) {
this.additionalResolver = resolver;
}
-
+
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/GraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/GraphicsConfiguration.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/GraphicsConfiguration.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/GraphicsConfiguration.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.svg;
@@ -27,8 +27,8 @@
* compilation errors.
* The version for JDK 1.4 needs to add an override for the abstract
* createCompatibleVolatileImage() method. It can't be overidden
- * for JDK 1.3 because there is no VolatileImage there.
- *
+ * for JDK 1.3 because there is no VolatileImage there.
+ *
*/
abstract public class GraphicsConfiguration extends java.awt.GraphicsConfiguration {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFAElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFAElementBridge.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFAElementBridge.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFAElementBridge.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.svg;
import java.awt.geom.AffineTransform;
@@ -55,7 +55,7 @@
public AffineTransform getCurrentTransform() {
return this.transform;
}
-
+
/**
* Returns 'a'.
* @return the name of this node
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFANode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFANode.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFANode.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFANode.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.svg;
import org.apache.batik.gvt.CompositeGraphicsNode;
@@ -102,7 +102,7 @@
}
}
} catch (Exception e) {
- //TODO Move this to setDestination() and throw an IllegalArgumentException
+ //TODO Move this to setDestination() and throw an IllegalArgumentException
e.printStackTrace();
}
Rectangle2D destRect = new Rectangle2D.Float(x, y, width, height);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
public class PDFBatikFlowTextElementBridge extends BatikFlowTextElementBridge {
private PDFTextPainter textPainter;
-
+
/**
* Main Constructor.
* @param fontInfo the font directory
@@ -40,7 +40,7 @@
public PDFBatikFlowTextElementBridge(FontInfo fontInfo) {
this.textPainter = new PDFFlowExtTextPainter(fontInfo);
}
-
+
/** {@inheritDoc} */
protected GraphicsNode instantiateGraphicsNode() {
GraphicsNode node = super.instantiateGraphicsNode();
@@ -58,5 +58,5 @@
public TextPainter getTextPainter() {
return this.textPainter;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBridgeContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBridgeContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBridgeContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFBridgeContext.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
* BridgeContext which registers the custom bridges for PDF output.
*/
public class PDFBridgeContext extends BridgeContext {
-
+
/** The font list. */
private final FontInfo fontInfo;
@@ -44,7 +44,7 @@
private final ImageSessionContext imageSessionContext;
private AffineTransform linkTransform;
-
+
/**
* Constructs a new bridge context.
* @param userAgent the user agent
@@ -75,8 +75,8 @@
* @param linkTransform AffineTransform to properly place links,
* may be null
*/
- public PDFBridgeContext(UserAgent userAgent,
- FontInfo fontInfo,
+ public PDFBridgeContext(UserAgent userAgent,
+ FontInfo fontInfo,
ImageManager imageManager,
ImageSessionContext imageSessionContext,
AffineTransform linkTransform) {
@@ -115,12 +115,12 @@
public ImageSessionContext getImageSessionContext() {
return this.imageSessionContext;
}
-
+
private void putPDFElementBridgeConditional(String className, String testFor) {
try {
Class.forName(testFor);
//if we get here the test class is available
-
+
Class clazz = Class.forName(className);
Constructor constructor = clazz.getConstructor(new Class[] {FontInfo.class});
putBridge((Bridge)constructor.newInstance(new Object[] {fontInfo}));
@@ -128,7 +128,7 @@
//simply ignore (bridges instantiated over this method are optional)
}
}
-
+
/** {@inheritDoc} */
public void registerSVGBridges() {
super.registerSVGBridges();
@@ -136,7 +136,7 @@
if (fontInfo != null) {
PDFTextElementBridge textElementBridge = new PDFTextElementBridge(fontInfo);
putBridge(textElementBridge);
-
+
//Batik flow text extension (may not always be available)
//putBridge(new PDFBatikFlowTextElementBridge(fontInfo);
putPDFElementBridgeConditional(
@@ -148,7 +148,7 @@
putPDFElementBridgeConditional(
"org.apache.fop.svg.PDFSVG12TextElementBridge",
"org.apache.batik.bridge.svg12.SVG12TextElementBridge");
-
+
//putBridge(new PDFSVGFlowRootElementBridge(fontInfo));
putPDFElementBridgeConditional(
"org.apache.fop.svg.PDFSVGFlowRootElementBridge",
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFContext.java Fri Jul 25 05:44:20 2008
@@ -31,7 +31,7 @@
/** number of pages generated */
private int pagecount;
-
+
/** @return true if a page is set up for painting. */
public boolean isPagePending() {
return this.currentPage != null;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org