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 [31/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/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorUtil.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorUtil.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.
@@ -39,21 +39,21 @@
public final class ColorUtil {
/**
- *
+ *
* keeps all the predefined and parsed colors.
* <p>
* This map is used to predefine given colors, as well as speeding up
* parsing of already parsed colors.
*/
private static Map colorMap = null;
-
+
/** Logger instance */
protected static Log log = LogFactory.getLog(ColorUtil.class);
-
+
static {
initializeColorMap();
}
-
+
/**
* Private constructor since this is an utility class.
*/
@@ -77,8 +77,8 @@
* <li>fop-rgb-icc(r,g,b,cs,cs-src,[num]+) (r/g/b: 0..1, num: 0..1)</li>
* <li>cmyk(c,m,y,k) (0..1)</li>
* </ul>
- *
- * @param foUserAgent FOUserAgent object
+ *
+ * @param foUserAgent FOUserAgent object
* @param value
* the string to parse.
* @return a Color representing the string if possible
@@ -86,7 +86,7 @@
* if the string is not parsable or does not follow any of the
* given formats.
*/
- public static Color parseColorString(FOUserAgent foUserAgent, String value)
+ public static Color parseColorString(FOUserAgent foUserAgent, String value)
throws PropertyException {
if (value == null) {
return null;
@@ -111,11 +111,11 @@
} else if (value.startsWith("cmyk")) {
parsedColor = parseAsCMYK(value);
}
-
+
if (parsedColor == null) {
throw new PropertyException("Unknown Color: " + value);
}
-
+
colorMap.put(value, parsedColor);
}
@@ -127,7 +127,7 @@
/**
* Tries to parse a color given with the system-color() function.
- *
+ *
* @param value
* the complete line
* @return a color if possible
@@ -149,7 +149,7 @@
/**
* Tries to parse the standard java.awt.Color toString output.
- *
+ *
* @param value
* the complete line
* @return a color if possible
@@ -170,11 +170,11 @@
throw new PropertyException(
"Invalid number of arguments for a java.awt.Color: " + value);
}
-
+
red = Float.parseFloat(args[0].trim().substring(2)) / 255f;
green = Float.parseFloat(args[1].trim().substring(2)) / 255f;
blue = Float.parseFloat(args[2].trim().substring(2)) / 255f;
- if ((red < 0.0 || red > 1.0)
+ if ((red < 0.0 || red > 1.0)
|| (green < 0.0 || green > 1.0)
|| (blue < 0.0 || blue > 1.0)) {
throw new PropertyException("Color values out of range");
@@ -193,7 +193,7 @@
/**
* Parse a color given with the rgb() function.
- *
+ *
* @param value
* the complete line
* @return a color if possible
@@ -234,7 +234,7 @@
} else {
blue = Float.parseFloat(str) / 255f;
}
- if ((red < 0.0 || red > 1.0)
+ if ((red < 0.0 || red > 1.0)
|| (green < 0.0 || green > 1.0)
|| (blue < 0.0 || blue > 1.0)) {
throw new PropertyException("Color values out of range");
@@ -256,7 +256,7 @@
/**
* parse a color given in the #.... format.
- *
+ *
* @param value
* the complete line
* @return a color if possible
@@ -297,19 +297,19 @@
/**
* Parse a color specified using the fop-rgb-icc() function.
- *
+ *
* @param value the function call
* @return a color if possible
* @throws PropertyException if the format is wrong.
*/
- private static Color parseAsFopRgbIcc(FOUserAgent foUserAgent, String value)
+ private static Color parseAsFopRgbIcc(FOUserAgent foUserAgent, String value)
throws PropertyException {
Color parsedColor;
int poss = value.indexOf("(");
int pose = value.indexOf(")");
if (poss != -1 && pose != -1) {
String[] args = value.substring(poss + 1, pose).split(",");
-
+
try {
if (args.length < 5) {
throw new PropertyException("Too few arguments for rgb-icc() function");
@@ -339,27 +339,27 @@
ColorSpace colorSpace = (foUserAgent != null
? foUserAgent.getFactory().getColorSpace(
foUserAgent.getBaseURL(), iccProfileSrc) : null);
-
+
float red = 0, green = 0, blue = 0;
red = Float.parseFloat(args[0].trim());
green = Float.parseFloat(args[1].trim());
blue = Float.parseFloat(args[2].trim());
/* Verify rgb replacement arguments */
- if ((red < 0 || red > 1)
- || (green < 0 || green > 1)
+ if ((red < 0 || red > 1)
+ || (green < 0 || green > 1)
|| (blue < 0 || blue > 1)) {
throw new PropertyException("Color values out of range. "
+ "Fallback RGB arguments to fop-rgb-icc() must be [0..1]");
}
if (colorSpace != null) {
- // ColorSpace available - create ColorExt (keeps track of replacement rgb
+ // ColorSpace available - create ColorExt (keeps track of replacement rgb
// values for possible later colorTOsRGBString call
- parsedColor = ColorExt.createFromFoRgbIcc(red, green, blue,
+ parsedColor = ColorExt.createFromFoRgbIcc(red, green, blue,
iccProfileName, iccProfileSrc, colorSpace, iccComponents);
} else {
// ICC profile could not be loaded - use rgb replacement values */
- log.warn("Color profile '" + iccProfileSrc
+ log.warn("Color profile '" + iccProfileSrc
+ "' not found. Using rgb replacement values.");
parsedColor = new Color(Math.round(red * 255),
Math.round(green * 255), Math.round(blue * 255));
@@ -380,7 +380,7 @@
/**
* Parse a color given with the cmyk() function.
- *
+ *
* @param value
* the complete line
* @return a color if possible
@@ -428,8 +428,8 @@
} else {
black = Float.parseFloat(str);
}
-
- if ((cyan < 0.0 || cyan > 1.0)
+
+ if ((cyan < 0.0 || cyan > 1.0)
|| (magenta < 0.0 || magenta > 1.0)
|| (yellow < 0.0 || yellow > 1.0)
|| (black < 0.0 || black > 1.0)) {
@@ -439,7 +439,7 @@
float[] cmyk = new float[] {cyan, magenta, yellow, black};
CMYKColorSpace cmykCs = CMYKColorSpace.getInstance();
float[] rgb = cmykCs.toRGB(cmyk);
- parsedColor = ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
+ parsedColor = ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
null, "#CMYK", cmykCs, cmyk);
} catch (PropertyException pe) {
throw pe;
@@ -452,13 +452,13 @@
}
return parsedColor;
}
-
+
/**
* Creates a re-parsable string representation of the given color.
* <p>
* First, the color will be converted into the sRGB colorspace. It will then
* be printed as #rrggbb, or as #rrrggbbaa if an alpha value is present.
- *
+ *
* @param color
* the color to represent.
* @return a re-parsable string representadion.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CommandLineLogger.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CommandLineLogger.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CommandLineLogger.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/CommandLineLogger.java Fri Jul 25 05:44:20 2008
@@ -4,9 +4,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,17 +40,17 @@
private int logLevel;
private String logName;
-
+
/**
- * Construct the logger with a default log level taken from the LogFactory
- * attribute "level".
+ * Construct the logger with a default log level taken from the LogFactory
+ * attribute "level".
* @param logName the logger name.
*/
public CommandLineLogger(String logName) {
this.logName = logName;
setLogLevel((String) LogFactory.getFactory().getAttribute("level"));
}
-
+
/**
* Set a log level for the logger.
* @param level the log level
@@ -72,7 +72,7 @@
logLevel = LOG_LEVEL_INFO;
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -93,7 +93,7 @@
public final boolean isInfoEnabled() {
return logLevel <= LOG_LEVEL_INFO;
}
-
+
/**
* {@inheritDoc}
*/
@@ -114,7 +114,7 @@
public final boolean isFatalEnabled() {
return logLevel <= LOG_LEVEL_FATAL;
}
-
+
/**
* {@inheritDoc}
*/
@@ -222,7 +222,7 @@
log(LOG_LEVEL_FATAL, message, t);
}
}
-
+
/**
* Do the actual logging.
* This method assembles the message and prints it to
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactory.java Fri Jul 25 05:44:20 2008
@@ -34,43 +34,43 @@
* @return an array of supported namespaces.
*/
String[] getSupportedNamespaces();
-
+
/**
* @return a new ContentHandler to handle a SAX stream
* @throws SAXException if there's an error while preparing the ContentHandler
*/
ContentHandler createContentHandler() throws SAXException;
-
+
/**
* Interface that ContentHandler implementations that parse Java objects from XML can implement
* to return these objects.
*/
public interface ObjectSource {
-
+
/**
* @return the object parsed from the SAX stream (call valid after parsing)
*/
Object getObject();
-
+
/**
* Set a listener which gets notified when the object is fully built.
* @param listener the listener which gets notified
*/
void setObjectBuiltListener(ObjectBuiltListener listener);
}
-
+
/**
* EventListener interface for objects which want to get notified when ContentHandler
* implementing the ObjectSource interface has finished parsing.
*/
public interface ObjectBuiltListener extends EventListener {
-
+
/**
* Notifies the listener when the object is fully built.
* @param obj the newly built object
*/
void notifyObjectBuilt(Object obj);
-
+
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.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,24 +36,24 @@
/** the logger */
private static Log log = LogFactory.getLog(ContentHandlerFactoryRegistry.class);
-
+
/** Map from namespace URIs to ContentHandlerFactories */
private Map factories = new java.util.HashMap();
-
+
/**
* Default constructor.
*/
public ContentHandlerFactoryRegistry() {
discover();
}
-
+
/**
* Add an XML handler. The handler itself is inspected to find out what it supports.
* @param classname the fully qualified class name
*/
public void addContentHandlerFactory(String classname) {
try {
- ContentHandlerFactory factory
+ ContentHandlerFactory factory
= (ContentHandlerFactory)Class.forName(classname).newInstance();
addContentHandlerFactory(factory);
} catch (ClassNotFoundException e) {
@@ -67,11 +67,11 @@
+ classname);
} catch (ClassCastException e) {
throw new IllegalArgumentException(classname
- + " is not an "
+ + " is not an "
+ ContentHandlerFactory.class.getName());
}
}
-
+
/**
* Add an ContentHandlerFactory. The instance is inspected to find out what it supports.
* @param factory the ContentHandlerFactory instance
@@ -82,7 +82,7 @@
factories.put(ns[i], factory);
}
}
-
+
/**
* Retrieves a ContentHandlerFactory instance of a given namespace URI.
* @param namespaceURI the namespace to be handled.
@@ -92,7 +92,7 @@
ContentHandlerFactory factory = (ContentHandlerFactory)factories.get(namespaceURI);
return factory;
}
-
+
/**
* Discovers ContentHandlerFactory implementations through the classpath and dynamically
* registers them.
@@ -105,7 +105,7 @@
ContentHandlerFactory factory = (ContentHandlerFactory)providers.next();
try {
if (log.isDebugEnabled()) {
- log.debug("Dynamically adding ContentHandlerFactory: "
+ log.debug("Dynamically adding ContentHandlerFactory: "
+ factory.getClass().getName());
}
addContentHandlerFactory(factory);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOM2SAX.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOM2SAX.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOM2SAX.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOM2SAX.java Fri Jul 25 05:44:20 2008
@@ -35,7 +35,7 @@
/**
* Helper class that produces a SAX stream from a DOM Document.
* <p>
- * Part of the code here copied and adapted from Apache Xalan-J,
+ * Part of the code here copied and adapted from Apache Xalan-J,
* src/org/apache/xalan/xsltc/trax/DOM2SAX.java
*/
public class DOM2SAX {
@@ -45,9 +45,9 @@
private ContentHandler contentHandler;
private LexicalHandler lexicalHandler;
-
+
private Map prefixes = new java.util.HashMap();
-
+
/**
* Main constructor
* @param handler the ContentHandler to send SAX events to
@@ -58,7 +58,7 @@
this.lexicalHandler = (LexicalHandler)handler;
}
}
-
+
/**
* Writes the given document using the given ContentHandler.
* @param doc DOM document
@@ -143,7 +143,7 @@
* @param node node to serialize
* @throws SAXException In case of a problem while writing XML
*/
- private void writeNode(Node node)
+ private void writeNode(Node node)
throws SAXException {
if (node == null) {
return;
@@ -284,5 +284,5 @@
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java Fri Jul 25 05:44:20 2008
@@ -35,23 +35,23 @@
*/
public class DOMBuilderContentHandlerFactory implements ContentHandlerFactory {
- private static SAXTransformerFactory tFactory
+ private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
private String namespaceURI;
private DOMImplementation domImplementation;
-
+
/**
* Main Constructor
- * @param namespaceURI the main namespace URI for the DOM to be parsed
+ * @param namespaceURI the main namespace URI for the DOM to be parsed
* @param domImplementation the DOMImplementation to use for build the DOM
*/
- public DOMBuilderContentHandlerFactory(String namespaceURI,
+ public DOMBuilderContentHandlerFactory(String namespaceURI,
DOMImplementation domImplementation) {
this.namespaceURI = namespaceURI;
this.domImplementation = domImplementation;
}
-
+
/** {@inheritDoc} */
public String[] getSupportedNamespaces() {
return new String[] {namespaceURI};
@@ -61,13 +61,13 @@
public ContentHandler createContentHandler() throws SAXException {
return new Handler();
}
-
+
private class Handler extends DelegatingContentHandler
implements ContentHandlerFactory.ObjectSource {
-
+
private Document doc;
private ObjectBuiltListener obListener;
-
+
public Handler() throws SAXException {
super();
}
@@ -75,7 +75,7 @@
public Document getDocument() {
return this.doc;
}
-
+
/**
* {@inheritDoc}
*/
@@ -89,7 +89,7 @@
public void setObjectBuiltListener(ObjectBuiltListener listener) {
this.obListener = listener;
}
-
+
/**
* {@inheritDoc}
*/
@@ -103,7 +103,7 @@
/**
* {@inheritDoc}
*/
- public void startElement(String uri, String localName, String qName, Attributes atts)
+ public void startElement(String uri, String localName, String qName, Attributes atts)
throws SAXException {
if (doc == null) {
TransformerHandler handler;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURIResolver.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURIResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURIResolver.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 @@
/**
* Resolves data URLs (described in RFC 2397) returning its data as a StreamSource.
- *
+ *
* @see javax.xml.transform.URIResolver
* @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
*/
@@ -51,7 +51,7 @@
/**
* Parses inline data URIs as generated by MS Word's XML export and FO
* stylesheet.
- *
+ *
* @see <a href="http://www.ietf.org/rfc/rfc2397">RFC 2397</a>
*/
private Source parseDataURI(String href) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURLUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURLUtil.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURLUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DataURLUtil.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 @@
writeDataURL(in, mediatype, writer);
return writer.toString();
}
-
+
/**
* Generates a data URL and writes it to a Writer.
* @param in the InputStream to read the data from
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DefaultErrorListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DefaultErrorListener.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DefaultErrorListener.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/DefaultErrorListener.java Fri Jul 25 05:44:20 2008
@@ -31,7 +31,7 @@
public class DefaultErrorListener implements ErrorListener {
private Log log;
-
+
/**
* Main constructor
* @param log the log instance to send log events to
@@ -39,7 +39,7 @@
public DefaultErrorListener(Log log) {
this.log = log;
}
-
+
/**
* {@inheritDoc}
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ListUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ListUtil.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ListUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ListUtil.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.
@@ -23,7 +23,7 @@
/**
* Provides helper functions for {@link java.util.List}.
- *
+ *
*/
public final class ListUtil {
@@ -33,7 +33,7 @@
/**
* Retrieve the last element from a list.
- *
+ *
* @param list
* The list to work on
* @return last element
@@ -44,7 +44,7 @@
/**
* Retrieve and remove the last element from a list.
- *
+ *
* @param list
* The list to work on
* @return previous last element
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/LogUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/LogUtil.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/LogUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/LogUtil.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.
@@ -23,7 +23,7 @@
import org.apache.fop.apps.FOPException;
/**
- * Convenience Logging utility methods used in FOP
+ * Convenience Logging utility methods used in FOP
*/
public class LogUtil {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/QName.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/QName.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/QName.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/QName.java Fri Jul 25 05:44:20 2008
@@ -22,14 +22,14 @@
/**
* Represents a qualified name of an XML element or an XML attribute.
* <p>
- * Note: This class allows to carry a namespace prefix but it is not used in the equals() and
+ * Note: This class allows to carry a namespace prefix but it is not used in the equals() and
* hashCode() methods.
* @deprecated Use the XML Graphics Commons variant instead!
*/
public class QName extends org.apache.xmlgraphics.util.QName {
private static final long serialVersionUID = -5225376740044770690L;
-
+
/**
* Main constructor.
* @param namespaceURI the namespace URI
@@ -39,7 +39,7 @@
public QName(String namespaceURI, String prefix, String localName) {
super(namespaceURI, prefix, localName);
}
-
+
/**
* Main constructor.
* @param namespaceURI the namespace URI
@@ -48,5 +48,5 @@
public QName(String namespaceURI, String qName) {
super(namespaceURI, qName);
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnclosableInputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnclosableInputStream.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnclosableInputStream.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnclosableInputStream.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 @@
/**
* Default constructor.
- *
+ *
* @param in the Stream to filter.
*/
public UnclosableInputStream(InputStream in) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnitConv.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnitConv.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnitConv.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/UnitConv.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,13 +26,13 @@
/** conversion factory from millimeters to inches. */
public static final float IN2MM = 25.4f;
-
+
/** conversion factory from centimeters to inches. */
public static final float IN2CM = 2.54f;
-
+
/** conversion factory from inches to points. */
public static final int IN2PT = 72;
-
+
/**
* Converts millimeters (mm) to points (pt)
* @param mm the value in mm
@@ -59,7 +59,7 @@
public static double pt2mm(double pt) {
return pt * IN2MM / IN2PT;
}
-
+
/**
* Converts millimeters (mm) to inches (in)
* @param mm the value in mm
@@ -68,7 +68,7 @@
public static double mm2in(double mm) {
return mm / IN2MM;
}
-
+
/**
* Converts inches (in) to millimeters (mm)
* @param in the value in inches
@@ -77,7 +77,7 @@
public static double in2mm(double in) {
return in * IN2MM;
}
-
+
/**
* Converts inches (in) to millipoints (mpt)
* @param in the value in inches
@@ -86,7 +86,7 @@
public static double in2mpt(double in) {
return in * IN2PT * 1000;
}
-
+
/**
* Converts inches (in) to points (pt)
* @param in the value in inches
@@ -95,16 +95,16 @@
public static double in2pt(double in) {
return in * IN2PT;
}
-
+
/**
- * Converts millipoints (mpt) to inches (in)
+ * Converts millipoints (mpt) to inches (in)
* @param mpt the value in mpt
* @return the value in inches
*/
public static double mpt2in(double mpt) {
return mpt / IN2PT / 1000;
}
-
+
/**
* Converts millimeters (mm) to pixels (px)
* @param mm the value in mm
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/WriterOutputStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/WriterOutputStream.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/WriterOutputStream.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/WriterOutputStream.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.
@@ -24,7 +24,7 @@
import java.io.Writer;
/**
- * An OutputStream wrapper for a Writer.
+ * An OutputStream wrapper for a Writer.
*/
public class WriterOutputStream extends OutputStream {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLResourceBundle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLResourceBundle.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLResourceBundle.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/XMLResourceBundle.java Fri Jul 25 05:44:20 2008
@@ -1,4 +1,4 @@
-/*
+/*
* 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.
@@ -61,12 +61,12 @@
public class XMLResourceBundle extends ResourceBundle {
//Note: Some code here has been copied and adapted from Apache Harmony!
-
+
private Properties resources = new Properties();
private Locale locale;
-
- private static SAXTransformerFactory tFactory
+
+ private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
/**
@@ -84,7 +84,7 @@
throw new IOException("Error while parsing XML resource bundle: " + e.getMessage());
}
}
-
+
/**
* Gets a resource bundle using the specified base name, default locale, and class loader.
* @param baseName the base name of the resource bundle, a fully qualified class name
@@ -98,7 +98,7 @@
throws MissingResourceException {
return getXMLBundle(baseName, Locale.getDefault(), loader);
}
-
+
/**
* Gets a resource bundle using the specified base name, locale, and class loader.
* @param baseName the base name of the resource bundle, a fully qualified class name
@@ -117,7 +117,7 @@
if (baseName == null) {
throw new NullPointerException("baseName must not be null");
}
-
+
ResourceBundle bundle;
if (!locale.equals(Locale.getDefault())) {
bundle = handleGetXMLBundle(baseName, "_" + locale, false, loader);
@@ -145,10 +145,10 @@
private static final ResourceBundle MISSING = new MissingBundle();
private static final ResourceBundle MISSINGBASE = new MissingBundle();
-
+
private static Map cache = new java.util.WeakHashMap();
//<Object, Hashtable<String, ResourceBundle>>
-
+
private static ResourceBundle handleGetXMLBundle(String base, String locale,
boolean loadBase, final ClassLoader loader) {
XMLResourceBundle bundle = null;
@@ -224,8 +224,8 @@
}
loaderCache.put(bundleName, loadBase ? MISSINGBASE : MISSING);
return null;
- }
-
+ }
+
private void setLocale(String name) {
String language = "", country = "", variant = "";
if (name.length() > 1) {
@@ -248,7 +248,7 @@
}
this.locale = new Locale(language, country, variant);
}
-
+
private static String strip(String name) {
int index = name.lastIndexOf('_');
if (index != -1) {
@@ -256,16 +256,16 @@
}
return null;
}
-
+
private Enumeration getLocalKeys() {
return (Enumeration)resources.propertyNames();
}
-
+
/** {@inheritDoc} */
public Locale getLocale() {
return this.locale;
}
-
+
/** {@inheritDoc} */
public Enumeration getKeys() {
if (parent == null) {
@@ -327,10 +327,10 @@
}
private class CatalogueHandler extends DefaultHandler {
-
+
private static final String CATALOGUE = "catalogue";
private static final String MESSAGE = "message";
-
+
private StringBuffer valueBuffer = new StringBuffer();
private Stack elementStack = new Stack();
private String currentKey = null;
@@ -338,13 +338,13 @@
private boolean isOwnNamespace(String uri) {
return ("".equals(uri));
}
-
+
private QName getParentElementName() {
return (QName)elementStack.peek();
}
-
+
/** {@inheritDoc} */
- public void startElement(String uri, String localName, String qName,
+ public void startElement(String uri, String localName, String qName,
Attributes atts) throws SAXException {
super.startElement(uri, localName, qName, atts);
QName elementName = new QName(uri, qName);
@@ -386,13 +386,13 @@
}
this.valueBuffer.setLength(0);
}
-
+
/** {@inheritDoc} */
public void characters(char[] ch, int start, int length) throws SAXException {
super.characters(ch, start, length);
valueBuffer.append(ch, start, length);
}
-
+
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java Fri Jul 25 05:44:20 2008
@@ -45,13 +45,13 @@
/** Regex that matches "," but not "\," (escaped comma) */
static final Pattern COMMA_SEPARATOR_REGEX = Pattern.compile("(?<!\\\\),");
-
+
private static final Map PART_FACTORIES = new java.util.HashMap();
private static final List OBJECT_FORMATTERS = new java.util.ArrayList();
private static final Map FUNCTIONS = new java.util.HashMap();
-
+
private CompositePart rootPart;
-
+
static {
Iterator iter;
iter = Service.providers(PartFactory.class, true);
@@ -69,7 +69,7 @@
FUNCTIONS.put(function.getName(), function);
}
}
-
+
/**
* Construct a new message format.
* @param pattern the message format pattern.
@@ -77,13 +77,13 @@
public AdvancedMessageFormat(CharSequence pattern) {
parsePattern(pattern);
}
-
+
private void parsePattern(CharSequence pattern) {
rootPart = new CompositePart(false);
StringBuffer sb = new StringBuffer();
parseInnerPattern(pattern, rootPart, sb, 0);
}
-
+
private int parseInnerPattern(CharSequence pattern, CompositePart parent,
StringBuffer sb, int start) {
assert sb.length() == 0;
@@ -155,7 +155,7 @@
}
return i - start;
}
-
+
private Part parseField(String field) {
String[] parts = COMMA_SEPARATOR_REGEX.split(field, 3);
String fieldName = parts[0];
@@ -203,20 +203,20 @@
public void format(Map params, StringBuffer target) {
rootPart.write(target, params);
}
-
+
/**
* Represents a message template part. This interface is implemented by various variants of
* the single curly braces pattern ({field}, {field,if,yes,no} etc.).
*/
public interface Part {
-
+
/**
* Writes the formatted part to a string buffer.
* @param sb the target string buffer
* @param params the parameters to work with
*/
void write(StringBuffer sb, Map params);
-
+
/**
* Indicates whether there is any content that is generated by this message part.
* @param params the parameters to work with
@@ -224,12 +224,12 @@
*/
boolean isGenerated(Map params);
}
-
+
/**
* Implementations of this interface parse a field part and return message parts.
*/
public interface PartFactory {
-
+
/**
* Creates a new part by parsing the values parameter to configure the part.
* @param fieldName the field name
@@ -237,26 +237,26 @@
* @return the new message part
*/
Part newPart(String fieldName, String values);
-
+
/**
* Returns the name of the message part format.
* @return the name of the message part format
*/
String getFormat();
}
-
+
/**
* Implementations of this interface format certain objects to strings.
*/
public interface ObjectFormatter {
-
+
/**
* Formats an object to a string and writes the result to a string buffer.
* @param sb the target string buffer
* @param obj the object to be formatted
*/
void format(StringBuffer sb, Object obj);
-
+
/**
* Indicates whether a given object is supported.
* @param obj the object
@@ -264,40 +264,40 @@
*/
boolean supportsObject(Object obj);
}
-
+
/**
* Implementations of this interface do some computation based on the message parameters
* given to it. Note: at the moment, this has to be done in a local-independent way since
* there is no locale information.
*/
public interface Function {
-
+
/**
* Executes the function.
* @param params the message parameters
* @return the function result
*/
Object evaluate(Map params);
-
+
/**
* Returns the name of the function.
* @return the name of the function
*/
Object getName();
}
-
+
private static class TextPart implements Part {
-
+
private String text;
-
+
public TextPart(String text) {
this.text = text;
}
-
+
public void write(StringBuffer sb, Map params) {
sb.append(text);
}
-
+
public boolean isGenerated(Map params) {
return true;
}
@@ -307,15 +307,15 @@
return this.text;
}
}
-
+
private static class SimpleFieldPart implements Part {
-
+
private String fieldName;
-
+
public SimpleFieldPart(String fieldName) {
this.fieldName = fieldName;
}
-
+
public void write(StringBuffer sb, Map params) {
if (!params.containsKey(fieldName)) {
throw new IllegalArgumentException(
@@ -329,13 +329,13 @@
Object obj = params.get(fieldName);
return obj != null;
}
-
+
/** {@inheritDoc} */
public String toString() {
return "{" + this.fieldName + "}";
}
}
-
+
/**
* Formats an object to a string and writes the result to a string buffer. This method
* usually uses the object's <code>toString()</code> method unless there is an
@@ -363,18 +363,18 @@
}
}
}
-
+
private static class FunctionPart implements Part {
-
+
private Function function;
-
+
public FunctionPart(String functionName) {
this.function = getFunction(functionName);
if (this.function == null) {
throw new IllegalArgumentException("Unknown function: " + functionName);
}
}
-
+
public void write(StringBuffer sb, Map params) {
Object obj = this.function.evaluate(params);
formatObject(obj, sb);
@@ -384,28 +384,28 @@
Object obj = this.function.evaluate(params);
return obj != null;
}
-
+
/** {@inheritDoc} */
public String toString() {
return "{#" + this.function.getName() + "}";
}
}
-
+
private static class CompositePart implements Part {
-
+
protected List parts = new java.util.ArrayList();
private boolean conditional;
private boolean hasSections = false;
-
+
public CompositePart(boolean conditional) {
this.conditional = conditional;
}
-
+
private CompositePart(List parts) {
this.parts.addAll(parts);
this.conditional = true;
}
-
+
public void addChild(Part part) {
if (part == null) {
throw new NullPointerException("part must not be null");
@@ -417,7 +417,7 @@
this.parts.add(part);
}
}
-
+
public void newSection() {
if (!hasSections) {
List p = this.parts;
@@ -428,7 +428,7 @@
}
this.parts.add(new CompositePart(true));
}
-
+
public void write(StringBuffer sb, Map params) {
if (hasSections) {
Iterator iter = this.parts.iterator();
@@ -473,14 +473,14 @@
return true;
}
}
-
+
/** {@inheritDoc} */
public String toString() {
return this.parts.toString();
}
}
-
-
+
+
static String unescapeComma(String string) {
return string.replaceAll("\\\\,", ",");
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/ChoiceFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/ChoiceFieldPart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/ChoiceFieldPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/ChoiceFieldPart.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,12 +31,12 @@
* Defines a "choice" field part that works like {@link ChoiceFormat}.
*/
public class ChoiceFieldPart implements Part {
-
+
private static final Pattern VARIABLE_REGEX = Pattern.compile("\\{([^\\}]+)\\}");
-
+
private String fieldName;
private ChoiceFormat choiceFormat;
-
+
/**
* Creates a new choice part.
* @param fieldName the field name to work on
@@ -72,7 +72,7 @@
public String toString() {
return "{" + this.fieldName + ",choice, ....}";
}
-
+
/** Factory for ChoiceFieldPart. */
public static class Factory implements PartFactory {
@@ -85,7 +85,7 @@
public String getFormat() {
return "choice";
}
-
+
}
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/EqualsFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/EqualsFieldPart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/EqualsFieldPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/EqualsFieldPart.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,9 +30,9 @@
* <code>{field,equals,new,This is new!,This is old!}</code>
*/
public class EqualsFieldPart extends IfFieldPart {
-
+
private String equalsValue;
-
+
/**
* Creates a new "equals" field part.
* @param fieldName the field name
@@ -57,7 +57,7 @@
ifValue = AdvancedMessageFormat.unescapeComma(parts[1]);
}
}
-
+
/** {@inheritDoc} */
protected boolean isTrue(Map params) {
Object obj = params.get(fieldName);
@@ -72,7 +72,7 @@
public String toString() {
return "{" + this.fieldName + ", equals " + this.equalsValue + "}";
}
-
+
/**
* Part factory for "equals".
*/
@@ -87,6 +87,6 @@
public String getFormat() {
return "equals";
}
-
+
}
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/GlyphNameFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/GlyphNameFieldPart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/GlyphNameFieldPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/GlyphNameFieldPart.java Fri Jul 25 05:44:20 2008
@@ -32,7 +32,7 @@
public class GlyphNameFieldPart implements Part {
private String fieldName;
-
+
/**
* Creates a new glyph name field part
* @param fieldName the field name
@@ -40,13 +40,13 @@
public GlyphNameFieldPart(String fieldName) {
this.fieldName = fieldName;
}
-
+
/** {@inheritDoc} */
public boolean isGenerated(Map params) {
Object obj = params.get(fieldName);
return obj != null && getGlyphName(obj).length() > 0;
}
-
+
private String getGlyphName(Object obj) {
if (obj instanceof Character) {
return Glyphs.charToGlyphName(((Character)obj).charValue());
@@ -71,7 +71,7 @@
public String toString() {
return "{" + this.fieldName + ",glyph-name}";
}
-
+
/** Factory for {@link GlyphNameFieldPart}. */
public static class Factory implements PartFactory {
@@ -79,11 +79,11 @@
public Part newPart(String fieldName, String values) {
return new GlyphNameFieldPart(fieldName);
}
-
+
/** {@inheritDoc} */
public String getFormat() {
return "glyph-name";
}
-
+
}
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/HexFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/HexFieldPart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/HexFieldPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/HexFieldPart.java Fri Jul 25 05:44:20 2008
@@ -30,7 +30,7 @@
public class HexFieldPart implements Part {
private String fieldName;
-
+
/**
* Creates a new hex field part
* @param fieldName the field name
@@ -38,7 +38,7 @@
public HexFieldPart(String fieldName) {
this.fieldName = fieldName;
}
-
+
/** {@inheritDoc} */
public boolean isGenerated(Map params) {
Object obj = params.get(fieldName);
@@ -66,7 +66,7 @@
public String toString() {
return "{" + this.fieldName + ",hex}";
}
-
+
/** Factory for {@link HexFieldPart}. */
public static class Factory implements PartFactory {
@@ -74,11 +74,11 @@
public Part newPart(String fieldName, String values) {
return new HexFieldPart(fieldName);
}
-
+
/** {@inheritDoc} */
public String getFormat() {
return "hex";
}
-
+
}
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/IfFieldPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/IfFieldPart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/IfFieldPart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/IfFieldPart.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,14 +30,14 @@
* <code>{field,if,Yes,No}</code>
*/
public class IfFieldPart implements Part {
-
+
/** the field name for the part */
protected String fieldName;
/** the value being returned if the field is true */
protected String ifValue;
/** the value being returned if the field is false */
protected String elseValue;
-
+
/**
* Creates a new "if" field part.
* @param fieldName the field name
@@ -61,7 +61,7 @@
ifValue = AdvancedMessageFormat.unescapeComma(values);
}
}
-
+
/** {@inheritDoc} */
public void write(StringBuffer sb, Map params) {
boolean isTrue = isTrue(params);
@@ -91,12 +91,12 @@
public boolean isGenerated(Map params) {
return isTrue(params) || (elseValue != null);
}
-
+
/** {@inheritDoc} */
public String toString() {
return "{" + this.fieldName + ", if...}";
}
-
+
/**
* Part factory for "if".
*/
@@ -106,11 +106,11 @@
public Part newPart(String fieldName, String values) {
return new IfFieldPart(fieldName, values);
}
-
+
/** {@inheritDoc} */
public String getFormat() {
return "if";
}
-
+
}
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/LocatorFormatter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/LocatorFormatter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/LocatorFormatter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/text/LocatorFormatter.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.
@@ -38,5 +38,5 @@
public boolean supportsObject(Object obj) {
return obj instanceof Locator;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFElement.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.mif;
// Java
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.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,8 +32,8 @@
public class MIFFOEventHandlerMaker extends AbstractFOEventHandlerMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_MIF};
-
-
+
+
/** @see org.apache.fop.render.AbstractFOEventHandlerMaker */
public FOEventHandler makeFOEventHandler(FOUserAgent ua, OutputStream out) {
return new MIFHandler(ua, out);
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFile.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFile.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFFile.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.mif;
// Java
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFHandler.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/MIFHandler.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.
@@ -66,7 +66,7 @@
/** the MIFFile instance */
protected MIFFile mifFile;
-
+
/** the OutputStream to write to */
protected OutputStream outStream;
@@ -409,25 +409,25 @@
*/
public void startFootnote(Footnote footnote) {
}
-
+
/**
* @see org.apache.fop.fo.FOEventHandler#endFootnote(Footnote)
*/
public void endFootnote(Footnote footnote) {
}
-
+
/**
* @see org.apache.fop.fo.FOEventHandler#startFootnoteBody(FootnoteBody)
*/
public void startFootnoteBody(FootnoteBody body) {
}
-
+
/**
* @see org.apache.fop.fo.FOEventHandler#endFootnoteBody(FootnoteBody)
*/
public void endFootnoteBody(FootnoteBody body) {
}
-
+
/**
* @see org.apache.fop.fo.FOEventHandler#leader(Leader)
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/PGFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/PGFElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/PGFElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/PGFElement.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.mif;
/**
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RefElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RefElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RefElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RefElement.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.mif;
/**
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RulingElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RulingElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RulingElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/mif/RulingElement.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.mif;
public class RulingElement extends RefElement {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java Fri Jul 25 05:44:20 2008
@@ -59,14 +59,14 @@
private static final String SVG_FILE_EXTENSION = "svg";
private OutputStream firstOutputStream;
-
+
private Document document;
-
+
private SVGGraphics2D svgGenerator;
/** Helper class for generating multiple files */
private MultiFileRenderingUtil multiFileUtil;
-
+
/** @see org.apache.fop.render.AbstractRenderer */
public String getMimeType() {
return MIME_TYPE;
@@ -79,7 +79,7 @@
/** @see org.apache.fop.render.Renderer#startRenderer(java.io.OutputStream) */
public void startRenderer(OutputStream outputStream) throws IOException {
this.firstOutputStream = outputStream;
- this.multiFileUtil = new MultiFileRenderingUtil(SVG_FILE_EXTENSION,
+ this.multiFileUtil = new MultiFileRenderingUtil(SVG_FILE_EXTENSION,
getUserAgent().getOutputFile());
super.startRenderer(this.firstOutputStream);
}
@@ -95,11 +95,11 @@
// Create an instance of org.w3c.dom.Document
this.document = domImpl.createDocument(null, "svg", null);
- // Create an SVGGeneratorContext to customize SVG generation
+ // Create an SVGGeneratorContext to customize SVG generation
SVGGeneratorContext ctx = SVGGeneratorContext.createDefault(this.document);
ctx.setComment("Generated by " + userAgent.getProducer() + " with Batik SVG Generator");
ctx.setEmbeddedFontsOn(true);
-
+
// Create an instance of the SVG Generator
this.svgGenerator = new SVGGraphics2D(ctx, true);
Rectangle2D viewArea = pageViewport.getViewArea();
@@ -111,15 +111,15 @@
this.state = new Java2DGraphicsState(this.svgGenerator, this.fontInfo, at);
try {
//super.renderPage(pageViewport);
- renderPageAreas(pageViewport.getPage());
+ renderPageAreas(pageViewport.getPage());
} finally {
this.state = null;
}
writeSVGFile(pageViewport.getPageIndex());
-
+
this.svgGenerator = null;
this.document = null;
-
+
}
/** @see org.apache.fop.render.Renderer#stopRenderer() */
@@ -168,5 +168,5 @@
}
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.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,8 +30,8 @@
public class SVGRendererMaker extends AbstractRendererMaker {
private static final String[] MIMES = new String[] {MimeConstants.MIME_SVG};
-
-
+
+
/**@see org.apache.fop.render.AbstractRendererMaker */
public Renderer makeRenderer(FOUserAgent ua) {
return new SVGRenderer();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java Fri Jul 25 05:44:20 2008
@@ -35,7 +35,7 @@
public class SVGSVGHandler implements XMLHandler, SVGRendererContextConstants {
/** @see org.apache.fop.render.XMLHandler */
- public void handleXML(RendererContext context,
+ public void handleXML(RendererContext context,
org.w3c.dom.Document doc, String ns) throws Exception {
if (getNamespace().equals(ns)) {
if (!(doc instanceof SVGDocument)) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.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;
import java.io.File;
@@ -28,7 +28,7 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
/**
- * Basic runtime test for FOP's transcoders. It is used to verify that
+ * Basic runtime test for FOP's transcoders. It is used to verify that
* nothing obvious is broken after compiling.
*/
public abstract class AbstractBasicTranscoderTestCase extends AbstractFOPTestCase {
@@ -47,25 +47,25 @@
protected abstract Transcoder createTranscoder();
/**
- * Runs the PDF transcoder as if it were called by Batik's rasterizer.
+ * Runs the PDF transcoder as if it were called by Batik's rasterizer.
* Without special configuration stuff.
* @throws Exception if a problem occurs
*/
public void testGenericPDFTranscoder() throws Exception {
//Create transcoder
Transcoder transcoder = createTranscoder();
-
+
//Setup input
File svgFile = new File(getBaseDir(), "test/resources/fop/svg/text.svg");
InputStream in = new java.io.FileInputStream(svgFile);
try {
TranscoderInput input = new TranscoderInput(in);
-
+
//Setup output
ByteArrayOutputStream out = new ByteArrayOutputStream();
try {
TranscoderOutput output = new TranscoderOutput(out);
-
+
//Do the transformation
transcoder.transcode(input, output);
} finally {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractFOPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractFOPTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractFOPTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/AbstractFOPTestCase.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;
import java.io.File;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestCase.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;
import java.io.File;
@@ -36,7 +36,7 @@
import org.apache.fop.cli.InputHandler;
/**
- * Basic runtime test for the old Fop class. It is used to verify that
+ * Basic runtime test for the old Fop class. It is used to verify that
* nothing obvious is broken after compiling.
*/
public class BasicDriverTestCase extends AbstractFOPTestCase {
@@ -59,13 +59,13 @@
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
ByteArrayOutputStream baout = new ByteArrayOutputStream();
Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, baout);
-
+
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer(); //Identity transf.
Source src = new StreamSource(foFile);
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
-
+
assertTrue("Generated PDF has zero length", baout.size() > 0);
}
@@ -78,13 +78,13 @@
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
ByteArrayOutputStream baout = new ByteArrayOutputStream();
Fop fop = fopFactory.newFop(MimeConstants.MIME_POSTSCRIPT, foUserAgent, baout);
-
+
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer(); //Identity transf.
Source src = new StreamSource(foFile);
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
-
+
assertTrue("Generated PostScript has zero length", baout.size() > 0);
}
@@ -97,13 +97,13 @@
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
ByteArrayOutputStream baout = new ByteArrayOutputStream();
Fop fop = fopFactory.newFop(MimeConstants.MIME_RTF, foUserAgent, baout);
-
+
TransformerFactory factory = TransformerFactory.newInstance();
Transformer transformer = factory.newTransformer(); //Identity transf.
Source src = new StreamSource(foFile);
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
-
+
assertTrue("Generated RTF has zero length", baout.size() > 0);
}
@@ -116,10 +116,10 @@
File xmlFile = new File(getBaseDir(), "test/xml/1.xml");
File xsltFile = new File(getBaseDir(), "test/xsl/doc.xsl");
ByteArrayOutputStream baout = new ByteArrayOutputStream();
-
+
InputHandler handler = new InputHandler(xmlFile, xsltFile, null);
handler.renderTo(foUserAgent, MimeConstants.MIME_PDF, baout);
-
+
assertTrue("Generated PDF has zero length", baout.size() > 0);
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicDriverTestSuite.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;
import junit.framework.Test;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPDFTranscoderTestCase.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,14 +16,14 @@
*/
/* $Id$ */
-
+
package org.apache.fop;
import org.apache.batik.transcoder.Transcoder;
import org.apache.fop.svg.PDFTranscoder;
/**
- * Basic runtime test for the PDF transcoder. It is used to verify that
+ * Basic runtime test for the PDF transcoder. It is used to verify that
* nothing obvious is broken after compiling.
*/
public class BasicPDFTranscoderTestCase extends AbstractBasicTranscoderTestCase {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPSTranscoderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPSTranscoderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicPSTranscoderTestCase.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,14 +16,14 @@
*/
/* $Id$ */
-
+
package org.apache.fop;
import org.apache.batik.transcoder.Transcoder;
import org.apache.fop.render.ps.PSTranscoder;
/**
- * Basic runtime test for the PS transcoder. It is used to verify that
+ * Basic runtime test for the PS transcoder. It is used to verify that
* nothing obvious is broken after compiling.
*/
public class BasicPSTranscoderTestCase extends AbstractBasicTranscoderTestCase {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicTranscoderTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicTranscoderTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicTranscoderTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/BasicTranscoderTestSuite.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;
import junit.framework.Test;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DebugHelper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DebugHelper.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DebugHelper.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DebugHelper.java Fri Jul 25 05:44:20 2008
@@ -28,9 +28,9 @@
public class DebugHelper {
private static boolean elObserversRegistered = false;
-
+
/**
- * Registers the default element list observers used for debugging.
+ * Registers the default element list observers used for debugging.
*/
public static void registerStandardElementListObservers() {
if (!elObserversRegistered) {
@@ -38,5 +38,5 @@
elObserversRegistered = true;
}
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org