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 vh...@apache.org on 2008/07/24 11:37:16 UTC
svn commit: r679326 [3/33] - in /xmlgraphics/fop/trunk:
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ examples/embedding/java/embedd...
Modified: xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java (original)
+++ xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java Thu Jul 24 02:35:34 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.mathml;
// FOP
Modified: xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/PreloaderMathML.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/PreloaderMathML.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/PreloaderMathML.java (original)
+++ xmlgraphics/fop/trunk/examples/mathml/src/org/apache/fop/mathml/PreloaderMathML.java Thu Jul 24 02:35:34 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.mathml;
import java.awt.Dimension;
@@ -58,8 +58,8 @@
private static Log log = LogFactory.getLog(PreloaderMathML.class);
private boolean jeuclidAvailable = true;
-
- /** {@inheritDoc} */
+
+ /** {@inheritDoc} */
public ImageInfo preloadImage(String uri, Source src, ImageContext context)
throws IOException {
if (!ImageUtil.hasInputStream(src)) {
@@ -89,21 +89,21 @@
* class.
*/
class Loader {
-
+
private ImageInfo getImage(String uri, Source src, ImageContext context) {
InputStream in = new UnclosableInputStream(ImageUtil.needInputStream(src));
try {
int length = in.available();
in.mark(length + 1);
-
+
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer transformer = tFactory.newTransformer();
Source source = new StreamSource(in);
SAXMathBuilder mathBuilder = new SAXMathBuilder();
SAXResult res = new SAXResult(mathBuilder);
transformer.transform(source, res);
-
+
String fontname = "Helvetica";
int fontstyle = 0;
int displayfontsize = 12;
@@ -122,7 +122,7 @@
mathBuilder.getMathRootElement(),
fontname, fontstyle, inlinefontsize,
displayfontsize);
-
+
ImageInfo info = new ImageInfo(uri, "text/mathml");
final ImageSize size = new ImageSize();
size.setSizeInMillipoints(
@@ -142,13 +142,13 @@
public void paint(Graphics2D g2d, Rectangle2D area) {
base.paint(g2d);
}
-
+
};
-
+
//The whole image had to be loaded for this, so keep it
Image image = new ImageGraphics2D(info, painter);
info.getCustomObjects().put(ImageInfo.ORIGINAL_IMAGE, image);
-
+
return info;
} catch (NoClassDefFoundError ncdfe) {
try {
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/ActionInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/ActionInfo.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/ActionInfo.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/ActionInfo.java Thu Jul 24 02:35:34 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,13 +16,13 @@
*/
/* $Id$ */
-
+
package org.apache.fop.plan;
import java.util.Date;
public class ActionInfo {
-
+
public static final int TASK = 1;
public static final int MILESTONE = 2;
public static final int GROUPING = 3;
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/EventList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/EventList.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/EventList.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/EventList.java Thu Jul 24 02:35:34 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,13 +16,13 @@
*/
/* $Id$ */
-
+
package org.apache.fop.plan;
import java.util.List;
public class EventList {
-
+
private List data = new java.util.ArrayList();
public void addGroupInfo(GroupInfo set) {
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/GroupInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/GroupInfo.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/GroupInfo.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/GroupInfo.java Thu Jul 24 02:35:34 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,13 +16,13 @@
*/
/* $Id$ */
-
+
package org.apache.fop.plan;
import java.util.List;
public class GroupInfo {
-
+
private String name;
private List actions = new java.util.ArrayList();
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/Main.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/Main.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/Main.java Thu Jul 24 02:35:34 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.plan;
import java.io.InputStream;
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanDrawer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanDrawer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanDrawer.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanDrawer.java Thu Jul 24 02:35:34 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.plan;
import java.util.HashMap;
@@ -27,7 +27,7 @@
* This interface defines how a plan drawer is converted.
*/
public interface PlanDrawer {
-
+
Document createDocument(EventList data, float w, float h,
HashMap hints);
}
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElement.java Thu Jul 24 02:35:34 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.plan;
import java.awt.geom.Point2D;
@@ -48,7 +48,7 @@
}
/** {@inheritDoc} */
- public void processNode(String elementName, Locator locator,
+ public void processNode(String elementName, Locator locator,
Attributes attlist, PropertyList propertyList)
throws FOPException {
super.processNode(elementName, locator, attlist, propertyList);
@@ -67,7 +67,7 @@
svgDoc = pr.createSVGDocument(doc);
width = pr.getWidth();
height = pr.getHeight();
-
+
doc = svgDoc;
}
} catch (Throwable t) {
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java Thu Jul 24 02:35:34 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.plan;
import org.w3c.dom.DOMImplementation;
@@ -30,7 +30,7 @@
public class PlanElementMapping extends ElementMapping {
/** Plan Namespace */
- public static final String NAMESPACE = "http://xmlgraphics.apache.org/fop/plan";
+ public static final String NAMESPACE = "http://xmlgraphics.apache.org/fop/plan";
/** Main constructor. */
public PlanElementMapping() {
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanHints.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanHints.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanHints.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanHints.java Thu Jul 24 02:35:34 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.plan;
/**
* This interface defines some constants for use in the plan package.
*/
public interface PlanHints {
-
+
/** Border attribute */
public static final String PLAN_BORDER = "border";
/** Legend attribute */
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanObj.java Thu Jul 24 02:35:34 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.plan;
// FOP
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanRenderer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanRenderer.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PlanRenderer.java Thu Jul 24 02:35:34 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.plan;
@@ -34,9 +34,9 @@
import org.apache.batik.dom.svg.SVGDOMImplementation;
public class PlanRenderer {
-
+
private static final String SVG_NAMESPACE = SVGDOMImplementation.SVG_NAMESPACE_URI;
-
+
private String fontFamily = "sansserif";
private float fontSize = 12;
private String type = "";
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/PreloaderPlan.java Thu Jul 24 02:35:34 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.plan;
import java.io.IOException;
@@ -52,7 +52,7 @@
/** Logger instance */
private static Log log = LogFactory.getLog(PreloaderPlan.class);
- /** {@inheritDoc} */
+ /** {@inheritDoc} */
public ImageInfo preloadImage(String uri, Source src, ImageContext context)
throws IOException {
if (!ImageUtil.hasInputStream(src)) {
@@ -75,13 +75,13 @@
Source source = new StreamSource(in);
DOMResult res = new DOMResult();
transformer.transform(source, res);
-
+
//Have to render the plan to know its size
PlanRenderer pr = new PlanRenderer();
Document svgDoc = pr.createSVGDocument((Document)res.getNode());
float width = pr.getWidth();
float height = pr.getHeight();
-
+
//Return converted SVG image
ImageInfo info = new ImageInfo(uri, "image/svg+xml");
final ImageSize size = new ImageSize();
@@ -97,7 +97,7 @@
Image image = new ImageXMLDOM(info, svgDoc,
svgDoc.getDocumentElement().getNamespaceURI());
info.getCustomObjects().put(ImageInfo.ORIGINAL_IMAGE, image);
-
+
return info;
} catch (TransformerException e) {
try {
Modified: xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java (original)
+++ xmlgraphics/fop/trunk/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java Thu Jul 24 02:35:34 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.plan;
import java.text.DateFormat;
@@ -35,9 +35,9 @@
* Simple plan drawer implementation.
*/
public class SimplePlanDrawer implements PlanDrawer {
-
+
private static final String SVG_NAMESPACE = SVGDOMImplementation.SVG_NAMESPACE_URI;
-
+
private float fontSize;
private HashMap hints;
private java.awt.Font font = null;
@@ -91,8 +91,8 @@
svgRoot.setAttributeNS(null, "width", "" + width);
svgRoot.setAttributeNS(null, "height", "" + height);
svgRoot.setAttributeNS(null, "style",
- "font-size:" + 8
- + ";font-family:"
+ "font-size:" + 8
+ + ";font-family:"
+ hints.get(PlanHints.FONT_FAMILY));
font = new java.awt.Font((String)hints.get(PlanHints.FONT_FAMILY),
@@ -249,8 +249,8 @@
taskGraphic = SVGUtilities.createRect(doc,
left + daysToStart * 300 / (totalDays - 2),
topEdge + 2, days * 300 / (totalDays - 2), 10);
- taskGraphic.setAttributeNS(null,
- "style",
+ taskGraphic.setAttributeNS(null,
+ "style",
"stroke:black;fill:blue;stroke-width:1;clip-path:url(#clip3)");
g.appendChild(taskGraphic);
break;
@@ -259,8 +259,8 @@
"m " + (left
+ daysToStart * 300 / (totalDays - 2) - 6)
+ " " + (topEdge + 6) + "l6 6l6-6l-6-6z");
- taskGraphic.setAttributeNS(null,
- "style",
+ taskGraphic.setAttributeNS(null,
+ "style",
"stroke:black;fill:black;stroke-width:1;clip-path:url(#clip3)");
g.appendChild(taskGraphic);
text = SVGUtilities.createText(doc,
@@ -271,7 +271,7 @@
break;
case ActionInfo.GROUPING:
taskGraphic = SVGUtilities.createPath(doc,
- "m " + (left
+ "m " + (left
+ daysToStart * 300 / (totalDays - 2) - 6)
+ " " + (topEdge + 6) + "l6 -6l"
+ (days * 300 / (totalDays - 2))
@@ -279,7 +279,7 @@
+ -(days * 300 / (totalDays - 2) - 8)
+ " 0l-4 4l-6-6z");
taskGraphic.setAttributeNS(null,
- "style",
+ "style",
"stroke:black;fill:black;stroke-width:1;clip-path:url(#clip3)");
g.appendChild(taskGraphic);
break;
Modified: xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventConventionException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventConventionException.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventConventionException.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventConventionException.java Thu Jul 24 02:35:34 2008
@@ -33,5 +33,5 @@
public EventConventionException(String message) {
super(message);
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java Thu Jul 24 02:35:34 2008
@@ -1,13 +1,13 @@
-/*
+/*
* 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.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,7 +67,7 @@
* table for the table driven line breaking algorithm described in
* <a href="http://unicode.org/reports/tr14/#PairBasedImplementation">UTR #14</a>.
* TODO: Code points above the base plane are simply ignored.
- *
+ *
* @param lineBreakFileName Name of line break property file (part of Unicode files).
* @param propertyValueFileName Name of property values alias file (part of Unicode files).
* @param breakPairFileName Name of pair table file (<i>not</i> part of the unicode files).
@@ -109,7 +109,7 @@
if (line != null) {
lineTokens = line.split("\\s+");
byte columnNumber = 0;
-
+
for (int i = 0; i < lineTokens.length; ++i) {
name = lineTokens[i];
if (name.length() > 0) {
@@ -481,7 +481,7 @@
* Read line break property value names and the actual properties for the Unicode
* characters from the respective Unicode files.
* TODO: Code points above the base plane are simply ignored.
- *
+ *
* @param lineBreakFileName Name of line break property file.
* @param propertyValueFileName Name of property values alias file.
* @throws Exception in case anything goes wrong.
@@ -600,7 +600,7 @@
* Determine a good block size for the two stage optimized storage of the
* line breaking properties. Note: the memory utilization calculation is a rule of thumb,
* don't take it too serious.
- *
+ *
* @param lineBreakFileName Name of line break property file.
* @param propertyValueFileName Name of property values alias file.
* @throws Exception in case anything goes wrong.
Modified: xmlgraphics/fop/trunk/src/documentation/content/xdocs/DnI/BookMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/content/xdocs/DnI/BookMaker.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/documentation/content/xdocs/DnI/BookMaker.java (original)
+++ xmlgraphics/fop/trunk/src/documentation/content/xdocs/DnI/BookMaker.java Thu Jul 24 02:35:34 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.
@@ -75,7 +75,7 @@
import org.apache.fop.messaging.MessageHandler;
/**
- * This class converts an XML file to PDF using
+ * This class converts an XML file to PDF using
* JAXP (XSLT) and FOP (XSL:FO).
*/
public class BookMaker implements ErrorHandler {
@@ -113,7 +113,7 @@
throw e;
}
- public void makeBook()
+ public void makeBook()
throws IOException, FOPException, TransformerException,
FactoryConfigurationError,
ParserConfigurationException, SAXException {
@@ -160,7 +160,7 @@
+ " as SAX parser");
xmlReader.setErrorHandler(this);
xmlReader.setEntityResolver(resolver);
-
+
// Setup SAX source
fis = new FileInputStream(xmlFile);
is = new InputSource(fis);
@@ -175,7 +175,7 @@
+ " as SAX parser");
xmlReader.setErrorHandler(this);
xmlReader.setEntityResolver(resolver);
-
+
// Setup SAX source
fis = new FileInputStream(xsltFile);
is = new InputSource(fis);
@@ -210,7 +210,7 @@
+ " as TrAX transformer");
// Set the value of parameters, if any, defined for stylesheet
- if (xsltParams != null) {
+ if (xsltParams != null) {
for (int i = 0; i < xsltParams.size(); i += 2) {
transformer.setParameter
((String) xsltParams.elementAt(i),
@@ -299,7 +299,7 @@
}
if (cl.hasOption("xsl")) {
app.xsltFile = new File(cl.getOptionValue("xsl"));
- }
+ }
if (cl.hasOption("out")) {
app.outFile = new File(cl.getOptionValue("out"));
}
@@ -323,9 +323,9 @@
}
app.logger.info("");
app.logger.info("Transforming...");
-
+
app.makeBook();
-
+
app.logger.info("Transforming done");
} catch (Exception e) {
app.logger.error(ExceptionUtil.printStackTrace(e));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/Version.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/Version.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/Version.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/Version.java Thu Jul 24 02:35:34 2008
@@ -25,7 +25,7 @@
* as this package equals the one specified in the manifest.
*/
public final class Version {
-
+
private Version() { }
/**
@@ -40,11 +40,11 @@
}
if (version == null) {
//Fallback if FOP is used in a development environment
- String headURL
+ String headURL
= "$HeadURL$";
version = headURL;
final String pathPrefix = "/xmlgraphics/fop/";
- int pos = version.indexOf(pathPrefix);
+ int pos = version.indexOf(pathPrefix);
if (pos >= 0) {
version = version.substring(pos + pathPrefix.length() - 1, version.length() - 2);
pos = version.indexOf("/src/");
@@ -57,5 +57,5 @@
}
return version;
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOPException.java Thu Jul 24 02:35:34 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
private String systemId;
private int line;
private int column;
-
+
private String localizedMessage;
/**
@@ -80,7 +80,7 @@
/**
* Constructs a new exception with the specified detail message and cause.
* @param message the detail message
- * @param cause the cause
+ * @param cause the cause
*/
public FOPException(String message, Exception cause) {
super(message, cause);
@@ -212,7 +212,7 @@
}
}
}
-
+
/**
* Sets the localized message for this exception.
* @param msg the localized message
@@ -230,6 +230,6 @@
}
}
-
-
+
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java Thu Jul 24 02:35:34 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.
@@ -42,7 +42,7 @@
/**
* Provides FOP specific URI resolution. This is the default URIResolver
* {@link FOUserAgent} will use unless overidden.
- *
+ *
* @see javax.xml.transform.URIResolver
*/
public class FOURIResolver implements javax.xml.transform.URIResolver {
@@ -96,7 +96,7 @@
/**
* Additional constructor
- *
+ *
* @param throwExceptions
* true if exceptions are to be thrown if the URIs cannot be
* resolved.
@@ -107,7 +107,7 @@
/**
* Handles resolve exceptions appropriately.
- *
+ *
* @param errorStr
* error string
* @param strict
@@ -133,7 +133,7 @@
* If the method is successful it will return a Source of type
* {@link javax.xml.transform.stream.StreamSource} with its SystemID set to
* the resolved URL used to open the underlying InputStream.
- *
+ *
* @param href
* An href attribute, which may be relative or absolute.
* @param base
@@ -212,13 +212,13 @@
/*
* This piece of code is based on the following statement in
* RFC2396 section 5.2:
- *
+ *
* 3) If the scheme component is defined, indicating that
* the reference starts with a scheme name, then the
* reference is interpreted as an absolute URI and we are
* done. Otherwise, the reference URI's scheme is inherited
* from the base URI's scheme component.
- *
+ *
* Due to a loophole in prior specifications [RFC1630], some
* parsers allow the scheme name to be present in a relative
* URI if it is the same as the base URI scheme.
@@ -228,7 +228,7 @@
* removing the scheme if it matches that of the base URI
* and the scheme is known to always use the <hier_part>
* syntax.
- *
+ *
* The URL class does not implement this work around, so we
* do.
*/
@@ -281,7 +281,7 @@
* before the connect() method is called. Subclass FOURIResolver and
* override this method to do things like adding the user name and password
* for HTTP basic authentication.
- *
+ *
* @param connection
* the URLConnection instance
* @param href
@@ -295,7 +295,7 @@
* This is a convenience method for users who want to override
* updateURLConnection for HTTP basic authentication. Simply call it using
* the right username and password.
- *
+ *
* @param connection
* the URLConnection to set up for HTTP basic authentication
* @param username
@@ -327,7 +327,7 @@
* Sets the custom URI Resolver. It is used for resolving factory-level URIs like
* hyphenation patterns and as backup for URI resolution performed during a
* rendering run.
- *
+ *
* @param resolver
* the new URI resolver
*/
@@ -337,7 +337,7 @@
/**
* Returns the custom URI Resolver.
- *
+ *
* @return the URI Resolver or null, if none is set
*/
public URIResolver getCustomURIResolver() {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java Thu Jul 24 02:35:34 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.
@@ -468,7 +468,7 @@
/**
* Gets the default page-height to use as fallback,
* in case page-height="auto"
- *
+ *
* @return the page-height, as a String
* @see FopFactory#getPageHeight()
*/
@@ -479,7 +479,7 @@
/**
* Gets the default page-width to use as fallback,
* in case page-width="auto"
- *
+ *
* @return the page-width, as a String
* @see FopFactory#getPageWidth()
*/
@@ -522,7 +522,7 @@
/**
* Controls the use of SAXLocators to provide location information in error
* messages.
- *
+ *
* @param enableLocator <code>false</code> if SAX Locators should be disabled
*/
public void setLocatorEnabled(boolean enableLocator) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/Fop.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/Fop.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/Fop.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/Fop.java Thu Jul 24 02:35:34 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,13 +30,13 @@
* Primary class that activates the FOP process for embedded usage.
* <P>
* JAXP is the standard method of embedding FOP in Java programs.
- * Please check our
+ * Please check our
* <a href="http://xmlgraphics.apache.org/fop/trunk/embedding.html">embedding page</a>
- * for samples (these are also available within the distribution in
+ * for samples (these are also available within the distribution in
* FOP_DIR\examples\embedding)
* <P>
* Methods within FOUserAgent are available to customize portions of the
- * process. For example, a specific Renderer object can be specified,
+ * process. For example, a specific Renderer object can be specified,
* also ElementMappings which determine elements in the FO that can be
* processed) can be added.
* <P>
@@ -58,7 +58,7 @@
private FOTreeBuilder foTreeBuilder = null;
/**
- * Constructor for use with already-created FOUserAgents. It uses MIME types to select the
+ * Constructor for use with already-created FOUserAgents. It uses MIME types to select the
* output format (ex. "application/pdf" for PDF).
* @param outputFormat the MIME type of the output format to use (ex. "application/pdf").
* @param ua FOUserAgent object
@@ -72,9 +72,9 @@
if (foUserAgent == null) {
foUserAgent = FopFactory.newInstance().newFOUserAgent();
}
-
+
this.stream = stream;
-
+
createDefaultHandler();
}
@@ -119,7 +119,7 @@
* page-sequence. Call this method only after the rendering process is
* finished. Note that the results are only available for output formats
* which make use of FOP's layout engine (PDF, PS, etc.).
- * @return the results of the rendering process, or null for flow-oriented
+ * @return the results of the rendering process, or null for flow-oriented
* output formats like RTF and MIF.
*/
public FormattingResults getResults() {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Thu Jul 24 02:35:34 2008
@@ -537,7 +537,7 @@
/**
* Gets the default page-height to use as fallback,
* in case page-height="auto"
- *
+ *
* @return the page-height, as a String
*/
public String getPageHeight() {
@@ -547,7 +547,7 @@
/**
* Sets the page-height to use as fallback, in case
* page-height="auto"
- *
+ *
* @param pageHeight page-height as a String
*/
public void setPageHeight(String pageHeight) {
@@ -560,7 +560,7 @@
/**
* Gets the default page-width to use as fallback,
* in case page-width="auto"
- *
+ *
* @return the page-width, as a String
*/
public String getPageWidth() {
@@ -570,7 +570,7 @@
/**
* Sets the page-width to use as fallback, in case
* page-width="auto"
- *
+ *
* @param pageWidth page-width as a String
*/
public void setPageWidth(String pageWidth) {
@@ -729,13 +729,13 @@
/**
* Create (if needed) and return an ICC ColorSpace instance.
- *
+ *
* The ICC profile source is taken from the src attribute of the color-profile FO element.
* If the ICC ColorSpace is not yet in the cache a new one is created and stored in the cache.
- *
+ *
* The FOP URI resolver is used to try and locate the ICC file.
* If that fails null is returned.
- *
+ *
* @param baseUri a base URI to resolve relative URIs
* @param iccProfileSrc ICC Profile source to return a ColorSpace for
* @return ICC ColorSpace object or null if ColorSpace could not be created
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/apps/FormattingResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FormattingResults.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/apps/MimeConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/MimeConstants.java Thu Jul 24 02:35:34 2008
@@ -26,38 +26,38 @@
/** Portable Document Format */
String MIME_PDF = "application/pdf";
-
+
/** PostScript */
String MIME_POSTSCRIPT = "application/postscript";
/** Encapsulated PostScript (same MIME type as PostScript) */
String MIME_EPS = MIME_POSTSCRIPT;
-
+
/** HP's PCL */
String MIME_PCL = "application/x-pcl";
/** HP's PCL (alternative MIME type) */
String MIME_PCL_ALT = "application/vnd.hp-PCL";
-
+
/** IBM's AFP */
String MIME_AFP = "application/x-afp";
/** IBM's AFP (alternative MIME type) */
String MIME_AFP_ALT = "application/vnd.ibm.modcap";
-
+
/** Plain text */
String MIME_PLAIN_TEXT = "text/plain";
-
+
/** Rich text format */
String MIME_RTF = "application/rtf";
/** Rich text format (alternative 1) */
String MIME_RTF_ALT1 = "text/richtext";
/** Rich text format (alternative 2) */
String MIME_RTF_ALT2 = "text/rtf";
-
+
/** FrameMaker's MIF */
String MIME_MIF = "application/mif";
-
+
/** Scalable Vector Graphics */
String MIME_SVG = "image/svg+xml";
-
+
/** GIF images */
String MIME_GIF = "image/gif";
/** PNG images */
@@ -66,7 +66,7 @@
String MIME_JPEG = "image/jpeg";
/** TIFF images */
String MIME_TIFF = "image/tiff";
-
+
/** Apache FOP's AWT preview (non-standard MIME type) */
String MIME_FOP_AWT_PREVIEW = "application/X-fop-awt-preview";
/** Apache FOP's Direct Printing (non-standard MIME type) */
@@ -76,5 +76,5 @@
/** Proposed but non-registered MIME type for XSL-FO */
String MIME_XSL_FO = "text/xsl";
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/PageSequenceResults.java Thu Jul 24 02:35:34 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/trunk/src/java/org/apache/fop/area/AbstractOffDocumentItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AbstractOffDocumentItem.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AbstractOffDocumentItem.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AbstractOffDocumentItem.java Thu Jul 24 02:35:34 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;
/**
@@ -51,10 +51,10 @@
*/
public static final int START_OF_DOC = 2;
-
+
/** Indicates in what phase the item should be processed. */
protected int whenToProcess = IMMEDIATELY;
-
+
/**
* Get an indicator of when this item should be processed
* @return int constant (IMMEDIATELY, AFTER_PAGE, START_OF_DOC, END_OF_DOC)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Thu Jul 24 02:35:34 2008
@@ -165,9 +165,9 @@
}
/**
- * Get the inline progression dimension of the content rectangle
+ * Get the inline progression dimension of the content rectangle
* for this area.
- *
+ *
* @return the inline progression dimension
* @see <a href="http://www.w3.org/TR/xsl/slice4.html#area-common">ipd</a>
*/
@@ -216,7 +216,7 @@
* @return the total BPD allocation for this area
*/
public int getAllocBPD() {
- return getSpaceBefore() + getBorderAndPaddingWidthBefore() + getBPD()
+ return getSpaceBefore() + getBorderAndPaddingWidthBefore() + getBPD()
+ getBorderAndPaddingWidthAfter() + getSpaceAfter();
}
@@ -231,7 +231,7 @@
if (bps != null) {
margin = bps.width;
}
-
+
Integer padWidth = (Integer) getTrait(Trait.PADDING_BEFORE);
if (padWidth != null) {
margin += padWidth.intValue();
@@ -239,7 +239,7 @@
return margin;
}
-
+
/**
* Return the sum of region border- and padding-after
*
@@ -247,12 +247,12 @@
*/
public int getBorderAndPaddingWidthAfter() {
int margin = 0;
-
+
BorderProps bps = (BorderProps) getTrait(Trait.BORDER_AFTER);
if (bps != null) {
margin = bps.width;
}
-
+
Integer padWidth = (Integer) getTrait(Trait.PADDING_AFTER);
if (padWidth != null) {
margin += padWidth.intValue();
@@ -272,7 +272,7 @@
if (bps != null) {
margin = bps.width;
}
-
+
Integer padWidth = (Integer) getTrait(Trait.PADDING_START);
if (padWidth != null) {
margin += padWidth.intValue();
@@ -292,7 +292,7 @@
if (bps != null) {
margin = bps.width;
}
-
+
Integer padWidth = (Integer) getTrait(Trait.PADDING_END);
if (padWidth != null) {
margin += padWidth.intValue();
@@ -314,7 +314,7 @@
}
return margin;
}
-
+
/**
* Returns the space after
*
@@ -328,7 +328,7 @@
}
return margin;
}
-
+
/**
* Returns the space start
*
@@ -342,7 +342,7 @@
}
return margin;
}
-
+
/**
* Returns the space end
*
@@ -356,7 +356,7 @@
}
return margin;
}
-
+
/**
* Add a child to this area.
* The default is to do nothing. Subclasses must override
@@ -393,7 +393,7 @@
public boolean hasTraits() {
return (this.props != null);
}
-
+
/**
* Get a trait from this area.
*
@@ -403,7 +403,7 @@
public Object getTrait(Object oTraitCode) {
return (props != null ? props.get(oTraitCode) : null);
}
-
+
/**
* Checks whether a certain trait is set on this area.
* @param oTraitCode the trait key
@@ -412,7 +412,7 @@
public boolean hasTrait(Object oTraitCode) {
return (getTrait(oTraitCode) != null);
}
-
+
/**
* Get a boolean trait from this area.
* @param oTraitCode the trait key
@@ -438,10 +438,10 @@
+ " could not be converted to an integer");
}
}
-
+
/**
* {@inheritDoc}
- * @return ipd and bpd of area
+ * @return ipd and bpd of area
* */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaEventProducer.java Thu Jul 24 02:35:34 2008
@@ -31,7 +31,7 @@
* Provider class for the event producer.
*/
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -51,7 +51,7 @@
* @event.severity WARN
*/
void unresolvedIDReference(Object source, String type, String id);
-
+
/**
* An unresolved ID reference was encountered on a page.
* @param source the event source
@@ -60,7 +60,7 @@
* @event.severity WARN
*/
void unresolvedIDReferenceOnPage(Object source, String page, String id);
-
+
/**
* A page could not be loaded/deserialized from a file.
* @param source the event source
@@ -69,7 +69,7 @@
* @event.severity ERROR
*/
void pageLoadError(Object source, String page, Exception e);
-
+
/**
* A page could not be saved/serialized to a file.
* @param source the event source
@@ -78,7 +78,7 @@
* @event.severity ERROR
*/
void pageSaveError(Object source, String page, Exception e);
-
+
/**
* A page could not be rendered.
* @param source the event source
@@ -87,5 +87,5 @@
* @event.severity ERROR
*/
void pageRenderingError(Object source, String page, Exception e);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeHandler.java Thu Jul 24 02:35:34 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.
@@ -49,7 +49,7 @@
/**
* Area tree handler for formatting objects.
- *
+ *
* Concepts: The area tree is to be as small as possible. With minimal classes
* and data to fully represent an area tree for formatting objects. The area
* tree needs to be simple to render and follow the spec closely. This area tree
@@ -61,7 +61,7 @@
* type of renderer.
*/
public class AreaTreeHandler extends FOEventHandler {
-
+
private static Log log = LogFactory.getLog(AreaTreeHandler.class);
// Recorder of debug statistics
@@ -78,7 +78,7 @@
// The fo:root node of the document
private Root rootFObj;
-
+
// The formatting results to be handed back to the caller.
private FormattingResults results = new FormattingResults();
@@ -88,7 +88,7 @@
/**
* Constructor.
- *
+ *
* @param userAgent FOUserAgent object for process
* @param outputFormat the MIME type of the output format to use (ex.
* "application/pdf").
@@ -107,7 +107,7 @@
}
idTracker = new IDTracker();
-
+
if (log.isDebugEnabled()) {
statistics = new Statistics();
}
@@ -115,7 +115,7 @@
/**
* Sets up the AreaTreeModel instance for use by the AreaTreeHandler.
- *
+ *
* @param userAgent FOUserAgent object for process
* @param outputFormat the MIME type of the output format to use (ex.
* "application/pdf").
@@ -129,7 +129,7 @@
/**
* Get the area tree model for this area tree.
- *
+ *
* @return AreaTreeModel the model being used for this area tree
*/
public AreaTreeModel getAreaTreeModel() {
@@ -138,7 +138,7 @@
/**
* Get the LayoutManager maker for this area tree.
- *
+ *
* @return LayoutManagerMaker the LayoutManager maker being used for this
* area tree
*/
@@ -148,7 +148,7 @@
/**
* Get the IDTracker for this area tree.
- *
+ *
* @return IDTracker used to track reference ids for items in this area tree
*/
public IDTracker getIDTracker() {
@@ -157,7 +157,7 @@
/**
* Get information about the rendered output, like number of pages created.
- *
+ *
* @return the results structure
*/
public FormattingResults getResults() {
@@ -167,7 +167,7 @@
/**
* Prepare AreaTreeHandler for document processing This is called from
* FOTreeBuilder.startDocument()
- *
+ *
* @throws SAXException
* if there is an error
*/
@@ -193,7 +193,7 @@
public void startPageSequence(PageSequence pageSequence) {
startAbstractPageSequence(pageSequence);
}
-
+
private void startAbstractPageSequence(AbstractPageSequence pageSequence) {
rootFObj = pageSequence.getRoot();
finishPrevPageSequence(pageSequence.getInitialPageNumber());
@@ -217,7 +217,7 @@
/**
* End the PageSequence. The PageSequence formats Pages and adds them to the
* AreaTree. The area tree then handles what happens with the pages.
- *
+ *
* @param pageSequence the page sequence ending
*/
public void endPageSequence(PageSequence pageSequence) {
@@ -248,20 +248,20 @@
if (statistics != null) {
statistics.end();
}
-
+
ExternalDocumentLayoutManager edLM;
edLM = getLayoutManagerMaker().makeExternalDocumentLayoutManager(this, document);
edLM.activateLayout();
// preserve the current PageSequenceLayoutManger for the
// force-page-count check at the beginning of the next PageSequence
prevPageSeqLM = edLM;
-
+
}
/**
* Called by the PageSequenceLayoutManager when it is finished with a
* page-sequence.
- *
+ *
* @param pageSequence the page-sequence just finished
* @param pageCount The number of pages generated for the page-sequence
*/
@@ -275,7 +275,7 @@
/**
* End the document.
- *
+ *
* @throws SAXException if there is some error
*/
public void endDocument() throws SAXException {
@@ -313,7 +313,7 @@
* Add a OffDocumentItem to the area tree model. This checks if the
* OffDocumentItem is resolvable and attempts to resolve or add the
* resolvable ids for later resolution.
- *
+ *
* @param odi the OffDocumentItem to add.
*/
private void addOffDocumentItem(OffDocumentItem odi) {
@@ -342,7 +342,7 @@
/**
* Generates and returns a unique key for a page viewport.
- *
+ *
* @return the generated key.
*/
public String generatePageViewportKey() {
@@ -354,7 +354,7 @@
* Tie a PageViewport with an ID found on a child area of the PV. Note that
* an area with a given ID may be on more than one PV, hence an ID may have
* more than one PV associated with it.
- *
+ *
* @param id the property ID of the area
* @param pv a page viewport that contains the area with this ID
* @deprecated use getIdTracker().associateIDWithPageViewport(id, pv) instead
@@ -367,7 +367,7 @@
* This method tie an ID to the areaTreeHandler until this one is ready to
* be processed. This is used in page-number-citation-last processing so we
* know when an id can be resolved.
- *
+ *
* @param id the id of the object being processed
* @deprecated use getIdTracker().signalPendingID(id) instead
*/
@@ -379,7 +379,7 @@
* Signals that all areas for the formatting object with the given ID have
* been generated. This is used to determine when page-number-citation-last
* ref-ids can be resolved.
- *
+ *
* @param id the id of the formatting object which was just finished
* @deprecated use getIdTracker().signalIDProcessed(id) instead
*/
@@ -389,7 +389,7 @@
/**
* Check if an ID has already been resolved
- *
+ *
* @param id the id to check
* @return true if the ID has been resolved
* @deprecated use getIdTracker().alreadyResolvedID(id) instead
@@ -400,7 +400,7 @@
/**
* Tries to resolve all unresolved ID references on the given page.
- *
+ *
* @param pv page viewport whose ID refs to resolve
* @deprecated use getIdTracker().tryIDResolution(pv) instead
*/
@@ -410,7 +410,7 @@
/**
* Get the list of page viewports that have an area with a given id.
- *
+ *
* @param id the id to lookup
* @return the list of PageViewports
* @deprecated use getIdTracker().getPageViewportsContainingID(id) instead
@@ -421,7 +421,7 @@
/**
* Add an Resolvable object with an unresolved idref
- *
+ *
* @param idref the idref whose target id has not yet been located
* @param res the Resolvable object needing the idref to be resolved
* @deprecated use getIdTracker().addUnresolvedIDRef(idref, res) instead
@@ -429,7 +429,7 @@
public void addUnresolvedIDRef(String idref, Resolvable res) {
idTracker.addUnresolvedIDRef(idref, res);
}
-
+
private class Statistics {
// for statistics gathering
private Runtime runtime;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeModel.java Thu Jul 24 02:35:34 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;
// Java
@@ -80,7 +80,7 @@
}
/**
- * Handle an OffDocumentItem
+ * Handle an OffDocumentItem
* @param ext the extension to handle
*/
public void handleOffDocumentItem(OffDocumentItem ext) {};
@@ -98,7 +98,7 @@
public PageSequence getCurrentPageSequence() {
return this.currentPageSequence;
}
-
+
/**
* Get the page sequence count.
* @return the number of page sequences in the document.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeObject.java Thu Jul 24 02:35:34 2008
@@ -32,7 +32,7 @@
/** Foreign attributes */
protected Map foreignAttributes = null;
-
+
/**
* Sets a foreign attribute.
* @param name the qualified name of the attribute
@@ -44,7 +44,7 @@
}
this.foreignAttributes.put(name, value);
}
-
+
/**
* Set foreign attributes from a Map.
* @param atts a Map with attributes (keys: QName, values: String)
@@ -57,11 +57,11 @@
while (iter.hasNext()) {
Map.Entry entry = (Map.Entry)iter.next();
String value = (String)entry.getValue();
- //The casting is only to ensure type safety (too bad we can't use generics, yet)
+ //The casting is only to ensure type safety (too bad we can't use generics, yet)
setForeignAttribute((QName)entry.getKey(), value);
}
}
-
+
/**
* Returns the value of a foreign attribute on the area.
* @param name the qualified name of the attribute
@@ -74,7 +74,7 @@
return null;
}
}
-
+
/** @return the foreign attributes associated with this area */
public Map getForeignAttributes() {
if (this.foreignAttributes != null) {
@@ -83,6 +83,6 @@
return Collections.EMPTY_MAP;
}
}
-
-
+
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java Thu Jul 24 02:35:34 2008
@@ -85,7 +85,7 @@
/** Logger instance */
protected static Log log = LogFactory.getLog(AreaTreeParser.class);
- private static SAXTransformerFactory tFactory
+ private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
/**
@@ -96,11 +96,11 @@
* @param userAgent the user agent
* @throws TransformerException if an error occurs while parsing the area tree XML
*/
- public void parse(Source src, AreaTreeModel treeModel, FOUserAgent userAgent)
+ public void parse(Source src, AreaTreeModel treeModel, FOUserAgent userAgent)
throws TransformerException {
Transformer transformer = tFactory.newTransformer();
transformer.setErrorListener(new DefaultErrorListener(log));
-
+
SAXResult res = new SAXResult(getContentHandler(treeModel, userAgent));
transformer.transform(src, res);
@@ -131,7 +131,7 @@
private CharBuffer content = CharBuffer.allocate(64);
private boolean ignoreCharacters = true;
-
+
private PageViewport currentPageViewport;
private Map pageViewportsByKey = new java.util.HashMap();
// set of "ID firsts" that have already been assigned to a PV:
@@ -328,7 +328,7 @@
public void endElement() {
//nop
}
-
+
public boolean ignoreCharacters() {
return true;
}
@@ -409,7 +409,7 @@
currentPageViewport = null;
}
}
-
+
private class RegionViewportMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
@@ -427,10 +427,10 @@
setTraits(attributes, rv, SUBSET_COLOR);
areaStack.push(rv);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), RegionViewport.class);
- }
+ }
}
private class RegionBeforeMaker extends AbstractMaker {
@@ -438,7 +438,7 @@
public void startElement(Attributes attributes) {
pushNewRegionReference(attributes, Constants.FO_REGION_BEFORE);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), RegionReference.class);
}
@@ -465,7 +465,7 @@
assertObjectOfClass(areaStack.pop(), RegionReference.class);
}
}
-
+
private class RegionEndMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
@@ -488,7 +488,7 @@
int columnCount = getAttributeAsInteger(attributes, "columnCount", 1);
int columnGap = getAttributeAsInteger(attributes, "columnGap", 0);
RegionViewport rv = getCurrentRegionViewport();
- body = new BodyRegion(Constants.FO_REGION_BODY,
+ body = new BodyRegion(Constants.FO_REGION_BODY,
regionName, rv, columnCount, columnGap);
transferForeignObjects(attributes, body);
body.setCTM(getAttributeAsCTM(attributes, "ctm"));
@@ -498,10 +498,10 @@
Constants.FO_REGION_BODY, rv);
areaStack.push(body);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), BodyRegion.class);
- }
+ }
}
private class FlowMaker extends AbstractMaker {
@@ -518,12 +518,12 @@
setAreaAttributes(attributes, flow);
areaStack.push(flow);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), NormalFlow.class);
- }
+ }
}
-
+
private class MainReferenceMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
@@ -540,7 +540,7 @@
int ipd = getAttributeAsInteger(attributes, "ipd", 0);
int columnCount = getAttributeAsInteger(attributes, "columnCount", 1);
BodyRegion body = getCurrentBodyRegion();
- Span span = new Span(columnCount,
+ Span span = new Span(columnCount,
body.getColumnGap(), ipd);
transferForeignObjects(attributes, span);
setAreaAttributes(attributes, span);
@@ -557,20 +557,20 @@
fn.setTop(getAttributeAsInteger(attributes, "top-offset", 0));
areaStack.push(fn);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), Footnote.class);
- }
+ }
}
private class BeforeFloatMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
- BeforeFloat bf = getCurrentBodyRegion().getBeforeFloat();
+ BeforeFloat bf = getCurrentBodyRegion().getBeforeFloat();
transferForeignObjects(attributes, bf);
areaStack.push(bf);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), BeforeFloat.class);
}
@@ -622,7 +622,7 @@
parent.addChildArea(block);
areaStack.push(block);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), Block.class);
}
@@ -702,7 +702,7 @@
parent.addChildArea(ibp);
areaStack.push(ibp);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), InlineBlockParent.class);
}
@@ -724,13 +724,13 @@
text.setOffset(getAttributeAsInteger(attributes, "offset", 0));
text.setTextLetterSpaceAdjust(getAttributeAsInteger(attributes,
"tlsadjust", 0));
- text.setTextWordSpaceAdjust(getAttributeAsInteger(attributes,
+ text.setTextWordSpaceAdjust(getAttributeAsInteger(attributes,
"twsadjust", 0));
Area parent = (Area)areaStack.peek();
parent.addChildArea(text);
areaStack.push(text);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), TextArea.class);
}
@@ -740,7 +740,7 @@
public void endElement() {
int offset = getAttributeAsInteger(lastAttributes, "offset", 0);
- int[] letterAdjust
+ int[] letterAdjust
= ConversionUtils.toIntArray(
lastAttributes.getValue("letter-adjust"), "\\s");
content.flip();
@@ -749,14 +749,14 @@
word.setParentArea(text);
text.addChildArea(word);
}
-
+
public boolean ignoreCharacters() {
return false;
}
}
private class SpaceMaker extends AbstractMaker {
-
+
public void endElement() {
int offset = getAttributeAsInteger(lastAttributes, "offset", 0);
//TODO the isAdjustable parameter is currently not used/implemented
@@ -778,7 +778,7 @@
parent.addChildArea(space);
}
}
-
+
public boolean ignoreCharacters() {
return false;
}
@@ -822,12 +822,12 @@
parent.addChildArea(viewport);
areaStack.push(viewport);
}
-
+
public void endElement() {
assertObjectOfClass(areaStack.pop(), Viewport.class);
}
}
-
+
private class ImageMaker extends AbstractMaker {
public void startElement(Attributes attributes) {
@@ -839,12 +839,12 @@
getCurrentViewport().setContent(image);
}
}
-
+
private class ForeignObjectMaker extends AbstractMaker {
public void startElement(Attributes attributes) throws SAXException {
String ns = attributes.getValue("ns");
- domImplementation
+ domImplementation
= elementMappingRegistry.getDOMImplementationForNamespace(ns);
if (domImplementation == null) {
throw new SAXException("No DOMImplementation could be"
@@ -941,11 +941,11 @@
private void assertObjectOfClass(Object obj, Class clazz) {
if (!clazz.isInstance(obj)) {
- throw new IllegalStateException("Object is not an instance of "
+ throw new IllegalStateException("Object is not an instance of "
+ clazz.getName() + " but of " + obj.getClass().getName());
}
}
-
+
/**
* Handles objects created by "sub-parsers" that implement the ObjectSource interface.
* An example of object handled here are ExtensionAttachments.
@@ -969,7 +969,7 @@
area.setIPD(Integer.parseInt(attributes.getValue("ipd")));
area.setBPD(Integer.parseInt(attributes.getValue("bpd")));
}
-
+
private static final Object[] SUBSET_COMMON = new Object[] {
Trait.PROD_ID};
private static final Object[] SUBSET_LINK = new Object[] {
@@ -1078,7 +1078,7 @@
}
}
- private static int getAttributeAsInteger(Attributes attributes, String name,
+ private static int getAttributeAsInteger(Attributes attributes, String name,
int defaultValue) {
String s = attributes.getValue(name);
if (s == null) {
@@ -1123,7 +1123,7 @@
}
}
}
-
+
/** {@inheritDoc} */
public void characters(char[] ch, int start, int length) throws SAXException {
if (delegate != null) {
@@ -1132,7 +1132,7 @@
int maxLength = this.content.capacity() - this.content.position();
if (maxLength < length) {
// allocate a larger buffer and transfer content
- CharBuffer newContent
+ CharBuffer newContent
= CharBuffer.allocate(this.content.position() + length);
this.content.flip();
newContent.put(this.content);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BeforeFloat.java Thu Jul 24 02:35:34 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;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Block.java Thu Jul 24 02:35:34 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;
@@ -59,7 +59,7 @@
private int positioning = STACK;
protected transient boolean allowBPDUpdate = true;
-
+
// a block with may contain the dominant styling info in
// terms of most lines or blocks with info
@@ -120,7 +120,7 @@
public boolean isStacked() {
return (getPositioning() == Block.STACK || getPositioning() == Block.RELATIVE);
}
-
+
/**
* @return the start-indent trait
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockParent.java Thu Jul 24 02:35:34 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;
import java.util.ArrayList;
@@ -60,7 +60,7 @@
}
children.add(childArea);
}
-
+
/**
* Add the block area to this block parent.
*
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BlockViewport.java Thu Jul 24 02:35:34 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;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java Thu Jul 24 02:35:34 2008
@@ -55,7 +55,7 @@
* @param columnCount the number of columns
* @param columnGap the gap between columns
*/
- public BodyRegion(int regionClass, String regionName, RegionViewport parent,
+ public BodyRegion(int regionClass, String regionName, RegionViewport parent,
int columnCount, int columnGap) {
super(regionClass, regionName, parent);
this.columnCount = columnCount;
@@ -76,7 +76,7 @@
public int getColumnGap() {
return this.columnGap;
}
-
+
/**
* Get the main reference area.
*
@@ -135,14 +135,14 @@
}
return getBPD() - usedBPD;
}
-
+
/**
* Clone this object.
*
* @return a shallow copy of this object
*/
public Object clone() {
- BodyRegion br = new BodyRegion(getRegionClass(), getRegionName(), regionViewport,
+ BodyRegion br = new BodyRegion(getRegionClass(), getRegionName(), regionViewport,
getColumnCount(), getColumnGap());
br.setCTM(getCTM());
br.setIPD(getIPD());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BookmarkData.java Thu Jul 24 02:35:34 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;
import java.util.Collection;
@@ -33,7 +33,7 @@
* child bookmark-items under it.
*/
public class BookmarkData extends AbstractOffDocumentItem implements Resolvable {
-
+
private List subData = new java.util.ArrayList();
// bookmark-title for this fo:bookmark
@@ -92,7 +92,7 @@
}
refs.add(bd);
}
-
+
/**
* Create a new bookmark data root object.
* This constructor is called by the AreaTreeParser when the
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org