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 [5/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/ e...
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineArea.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,7 +29,7 @@
* in a line area.
*/
public class InlineArea extends Area {
-
+
/**
* this class stores information about potential adjustments
* that can be used in order to re-compute adjustments when a
@@ -42,7 +42,7 @@
protected int availableShrink;
/** total adjustment (= ipd - width of fixed elements) */
protected int adjustment;
-
+
/**
* Constructor
*
@@ -55,10 +55,10 @@
availableShrink = shrink;
adjustment = adj;
}
-
+
/**
* Apply the variation factor
- *
+ *
* @param variationFactor the factor by which the adjustment is to be changed
* @return the IPD increase
*/
@@ -68,19 +68,19 @@
return adjustment - oldAdjustment;
}
}
-
+
/**
* offset position from before edge of parent area
*/
protected int offset = 0;
-
+
/**
* parent area
* it is needed in order to recompute adjust ratio and indents
* when a page-number or a page-number-citation is resolved
*/
private Area parentArea = null;
-
+
/**
* ipd variation of child areas: if this area has not already
* been added and cannot notify its parent area, store the variation
@@ -92,7 +92,7 @@
* The adjustment information object
*/
protected InlineAdjustingInfo adjustingInfo = null;
-
+
/**
* @return the adjustment information object
*/
@@ -109,7 +109,7 @@
public void setAdjustingInfo(int stretch, int shrink, int adjustment) {
adjustingInfo = new InlineAdjustingInfo(stretch, shrink, adjustment);
}
-
+
/**
* Modify the adjustment value in the adjustment information object
* @param adjustment the new adjustment value
@@ -119,7 +119,7 @@
adjustingInfo.adjustment = adjustment;
}
}
-
+
/**
* Increase the inline progression dimensions of this area.
* This is used for inline parent areas that contain mulitple child areas.
@@ -165,7 +165,7 @@
public Area getParentArea() {
return parentArea;
}
-
+
/**
* Set the parent for the child area.
*
@@ -177,7 +177,7 @@
((InlineArea) childArea).setParentArea(this);
}
}
-
+
/**
*@return true if the inline area is underlined.
*/
@@ -189,17 +189,17 @@
public boolean hasOverline() {
return getTraitAsBoolean(Trait.OVERLINE);
}
-
+
/** @return true if the inline area has a line through. */
public boolean hasLineThrough() {
return getTraitAsBoolean(Trait.LINETHROUGH);
}
-
+
/** @return true if the inline area is blinking. */
public boolean isBlinking() {
return getTraitAsBoolean(Trait.BLINK);
}
-
+
/**
* recursively apply the variation factor to all descendant areas
* @param variationFactor the variation factor that must be applied to adjustments
@@ -215,12 +215,12 @@
}
return false;
}
-
+
public void handleIPDVariation(int ipdVariation) {
increaseIPD(ipdVariation);
notifyIPDVariation(ipdVariation);
}
-
+
/**
* notify the parent area about the ipd variation of this area
* or of a descendant area
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineBlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineBlockParent.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/area/inline/InlineParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineParent.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineParent.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/InlineParent.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 @@
/** Controls whether the IPD is automatically adjusted based on the area's children. */
protected transient boolean autoSize;
-
+
/**
* Create a new inline parent to add areas to.
*/
@@ -82,7 +82,7 @@
public boolean applyVariationFactor(double variationFactor,
int lineStretch, int lineShrink) {
boolean bUnresolvedAreasPresent = false;
- // recursively apply variation factor to descendant areas
+ // recursively apply variation factor to descendant areas
for (int i = 0, len = inlines.size(); i < len; i++) {
bUnresolvedAreasPresent |= ((InlineArea)inlines.get(i))
.applyVariationFactor(variationFactor, lineStretch, lineShrink);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Leader.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Leader.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Leader.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.
@@ -71,7 +71,7 @@
setRuleStyle(Constants.EN_NONE);
}
}
-
+
/**
* Set the rule thickness of the rule in miilipoints.
*
@@ -104,7 +104,7 @@
throw new IllegalStateException("Unsupported rule style: " + getRuleStyle());
}
}
-
+
/**
* Get the rule thickness of the rule in miilipoints.
*
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Space.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Space.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Space.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Space.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/area/inline/SpaceArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/SpaceArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/SpaceArea.java Fri Jul 25 05:44:20 2008
@@ -22,7 +22,7 @@
* A space
*/
public class SpaceArea extends InlineArea {
-
+
/**
* The space for this space area
*/
@@ -44,7 +44,7 @@
offset = o;
isAdjustable = a;
}
-
+
/**
* @return Returns the space.
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/TextArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/TextArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/TextArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/TextArea.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.
@@ -47,20 +47,20 @@
public void removeText() {
inlines.clear();
}
-
+
/**
* Create and add a WordArea child to this TextArea.
- *
+ *
* @param word the word string
* @param offset the offset for the next area
*/
public void addWord(String word, int offset) {
addWord(word, offset, null);
}
-
+
/**
* Create and add a WordArea child to this TextArea.
- *
+ *
* @param word the word string
* @param offset the offset for the next area
*/
@@ -69,10 +69,10 @@
addChildArea(wordArea);
wordArea.setParentArea(this);
}
-
+
/**
* Create and add a SpaceArea child to this TextArea
- *
+ *
* @param space the space character
* @param offset the offset for the next area
* @param adjustable is this space adjustable?
@@ -82,13 +82,13 @@
addChildArea(spaceArea);
spaceArea.setParentArea(this);
}
-
+
/**
* Get the whole text string.
- * Renderers whose space adjustment handling is not affected
+ * Renderers whose space adjustment handling is not affected
* by multi-byte characters can use this method to render the
- * whole TextArea at once; the other renderers (for example
- * PDFRenderer) have to implement renderWord(WordArea) and
+ * whole TextArea at once; the other renderers (for example
+ * PDFRenderer) have to implement renderWord(WordArea) and
* renderSpace(SpaceArea) in order to correctly place each
* text fragment.
*
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.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.area.inline;
import org.apache.fop.area.PageViewport;
@@ -41,10 +41,10 @@
public static final boolean FIRST = true;
/** Indicates that the reference refers to the last area generated by a formatting object. */
public static final boolean LAST = false;
-
+
//Transient fields
private transient Font font;
-
+
/**
* Create a new unresolved page number.
*
@@ -54,7 +54,7 @@
public UnresolvedPageNumber(String id, Font f) {
this(id, f, FIRST);
}
-
+
/**
* Create a new unresolved page number.
*
@@ -98,7 +98,7 @@
PageViewport page;
if (pageType == FIRST) {
page = (PageViewport)pages.get(0);
- } else {
+ } else {
page = (PageViewport)pages.get(pages.size() - 1);
}
// replace the text
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Viewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Viewport.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Viewport.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/Viewport.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.
@@ -91,7 +91,7 @@
public void setContent(Area content) {
this.content = content;
}
-
+
/**
* Get the content area for this viewport.
*
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/WordArea.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/WordArea.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/WordArea.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/area/inline/WordArea.java Fri Jul 25 05:44:20 2008
@@ -25,10 +25,10 @@
/** The text for this word area */
protected String word;
-
+
/** The correction offset for the next area */
protected int offset = 0;
-
+
/** An array of width for adjusting the individual letters (optional) */
protected int[] letterAdjust;
@@ -63,10 +63,10 @@
public void setOffset(int o) {
offset = o;
}
-
+
/** @return the array of letter adjust widths */
public int[] getLetterAdjustArray() {
return this.letterAdjust;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/AreaTreeInputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/AreaTreeInputHandler.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/AreaTreeInputHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/AreaTreeInputHandler.java Fri Jul 25 05:44:20 2008
@@ -43,7 +43,7 @@
* Constructor for XML->XSLT->area tree XML input
* @param xmlfile XML file
* @param xsltfile XSLT file
- * @param params Vector of command-line parameters (name, value,
+ * @param params Vector of command-line parameters (name, value,
* name, value, ...) for XSL stylesheet, null if none
*/
public AreaTreeInputHandler(File xmlfile, File xsltfile, Vector params) {
@@ -59,20 +59,20 @@
}
/** {@inheritDoc} */
- public void renderTo(FOUserAgent userAgent, String outputFormat, OutputStream out)
+ public void renderTo(FOUserAgent userAgent, String outputFormat, OutputStream out)
throws FOPException {
FontInfo fontInfo = new FontInfo();
- AreaTreeModel treeModel = new RenderPagesModel(userAgent,
+ AreaTreeModel treeModel = new RenderPagesModel(userAgent,
outputFormat, fontInfo, out);
-
+
//Iterate over all intermediate files
AreaTreeParser parser = new AreaTreeParser();
-
+
// Resulting SAX events (the generated FO) must be piped through to FOP
Result res = new SAXResult(parser.getContentHandler(treeModel, userAgent));
transformTo(res);
-
+
try {
treeModel.endDocument();
} catch (SAXException e) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/CommandLineOptions.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/CommandLineOptions.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/CommandLineOptions.java Fri Jul 25 05:44:20 2008
@@ -138,7 +138,6 @@
* Parse the command line arguments.
* @param args the command line arguments.
* @throws FOPException for general errors
- * @throws FileNotFoundException if an input file wasn't found
* @throws IOException if the the configuration file could not be loaded
* @return true if the processing can continue, false to abort
*/
@@ -310,8 +309,6 @@
i = i + parseFOOutputOption(args, i);
} else if (args[i].equals("-out")) {
i = i + parseCustomOutputOption(args, i);
- } else if (args[i].charAt(0) != '-') {
- i = i + parseUnknownOption(args, i);
} else if (args[i].equals("-at")) {
i = i + parseAreaTreeOption(args, i);
} else if (args[i].equals("-if")) {
@@ -340,6 +337,8 @@
getPDFEncryptionParams().setAllowEditContent(false);
} else if (args[i].equals("-noannotations")) {
getPDFEncryptionParams().setAllowEditAnnotations(false);
+ } else if (!isOption(args[i])) {
+ i = i + parseUnknownOption(args, i);
} else {
printUsage();
return false;
@@ -350,7 +349,7 @@
private int parseConfigurationOption(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("if you use '-c', you must specify "
+ "the name of the configuration file");
} else {
@@ -361,7 +360,7 @@
private int parseLanguageOption(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("if you use '-l', you must specify a language");
} else {
Locale.setDefault(new Locale(args[i + 1], ""));
@@ -371,7 +370,7 @@
private int parseResolution(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException(
"if you use '-dpi', you must specify a resolution (dots per inch)");
} else {
@@ -383,7 +382,7 @@
private int parseFOInputOption(String[] args, int i) throws FOPException {
inputmode = FO_INPUT;
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the fo file for the '-fo' option");
} else {
String filename = args[i + 1];
@@ -399,7 +398,7 @@
private int parseXSLInputOption(String[] args, int i) throws FOPException {
inputmode = XSLT_INPUT;
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the stylesheet "
+ "file for the '-xsl' option");
} else {
@@ -411,7 +410,7 @@
private int parseXMLInputOption(String[] args, int i) throws FOPException {
inputmode = XSLT_INPUT;
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the input file "
+ "for the '-xml' option");
} else {
@@ -433,7 +432,7 @@
private int parsePDFOutputOption(String[] args, int i, String pdfAMode) throws FOPException {
setOutputMode(MimeConstants.MIME_PDF);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the PDF output file");
} else {
setOutputFile(args[i + 1]);
@@ -455,14 +454,28 @@
}
}
+ /**
+ * Checks whether the given argument is the next option or the specification of
+ * stdin/stdout.
+ *
+ * TODO this is very ad-hoc and should be better handled. Consider the adoption of
+ * Apache Commons CLI.
+ *
+ * @param arg an argument
+ * @return true if the argument is an option ("-something"), false otherwise
+ */
+ private boolean isOption(String arg) {
+ return arg.length() > 1 && arg.startsWith("-");
+ }
+
private boolean isSystemInOutFile(String filename) {
- return "#".equals(filename);
+ return "-".equals(filename);
}
private int parseMIFOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_MIF);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the MIF output file");
} else {
setOutputFile(args[i + 1]);
@@ -473,7 +486,7 @@
private int parseRTFOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_RTF);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the RTF output file");
} else {
setOutputFile(args[i + 1]);
@@ -484,7 +497,7 @@
private int parseTIFFOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_TIFF);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the TIFF output file");
} else {
setOutputFile(args[i + 1]);
@@ -495,7 +508,7 @@
private int parsePNGOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_PNG);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the PNG output file");
} else {
setOutputFile(args[i + 1]);
@@ -530,7 +543,7 @@
private int parseCopiesOption(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the number of copies");
} else {
renderingOptions.put(PrintRenderer.COPIES, new Integer(args[i + 1]));
@@ -541,7 +554,7 @@
private int parsePCLOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_PCL);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the PDF output file");
} else {
setOutputFile(args[i + 1]);
@@ -552,7 +565,7 @@
private int parsePostscriptOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_POSTSCRIPT);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the PostScript output file");
} else {
setOutputFile(args[i + 1]);
@@ -563,7 +576,7 @@
private int parseTextOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_PLAIN_TEXT);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the text output file");
} else {
setOutputFile(args[i + 1]);
@@ -574,7 +587,7 @@
private int parseSVGOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_SVG);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the SVG output file");
} else {
setOutputFile(args[i + 1]);
@@ -585,7 +598,7 @@
private int parseAFPOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_AFP);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the AFP output file");
} else {
setOutputFile(args[i + 1]);
@@ -596,7 +609,7 @@
private int parseFOOutputOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_XSL_FO);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the FO output file");
} else {
setOutputFile(args[i + 1]);
@@ -619,8 +632,8 @@
}
}
if ((i + 2 >= args.length)
- || (args[i + 1].charAt(0) == '-')
- || (args[i + 2].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))
+ || (isOption(args[i + 2]))) {
throw new FOPException("you must specify the output format and the output file");
} else {
setOutputMode(mime);
@@ -632,7 +645,12 @@
private int parseUnknownOption(String[] args, int i) throws FOPException {
if (inputmode == NOT_SET) {
inputmode = FO_INPUT;
- fofile = new File(args[i]);
+ String filename = args[i];
+ if (isSystemInOutFile(filename)) {
+ this.useStdIn = true;
+ } else {
+ fofile = new File(filename);
+ }
} else if (outputmode == null) {
outputmode = MimeConstants.MIME_PDF;
setOutputFile(args[i]);
@@ -646,10 +664,10 @@
private int parseAreaTreeOption(String[] args, int i) throws FOPException {
setOutputMode(MimeConstants.MIME_FOP_AREA_TREE);
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the area-tree output file");
} else if ((i + 2 == args.length)
- || (args[i + 2].charAt(0) == '-')) {
+ || (isOption(args[i + 2]))) {
// only output file is specified
setOutputFile(args[i + 1]);
return 1;
@@ -681,7 +699,7 @@
private int parseAreaTreeInputOption(String[] args, int i) throws FOPException {
inputmode = AREATREE_INPUT;
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the Area Tree file for the '-atin' option");
} else {
String filename = args[i + 1];
@@ -697,7 +715,7 @@
private int parseImageInputOption(String[] args, int i) throws FOPException {
inputmode = IMAGE_INPUT;
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("you must specify the image file for the '-imagein' option");
} else {
String filename = args[i + 1];
@@ -726,7 +744,7 @@
private int parsePDFOwnerPassword(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
getPDFEncryptionParams().setOwnerPassword("");
return 0;
} else {
@@ -737,7 +755,7 @@
private int parsePDFUserPassword(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
getPDFEncryptionParams().setUserPassword("");
return 0;
} else {
@@ -748,7 +766,7 @@
private int parsePDFProfile(String[] args, int i) throws FOPException {
if ((i + 1 == args.length)
- || (args[i + 1].charAt(0) == '-')) {
+ || (isOption(args[i + 1]))) {
throw new FOPException("You must specify a PDF profile");
} else {
String profile = args[i + 1];
@@ -936,7 +954,7 @@
* @return a new InputHandler instance
* @throws IllegalArgumentException if invalid/missing parameters
*/
- private InputHandler createInputHandler() throws IllegalArgumentException {
+ private InputHandler createInputHandler() {
switch (inputmode) {
case FO_INPUT:
return new InputHandler(fofile);
@@ -1065,7 +1083,7 @@
+ " (Examples for prof: PDF/A-1b or PDF/X-3:2003)\n\n"
+ " [INPUT] \n"
+ " infile xsl:fo input file (the same as the next) \n"
- + " (use # for infile to pipe input from stdin)\n"
+ + " (use '-' for infile to pipe input from stdin)\n"
+ " -fo infile xsl:fo input file \n"
+ " -xml infile xml input file, must be used together with -xsl \n"
+ " -atin infile area tree input file \n"
@@ -1075,7 +1093,7 @@
+ " (repeat '-param name value' for each parameter)\n \n"
+ " [OUTPUT] \n"
+ " outfile input will be rendered as PDF into outfile\n"
- + " (use # for outfile to pipe output to stdout)\n"
+ + " (use '-' for outfile to pipe output to stdout)\n"
+ " -pdf outfile input will be rendered as PDF (outfile req'd)\n"
+ " -pdfa1b outfile input will be rendered as PDF/A-1b compliant PDF\n"
+ " (outfile req'd, same as \"-pdf outfile -pdfprofile PDF/A-1b\")\n"
@@ -1109,7 +1127,7 @@
+ " Fop -fo foo.fo -pdf foo.pdf (does the same as the previous line)\n"
+ " Fop -xml foo.xml -xsl foo.xsl -pdf foo.pdf\n"
+ " Fop -xml foo.xml -xsl foo.xsl -foout foo.fo\n"
- + " Fop -xml # -xsl foo.xsl -pdf #\n"
+ + " Fop -xml - -xsl foo.xsl -pdf -\n"
+ " Fop foo.fo -mif foo.mif\n"
+ " Fop foo.fo -rtf foo.rtf\n"
+ " Fop foo.fo -print\n"
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/ImageInputHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/ImageInputHandler.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/ImageInputHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/cli/ImageInputHandler.java Fri Jul 25 05:44:20 2008
@@ -35,7 +35,7 @@
* Main constructor.
* @param imagefile the image file
* @param xsltfile XSLT file (may be null in which case the default stylesheet is used)
- * @param params Vector of command-line parameters (name, value,
+ * @param params Vector of command-line parameters (name, value,
* name, value, ...) for XSL stylesheet, null if none
*/
public ImageInputHandler(File imagefile, File xsltfile, Vector params) {
@@ -47,7 +47,7 @@
return new StreamSource(new StringReader(
"<image>" + this.sourcefile.toURI().toASCIIString() + "</image>"));
}
-
+
/** {@inheritDoc} */
protected Source createXSLTSource() {
Source src = super.createXSLTSource();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/CompoundDatatype.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/CompoundDatatype.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/CompoundDatatype.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/CompoundDatatype.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.datatypes;
import org.apache.fop.fo.Constants;
@@ -26,7 +26,7 @@
* This interface is used as a base for compound datatypes.
*/
public interface CompoundDatatype extends Constants {
-
+
/**
* Sets a component of the compound datatype.
* @param cmpId ID of the component
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/FODimension.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/FODimension.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/FODimension.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/FODimension.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.
@@ -40,7 +40,7 @@
this.ipd = ipd;
this.bpd = bpd;
}
-
+
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
sb.append(" {ipd=").append(Integer.toString(ipd));
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/KeepValue.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/KeepValue.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/KeepValue.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/KeepValue.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/datatypes/Length.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Length.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Length.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Length.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.
@@ -28,7 +28,7 @@
* @return the length in millipoints
*/
int getValue();
-
+
/**
* Returns the length in 1/1000ths of a point (millipoints)
* @param context The context for the length calculation (for percentage based lengths)
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/LengthBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/LengthBase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/LengthBase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/LengthBase.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.
@@ -76,7 +76,7 @@
/** For percentages based on other length properties */
private Length baseLength;
-
+
/**
* Constructor
* @param plist property list for this
@@ -133,11 +133,11 @@
/** {@inheritDoc} */
public String toString() {
return super.toString()
- + "[fo=" + fobj + ","
+ + "[fo=" + fobj + ","
+ "baseType=" + baseType + ","
+ "baseLength=" + baseLength + "]";
}
-
+
/**@return the base length as a {@link Length} */
public Length getBaseLength() {
return baseLength;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Numeric.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Numeric.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Numeric.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/Numeric.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.
@@ -30,7 +30,7 @@
* must be resolved against base value before the value can be used.
* <p>
* To support relative numerics internally in the expresion parser and
- * during evaulation one additional methods exists: isAbsolute() which
+ * during evaulation one additional methods exists: isAbsolute() which
* return true for absolute numerics and false for relative numerics.
*/
public interface Numeric {
@@ -40,7 +40,7 @@
* @throws PropertyException
*/
double getNumericValue() throws PropertyException;
-
+
/**
* Return the value of this Numeric
* @param context The context for the length calculation (for percentage based lengths)
@@ -78,10 +78,10 @@
public int getValue(PercentBaseContext context);
/**
- * Return the resolved value. This method will becalled during evaluation
- * of the expression tree and relative numerics can then return a
+ * Return the resolved value. This method will becalled during evaluation
+ * of the expression tree and relative numerics can then return a
* resolved absolute Numeric. Absolute numerics can just return themself.
- *
+ *
* @return A resolved value.
* @throws PropertyException
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBase.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,28 +26,28 @@
* computations
*/
public interface PercentBase {
-
+
/**
* Determines whether a numeric property is created or one with a percentage
* base.
* @return 0 for length, 1 for percentage
*/
int getDimension();
-
+
/**
- * @return the base value (this will be used as the base to which a percentage will be
+ * @return the base value (this will be used as the base to which a percentage will be
* applied to compute the length of the referencing item)
*/
double getBaseValue();
/**
* @param context The context for percentage evaluation
- * @return the integer size in millipoints of the object (this will be used
- * as the base to which a percentage will be applied to compute the length
+ * @return the integer size in millipoints of the object (this will be used
+ * as the base to which a percentage will be applied to compute the length
* of the referencing item)
* @throws PropertyException if a problem occurs during evaluation of this
* value.
*/
int getBaseLength(PercentBaseContext context) throws PropertyException;
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBaseContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBaseContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/PercentBaseContext.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.datatypes;
import org.apache.fop.fo.FObj;
@@ -37,5 +37,5 @@
* @return The base length value of the given kind
*/
public int getBaseLength(int lengthBase, FObj fobj);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.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.
@@ -25,14 +25,14 @@
* Class to implement a simple lookup context for a single percent base value.
*/
public class SimplePercentBaseContext implements PercentBaseContext {
-
+
private PercentBaseContext parentContext;
private int lengthBase;
private int lengthBaseValue;
/**
* @param parentContext the context to be used for all percentages other than lengthBase
- * @param lengthBase the particular percentage length base for which this context provides
+ * @param lengthBase the particular percentage length base for which this context provides
* a value
* @param lengthBaseValue the value to be returned for requests to the given lengthBase
*/
@@ -46,7 +46,7 @@
/**
* Returns the value for the given lengthBase.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
// if its for us return our value otherwise delegate to parent context
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/URISpecification.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/URISpecification.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/URISpecification.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/URISpecification.java Fri Jul 25 05:44:20 2008
@@ -57,19 +57,19 @@
private static final String PUNCT = ",;:$&+=";
private static final String RESERVED = PUNCT + "?/[]@";
-
+
private static boolean isValidURIChar(char ch) {
return true;
}
-
+
private static boolean isDigit(char ch) {
return (ch >= '0' && ch <= '9');
}
-
+
private static boolean isAlpha(char ch) {
return (ch >= 'A' && ch <= 'Z') || (ch >= 'A' && ch <= 'z');
}
-
+
private static boolean isHexDigit(char ch) {
return (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
}
@@ -83,7 +83,7 @@
}
return false;
}
-
+
private static boolean isUnreserved(char ch) {
if (isDigit(ch) || isAlpha(ch)) {
return true;
@@ -93,7 +93,7 @@
}
return false;
}
-
+
private final static char[] HEX_DIGITS = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -137,5 +137,5 @@
}
return sb.toString();
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.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,11 +26,11 @@
* but should still already be checked. The actual value returned is not so important in this
* case. But it's important that zero and non-zero values can be distinguished.
* <p>
- * Example: A table with collapsing border model has no padding. The Table FO should be able
+ * Example: A table with collapsing border model has no padding. The Table FO should be able
* to check if non-zero values (even percentages) have been specified.
*/
public final class ValidationPercentBaseContext implements PercentBaseContext {
-
+
/**
* Main constructor.
*/
@@ -39,7 +39,7 @@
/**
* Returns the value for the given lengthBase.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
//Simply return a dummy value which produces a non-zero value when a non-zero percentage
@@ -48,7 +48,7 @@
}
private static PercentBaseContext pseudoContextForValidation = null;
-
+
/** @return a base context for validation purposes. See class description. */
public static PercentBaseContext getPseudoContext() {
if (pseudoContextForValidation == null) {
@@ -56,5 +56,5 @@
}
return pseudoContextForValidation;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/CompositeEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/CompositeEventListener.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/CompositeEventListener.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/CompositeEventListener.java Fri Jul 25 05:44:20 2008
@@ -27,7 +27,7 @@
public class CompositeEventListener implements EventListener {
private List listeners = new java.util.ArrayList();
-
+
/**
* Adds an event listener to the broadcaster. It is appended to the list of previously
* registered listeners (the order of registration defines the calling order).
@@ -49,7 +49,7 @@
private synchronized int getListenerCount() {
return this.listeners.size();
}
-
+
/**
* Indicates whether any listeners have been registered with the broadcaster.
* @return true if listeners are present, false otherwise
@@ -57,7 +57,7 @@
public boolean hasEventListeners() {
return (getListenerCount() > 0);
}
-
+
/** {@inheritDoc} */
public synchronized void processEvent(Event event) {
for (int i = 0, c = getListenerCount(); i < c; i++) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/DefaultEventBroadcaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/DefaultEventBroadcaster.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/DefaultEventBroadcaster.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/DefaultEventBroadcaster.java Fri Jul 25 05:44:20 2008
@@ -42,7 +42,7 @@
/** Holds all registered event listeners */
protected CompositeEventListener listeners = new CompositeEventListener();
-
+
/** {@inheritDoc} */
public void addEventListener(EventListener listener) {
this.listeners.addEventListener(listener);
@@ -57,7 +57,7 @@
public boolean hasEventListeners() {
return this.listeners.hasEventListeners();
}
-
+
/** {@inheritDoc} */
public void broadcastEvent(Event event) {
this.listeners.processEvent(event);
@@ -65,7 +65,7 @@
private static List/*<EventModel>*/ eventModels = new java.util.ArrayList();
private Map proxies = new java.util.HashMap();
-
+
static {
Iterator iter = Service.providers(EventModelFactory.class, true);
while (iter.hasNext()) {
@@ -81,7 +81,7 @@
public static void addEventModel(EventModel eventModel) {
eventModels.add(eventModel);
}
-
+
/** {@inheritDoc} */
public EventProducer getEventProducerFor(Class clazz) {
if (!EventProducer.class.isAssignableFrom(clazz)) {
@@ -97,7 +97,7 @@
}
return producer;
}
-
+
private EventProducerModel getEventProducerModel(Class clazz) {
for (int i = 0, c = eventModels.size(); i < c; i++) {
EventModel eventModel = (EventModel)eventModels.get(i);
@@ -108,7 +108,7 @@
}
return null;
}
-
+
/**
* Creates a dynamic proxy for the given EventProducer interface that will handle the
* conversion of the method call into the broadcasting of an event instance.
@@ -147,7 +147,7 @@
}
Event ev = new Event(args[0], eventID, methodModel.getSeverity(), params);
broadcastEvent(ev);
-
+
if (ev.getSeverity() == EventSeverity.FATAL) {
EventExceptionManager.throwException(ev,
methodModel.getExceptionClass());
@@ -156,5 +156,5 @@
}
});
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/Event.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/Event.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/Event.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/Event.java Fri Jul 25 05:44:20 2008
@@ -32,11 +32,11 @@
public class Event extends EventObject {
private static final long serialVersionUID = -1310594422868258083L;
-
+
private String eventID;
private EventSeverity severity;
private Map params;
-
+
/**
* Creates a new Event.
* @param source the object that creates the event
@@ -50,7 +50,7 @@
setSeverity(severity);
this.params = params;
}
-
+
/**
* Returns the event identifier.
* @return the event identifier
@@ -58,7 +58,7 @@
public String getEventID() {
return this.eventID;
}
-
+
/**
* Returns the event group identifier.
* @return the event group identifier (or null if there is no group identifier)
@@ -71,7 +71,7 @@
return null;
}
}
-
+
/**
* Returns the severity level.
* @return the severity level
@@ -79,7 +79,7 @@
public EventSeverity getSeverity() {
return this.severity;
}
-
+
/**
* Sets the event's severity level. This method can be used to increase or decrease the
* severity level in a listener.
@@ -101,7 +101,7 @@
return null;
}
}
-
+
/**
* Returns an unmodifiable {@link java.util.Map} with all event parameters.
* @return the parameter map
@@ -109,7 +109,7 @@
public Map getParams() {
return Collections.unmodifiableMap(this.params);
}
-
+
/**
* Creates and returns a fluent builder object for building up the parameter map.
* @return the parameter builder
@@ -117,13 +117,13 @@
public static ParamsBuilder paramsBuilder() {
return new ParamsBuilder();
}
-
+
/**
* This class is a fluent builder class for building up the parameter map.
*/
public static class ParamsBuilder {
private Map params;
-
+
/**
* Adds a new parameter (a name/value pair).
* @param name the name of the parameter
@@ -137,7 +137,7 @@
this.params.put(name, value);
return this;
}
-
+
/**
* Returns the accumulated parameter map.
* @return the accumulated parameter map
@@ -146,5 +146,5 @@
return this.params;
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventBroadcaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventBroadcaster.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventBroadcaster.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventBroadcaster.java Fri Jul 25 05:44:20 2008
@@ -31,31 +31,31 @@
* @param listener the listener to be added
*/
void addEventListener(EventListener listener);
-
+
/**
* Removes an event listener from the broadcaster. If the event listener is not registered,
* nothing happens.
* @param listener the listener to be removed
*/
void removeEventListener(EventListener listener);
-
+
/**
* Indicates whether any listeners have been registered with the broadcaster.
* @return true if listeners are present, false otherwise
*/
boolean hasEventListeners();
-
+
/**
* Broadcasts an event. This method is usually called from within the observed component.
* @param event the event to be broadcast
*/
void broadcastEvent(Event event);
-
+
/**
* Returns an event producer instance for the given interface class.
* @param clazz the Class object identifying an {@link EventProducer} interface
* @return the event producer instance
*/
EventProducer getEventProducerFor(Class clazz);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventExceptionManager.java Fri Jul 25 05:44:20 2008
@@ -30,7 +30,7 @@
public class EventExceptionManager {
private static final Map EXCEPTION_FACTORIES = new java.util.HashMap();
-
+
static {
Iterator iter;
iter = Service.providers(ExceptionFactory.class, true);
@@ -39,7 +39,7 @@
EXCEPTION_FACTORIES.put(factory.getExceptionClass().getName(), factory);
}
}
-
+
/**
* Converts an event into an exception and throws that. If the exception class is null,
* a {@link RuntimeException} will be thrown.
@@ -61,20 +61,20 @@
throw new RuntimeException(msg);
}
}
-
+
/**
* This interface is implementation by exception factories that can create exceptions from
* events.
*/
public interface ExceptionFactory {
-
+
/**
* Creates an exception from an event.
* @param event the event
* @return the newly created exception
*/
Throwable createException(Event event);
-
+
/**
* Returns the {@link Exception} class created by this factory.
* @return the exception class
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.java Fri Jul 25 05:44:20 2008
@@ -40,16 +40,16 @@
public final class EventFormatter {
private static final Pattern INCLUDES_PATTERN = Pattern.compile("\\{\\{.+\\}\\}");
-
+
private static ResourceBundle defaultBundle = XMLResourceBundle.getXMLBundle(
EventFormatter.class.getName(), EventFormatter.class.getClassLoader());
-
+
private static Log log = LogFactory.getLog(EventFormatter.class);
-
+
private EventFormatter() {
//utility class
}
-
+
/**
* Formats an event using the default locale.
* @param event the event
@@ -74,7 +74,7 @@
}
return format(event, bundle);
}
-
+
/**
* Formats an event using a given locale.
* @param event the event
@@ -150,11 +150,11 @@
params.put("severity", event.getSeverity());
return format.format(params);
}
-
+
private static class LookupFieldPart implements Part {
-
+
private String fieldName;
-
+
public LookupFieldPart(String fieldName) {
this.fieldName = fieldName;
}
@@ -170,14 +170,14 @@
private String getKey(Map params) {
return (String)params.get(fieldName);
}
-
+
/** {@inheritDoc} */
public String toString() {
return "{" + this.fieldName + ", lookup}";
}
-
+
}
-
+
/** PartFactory for lookups. */
public static class LookupFieldPartFactory implements PartFactory {
@@ -190,7 +190,7 @@
public String getFormat() {
return "lookup";
}
-
+
}
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventFormatter.xml Fri Jul 25 05:44:20 2008
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -14,9 +13,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<!-- $Id$ -->
-<catalogue xml:lang="en">
+--><!-- $Id$ --><catalogue xml:lang="en">
<message key="locator">[ (See position {loc})| (See {#gatherContextInfo})| (No context info available)]</message>
<message key="rule.markerDescendantOfFlow">An fo:marker is permitted only as the descendant of an fo:flow.</message>
<message key="rule.retrieveMarkerDescendantOfStaticContent">An fo:retrieve-marker is permitted only as the descendant of an fo:static-content.</message>
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/EventListener.java Fri Jul 25 05:44:20 2008
@@ -33,5 +33,5 @@
* @param event the event
*/
void processEvent(Event event);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/FOPEventListenerProxy.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/FOPEventListenerProxy.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/FOPEventListenerProxy.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/FOPEventListenerProxy.java Fri Jul 25 05:44:20 2008
@@ -29,29 +29,29 @@
* For validation events, it reacts on each event based on the strict validation setting in
* the user agent.
* For layout events, it reduces the default severity level if FOP signals that it can recover
- * from the event.
+ * from the event.
*/
public class FOPEventListenerProxy implements EventListener {
private static final String FOVALIDATION_EVENT_ID_PREFIX
= FOValidationEventProducer.class.getName();
-
+
private static final String BLOCK_LEVEL_EVENT_ID_PREFIX
= BlockLevelEventProducer.class.getName();
private EventListener delegate;
private FOUserAgent userAgent;
-
+
/**
* Main constructor.
- * @param delegate the event listener to delegate events to
+ * @param delegate the event listener to delegate events to
* @param userAgent the FO user agent
*/
public FOPEventListenerProxy(EventListener delegate, FOUserAgent userAgent) {
this.delegate = delegate;
this.userAgent = userAgent;
}
-
+
/** {@inheritDoc} */
public synchronized void processEvent(Event event) {
if (event.getEventID().startsWith(FOVALIDATION_EVENT_ID_PREFIX)) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/LoggingEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/LoggingEventListener.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/LoggingEventListener.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/LoggingEventListener.java Fri Jul 25 05:44:20 2008
@@ -32,17 +32,17 @@
/** Default logger instance */
private static Log defaultLog = LogFactory.getLog(LoggingEventListener.class);
-
+
private Log log;
private boolean skipFatal;
-
+
/**
* Creates an instance logging to the default log category of this class.
*/
public LoggingEventListener() {
this(defaultLog);
}
-
+
/**
* Creates an instance logging to a given logger. Events with fatal severity level will be
* skipped.
@@ -51,7 +51,7 @@
public LoggingEventListener(Log log) {
this(log, true);
}
-
+
/**
* Creates an instance logging to a given logger.
* @param log the target logger
@@ -61,7 +61,7 @@
this.log = log;
this.skipFatal = skipFatal;
}
-
+
/**
* Returns the target logger for this instance.
* @return the target logger
@@ -69,7 +69,7 @@
public Log getLog() {
return this.log;
}
-
+
/** {@inheritDoc} */
public void processEvent(Event event) {
String msg = EventFormatter.format(event);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/PropertyExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/PropertyExceptionFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/PropertyExceptionFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/PropertyExceptionFactory.java Fri Jul 25 05:44:20 2008
@@ -38,10 +38,10 @@
}
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return PropertyException.class;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ResourceEventProducer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ResourceEventProducer.java Fri Jul 25 05:44:20 2008
@@ -38,7 +38,7 @@
* Provider class for the event producer.
*/
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -59,7 +59,7 @@
* @event.severity ERROR
*/
void imageNotFound(Object source, String uri, FileNotFoundException fnfe, Locator loc);
-
+
/**
* Error while processing image.
* @param source the event source
@@ -69,7 +69,7 @@
* @event.severity ERROR
*/
void imageError(Object source, String uri, ImageException e, Locator loc);
-
+
/**
* I/O error while loading an image.
* @param source the event source
@@ -105,7 +105,7 @@
* @event.severity ERROR
*/
void ifoNoIntrinsicSize(Object source, Locator loc);
-
+
/**
* Error processing foreign XML content.
* @param source the event source
@@ -124,7 +124,7 @@
* @event.severity ERROR
*/
void foreignXMLNoHandler(Object source, Document doc, String namespaceURI);
-
+
/**
* Cannot delete a temporary file.
* @param source the event source
@@ -132,5 +132,5 @@
* @event.severity ERROR
*/
void cannotDeleteTempFile(Object source, File tempFile);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java Fri Jul 25 05:44:20 2008
@@ -34,10 +34,10 @@
UnsupportedOperationException ex = new UnsupportedOperationException(msg);
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return UnsupportedOperationException.class;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ValidationExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ValidationExceptionFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ValidationExceptionFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/ValidationExceptionFactory.java Fri Jul 25 05:44:20 2008
@@ -41,11 +41,11 @@
}
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return ValidationException.class;
}
-
-
+
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java Fri Jul 25 05:44:20 2008
@@ -45,17 +45,17 @@
if (in == null) {
throw new MissingResourceException(
"File " + resourceName + " not found",
- DefaultEventBroadcaster.class.getName(), "");
+ DefaultEventBroadcaster.class.getName(), "");
}
try {
return EventModelParser.parse(new StreamSource(in));
} catch (TransformerException e) {
throw new MissingResourceException(
"Error reading " + resourceName + ": " + e.getMessage(),
- DefaultEventBroadcaster.class.getName(), "");
+ DefaultEventBroadcaster.class.getName(), "");
} finally {
IOUtils.closeQuietly(in);
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelFactory.java Fri Jul 25 05:44:20 2008
@@ -29,5 +29,5 @@
* @return the new EventModel instance
*/
EventModel createEventModel();
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelParser.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelParser.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventModelParser.java Fri Jul 25 05:44:20 2008
@@ -45,7 +45,7 @@
/** Logger instance */
protected static Log log = LogFactory.getLog(EventModelParser.class);
- private static SAXTransformerFactory tFactory
+ private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
/**
@@ -54,11 +54,11 @@
* @return the created event model structure
* @throws TransformerException if an error occurs while parsing the XML file
*/
- public static EventModel parse(Source src)
+ public static EventModel parse(Source src)
throws TransformerException {
Transformer transformer = tFactory.newTransformer();
transformer.setErrorListener(new DefaultErrorListener(log));
-
+
EventModel model = new EventModel();
SAXResult res = new SAXResult(getContentHandler(model));
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventSeverity.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventSeverity.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventSeverity.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/events/model/EventSeverity.java Fri Jul 25 05:44:20 2008
@@ -26,7 +26,7 @@
public final class EventSeverity implements Serializable {
private static final long serialVersionUID = 4108175215810759243L;
-
+
/** info level */
public static final EventSeverity INFO = new EventSeverity("INFO");
/** warning level */
@@ -35,7 +35,7 @@
public static final EventSeverity ERROR = new EventSeverity("ERROR");
/** fatal error */
public static final EventSeverity FATAL = new EventSeverity("FATAL");
-
+
private String name;
/**
@@ -50,7 +50,7 @@
public String getName() {
return this.name;
}
-
+
/**
* Returns the enumeration/singleton object based on its name.
* @param name the name of the enumeration value
@@ -69,14 +69,14 @@
throw new IllegalArgumentException("Illegal value for enumeration: " + name);
}
}
-
+
private Object readResolve() throws ObjectStreamException {
return valueOf(getName());
}
-
+
/** {@inheritDoc} */
public String toString() {
return "EventSeverity:" + name;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/CharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/CharIterator.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/CharIterator.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/CharIterator.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.fo;
import java.util.Iterator;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/Constants.java Fri Jul 25 05:44:20 2008
@@ -170,7 +170,7 @@
/** FO element constant */
int FO_ROOT = 66;
/** FO element constant - XSL 1.1 */
- int FO_SCALING_VALUE_CITATION = 67;
+ int FO_SCALING_VALUE_CITATION = 67;
/** FO element constant */
int FO_SIMPLE_PAGE_MASTER = 68;
/** FO element constant */
@@ -1166,9 +1166,9 @@
/** Enumeration constant -- font shorthand */
int EN_STATUS_BAR = 185;
/** Enumeration constant -- for page-position, XSL 1.1 */
- int EN_ONLY = 186;
+ int EN_ONLY = 186;
/** Enumeration constant -- for instream-foreign-object and external-graphic, XSL 1.1 */
- int EN_SCALE_DOWN_TO_FIT = 187;
+ int EN_SCALE_DOWN_TO_FIT = 187;
/** Enumeration constant -- for instream-foreign-object and external-graphic, XSL 1.1 */
int EN_SCALE_UP_TO_FIT = 188;
/** Enumeration constant -- for fo:basic-link show-destination */
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org