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 [5/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/src/java/org/apache/fop/datatypes/LengthBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/LengthBase.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.
@@ -76,7 +76,7 @@
/** For percentages based on other length properties */
private Length baseLength;
-
+
/**
* Constructor
* @param plist property list for this
@@ -133,11 +133,11 @@
/** {@inheritDoc} */
public String toString() {
return super.toString()
- + "[fo=" + fobj + ","
+ + "[fo=" + fobj + ","
+ "baseType=" + baseType + ","
+ "baseLength=" + baseLength + "]";
}
-
+
/**@return the base length as a {@link Length} */
public Length getBaseLength() {
return baseLength;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/Numeric.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,7 +30,7 @@
* must be resolved against base value before the value can be used.
* <p>
* To support relative numerics internally in the expresion parser and
- * during evaulation one additional methods exists: isAbsolute() which
+ * during evaulation one additional methods exists: isAbsolute() which
* return true for absolute numerics and false for relative numerics.
*/
public interface Numeric {
@@ -40,7 +40,7 @@
* @throws PropertyException
*/
double getNumericValue() throws PropertyException;
-
+
/**
* Return the value of this Numeric
* @param context The context for the length calculation (for percentage based lengths)
@@ -78,10 +78,10 @@
public int getValue(PercentBaseContext context);
/**
- * Return the resolved value. This method will becalled during evaluation
- * of the expression tree and relative numerics can then return a
+ * Return the resolved value. This method will becalled during evaluation
+ * of the expression tree and relative numerics can then return a
* resolved absolute Numeric. Absolute numerics can just return themself.
- *
+ *
* @return A resolved value.
* @throws PropertyException
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBase.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBase.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.
@@ -26,28 +26,28 @@
* computations
*/
public interface PercentBase {
-
+
/**
* Determines whether a numeric property is created or one with a percentage
* base.
* @return 0 for length, 1 for percentage
*/
int getDimension();
-
+
/**
- * @return the base value (this will be used as the base to which a percentage will be
+ * @return the base value (this will be used as the base to which a percentage will be
* applied to compute the length of the referencing item)
*/
double getBaseValue();
/**
* @param context The context for percentage evaluation
- * @return the integer size in millipoints of the object (this will be used
- * as the base to which a percentage will be applied to compute the length
+ * @return the integer size in millipoints of the object (this will be used
+ * as the base to which a percentage will be applied to compute the length
* of the referencing item)
* @throws PropertyException if a problem occurs during evaluation of this
* value.
*/
int getBaseLength(PercentBaseContext context) throws PropertyException;
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBaseContext.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBaseContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/PercentBaseContext.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.datatypes;
import org.apache.fop.fo.FObj;
@@ -37,5 +37,5 @@
* @return The base length value of the given kind
*/
public int getBaseLength(int lengthBase, FObj fobj);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.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.
@@ -25,14 +25,14 @@
* Class to implement a simple lookup context for a single percent base value.
*/
public class SimplePercentBaseContext implements PercentBaseContext {
-
+
private PercentBaseContext parentContext;
private int lengthBase;
private int lengthBaseValue;
/**
* @param parentContext the context to be used for all percentages other than lengthBase
- * @param lengthBase the particular percentage length base for which this context provides
+ * @param lengthBase the particular percentage length base for which this context provides
* a value
* @param lengthBaseValue the value to be returned for requests to the given lengthBase
*/
@@ -46,7 +46,7 @@
/**
* Returns the value for the given lengthBase.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
// if its for us return our value otherwise delegate to parent context
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/URISpecification.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/URISpecification.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/URISpecification.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/URISpecification.java Thu Jul 24 02:35:34 2008
@@ -57,19 +57,19 @@
private static final String PUNCT = ",;:$&+=";
private static final String RESERVED = PUNCT + "?/[]@";
-
+
private static boolean isValidURIChar(char ch) {
return true;
}
-
+
private static boolean isDigit(char ch) {
return (ch >= '0' && ch <= '9');
}
-
+
private static boolean isAlpha(char ch) {
return (ch >= 'A' && ch <= 'Z') || (ch >= 'A' && ch <= 'z');
}
-
+
private static boolean isHexDigit(char ch) {
return (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F') || (ch >= 'a' && ch <= 'f');
}
@@ -83,7 +83,7 @@
}
return false;
}
-
+
private static boolean isUnreserved(char ch) {
if (isDigit(ch) || isAlpha(ch)) {
return true;
@@ -93,7 +93,7 @@
}
return false;
}
-
+
private final static char[] HEX_DIGITS = {
'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -137,5 +137,5 @@
}
return sb.toString();
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.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.
@@ -26,11 +26,11 @@
* but should still already be checked. The actual value returned is not so important in this
* case. But it's important that zero and non-zero values can be distinguished.
* <p>
- * Example: A table with collapsing border model has no padding. The Table FO should be able
+ * Example: A table with collapsing border model has no padding. The Table FO should be able
* to check if non-zero values (even percentages) have been specified.
*/
public final class ValidationPercentBaseContext implements PercentBaseContext {
-
+
/**
* Main constructor.
*/
@@ -39,7 +39,7 @@
/**
* Returns the value for the given lengthBase.
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
//Simply return a dummy value which produces a non-zero value when a non-zero percentage
@@ -48,7 +48,7 @@
}
private static PercentBaseContext pseudoContextForValidation = null;
-
+
/** @return a base context for validation purposes. See class description. */
public static PercentBaseContext getPseudoContext() {
if (pseudoContextForValidation == null) {
@@ -56,5 +56,5 @@
}
return pseudoContextForValidation;
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/CompositeEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/CompositeEventListener.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/CompositeEventListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/CompositeEventListener.java Thu Jul 24 02:35:34 2008
@@ -27,7 +27,7 @@
public class CompositeEventListener implements EventListener {
private List listeners = new java.util.ArrayList();
-
+
/**
* Adds an event listener to the broadcaster. It is appended to the list of previously
* registered listeners (the order of registration defines the calling order).
@@ -49,7 +49,7 @@
private synchronized int getListenerCount() {
return this.listeners.size();
}
-
+
/**
* Indicates whether any listeners have been registered with the broadcaster.
* @return true if listeners are present, false otherwise
@@ -57,7 +57,7 @@
public boolean hasEventListeners() {
return (getListenerCount() > 0);
}
-
+
/** {@inheritDoc} */
public synchronized void processEvent(Event event) {
for (int i = 0, c = getListenerCount(); i < c; i++) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/DefaultEventBroadcaster.java Thu Jul 24 02:35:34 2008
@@ -42,7 +42,7 @@
/** Holds all registered event listeners */
protected CompositeEventListener listeners = new CompositeEventListener();
-
+
/** {@inheritDoc} */
public void addEventListener(EventListener listener) {
this.listeners.addEventListener(listener);
@@ -57,7 +57,7 @@
public boolean hasEventListeners() {
return this.listeners.hasEventListeners();
}
-
+
/** {@inheritDoc} */
public void broadcastEvent(Event event) {
this.listeners.processEvent(event);
@@ -65,7 +65,7 @@
private static List/*<EventModel>*/ eventModels = new java.util.ArrayList();
private Map proxies = new java.util.HashMap();
-
+
static {
Iterator iter = Service.providers(EventModelFactory.class, true);
while (iter.hasNext()) {
@@ -81,7 +81,7 @@
public static void addEventModel(EventModel eventModel) {
eventModels.add(eventModel);
}
-
+
/** {@inheritDoc} */
public EventProducer getEventProducerFor(Class clazz) {
if (!EventProducer.class.isAssignableFrom(clazz)) {
@@ -97,7 +97,7 @@
}
return producer;
}
-
+
private EventProducerModel getEventProducerModel(Class clazz) {
for (int i = 0, c = eventModels.size(); i < c; i++) {
EventModel eventModel = (EventModel)eventModels.get(i);
@@ -108,7 +108,7 @@
}
return null;
}
-
+
/**
* Creates a dynamic proxy for the given EventProducer interface that will handle the
* conversion of the method call into the broadcasting of an event instance.
@@ -147,7 +147,7 @@
}
Event ev = new Event(args[0], eventID, methodModel.getSeverity(), params);
broadcastEvent(ev);
-
+
if (ev.getSeverity() == EventSeverity.FATAL) {
EventExceptionManager.throwException(ev,
methodModel.getExceptionClass());
@@ -156,5 +156,5 @@
}
});
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java Thu Jul 24 02:35:34 2008
@@ -32,11 +32,11 @@
public class Event extends EventObject {
private static final long serialVersionUID = -1310594422868258083L;
-
+
private String eventID;
private EventSeverity severity;
private Map params;
-
+
/**
* Creates a new Event.
* @param source the object that creates the event
@@ -50,7 +50,7 @@
setSeverity(severity);
this.params = params;
}
-
+
/**
* Returns the event identifier.
* @return the event identifier
@@ -58,7 +58,7 @@
public String getEventID() {
return this.eventID;
}
-
+
/**
* Returns the event group identifier.
* @return the event group identifier (or null if there is no group identifier)
@@ -71,7 +71,7 @@
return null;
}
}
-
+
/**
* Returns the severity level.
* @return the severity level
@@ -79,7 +79,7 @@
public EventSeverity getSeverity() {
return this.severity;
}
-
+
/**
* Sets the event's severity level. This method can be used to increase or decrease the
* severity level in a listener.
@@ -101,7 +101,7 @@
return null;
}
}
-
+
/**
* Returns an unmodifiable {@link java.util.Map} with all event parameters.
* @return the parameter map
@@ -109,7 +109,7 @@
public Map getParams() {
return Collections.unmodifiableMap(this.params);
}
-
+
/**
* Creates and returns a fluent builder object for building up the parameter map.
* @return the parameter builder
@@ -117,13 +117,13 @@
public static ParamsBuilder paramsBuilder() {
return new ParamsBuilder();
}
-
+
/**
* This class is a fluent builder class for building up the parameter map.
*/
public static class ParamsBuilder {
private Map params;
-
+
/**
* Adds a new parameter (a name/value pair).
* @param name the name of the parameter
@@ -137,7 +137,7 @@
this.params.put(name, value);
return this;
}
-
+
/**
* Returns the accumulated parameter map.
* @return the accumulated parameter map
@@ -146,5 +146,5 @@
return this.params;
}
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventBroadcaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventBroadcaster.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventBroadcaster.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventBroadcaster.java Thu Jul 24 02:35:34 2008
@@ -31,31 +31,31 @@
* @param listener the listener to be added
*/
void addEventListener(EventListener listener);
-
+
/**
* Removes an event listener from the broadcaster. If the event listener is not registered,
* nothing happens.
* @param listener the listener to be removed
*/
void removeEventListener(EventListener listener);
-
+
/**
* Indicates whether any listeners have been registered with the broadcaster.
* @return true if listeners are present, false otherwise
*/
boolean hasEventListeners();
-
+
/**
* Broadcasts an event. This method is usually called from within the observed component.
* @param event the event to be broadcast
*/
void broadcastEvent(Event event);
-
+
/**
* Returns an event producer instance for the given interface class.
* @param clazz the Class object identifying an {@link EventProducer} interface
* @return the event producer instance
*/
EventProducer getEventProducerFor(Class clazz);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventExceptionManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventExceptionManager.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventExceptionManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventExceptionManager.java Thu Jul 24 02:35:34 2008
@@ -30,7 +30,7 @@
public class EventExceptionManager {
private static final Map EXCEPTION_FACTORIES = new java.util.HashMap();
-
+
static {
Iterator iter;
iter = Service.providers(ExceptionFactory.class, true);
@@ -39,7 +39,7 @@
EXCEPTION_FACTORIES.put(factory.getExceptionClass().getName(), factory);
}
}
-
+
/**
* Converts an event into an exception and throws that. If the exception class is null,
* a {@link RuntimeException} will be thrown.
@@ -61,20 +61,20 @@
throw new RuntimeException(msg);
}
}
-
+
/**
* This interface is implementation by exception factories that can create exceptions from
* events.
*/
public interface ExceptionFactory {
-
+
/**
* Creates an exception from an event.
* @param event the event
* @return the newly created exception
*/
Throwable createException(Event event);
-
+
/**
* Returns the {@link Exception} class created by this factory.
* @return the exception class
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java Thu Jul 24 02:35:34 2008
@@ -40,16 +40,16 @@
public final class EventFormatter {
private static final Pattern INCLUDES_PATTERN = Pattern.compile("\\{\\{.+\\}\\}");
-
+
private static ResourceBundle defaultBundle = XMLResourceBundle.getXMLBundle(
EventFormatter.class.getName(), EventFormatter.class.getClassLoader());
-
+
private static Log log = LogFactory.getLog(EventFormatter.class);
-
+
private EventFormatter() {
//utility class
}
-
+
/**
* Formats an event using the default locale.
* @param event the event
@@ -74,7 +74,7 @@
}
return format(event, bundle);
}
-
+
/**
* Formats an event using a given locale.
* @param event the event
@@ -150,11 +150,11 @@
params.put("severity", event.getSeverity());
return format.format(params);
}
-
+
private static class LookupFieldPart implements Part {
-
+
private String fieldName;
-
+
public LookupFieldPart(String fieldName) {
this.fieldName = fieldName;
}
@@ -170,14 +170,14 @@
private String getKey(Map params) {
return (String)params.get(fieldName);
}
-
+
/** {@inheritDoc} */
public String toString() {
return "{" + this.fieldName + ", lookup}";
}
-
+
}
-
+
/** PartFactory for lookups. */
public static class LookupFieldPartFactory implements PartFactory {
@@ -190,7 +190,7 @@
public String getFormat() {
return "lookup";
}
-
+
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventListener.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventListener.java Thu Jul 24 02:35:34 2008
@@ -33,5 +33,5 @@
* @param event the event
*/
void processEvent(Event event);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/FOPEventListenerProxy.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/FOPEventListenerProxy.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/FOPEventListenerProxy.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/FOPEventListenerProxy.java Thu Jul 24 02:35:34 2008
@@ -29,29 +29,29 @@
* For validation events, it reacts on each event based on the strict validation setting in
* the user agent.
* For layout events, it reduces the default severity level if FOP signals that it can recover
- * from the event.
+ * from the event.
*/
public class FOPEventListenerProxy implements EventListener {
private static final String FOVALIDATION_EVENT_ID_PREFIX
= FOValidationEventProducer.class.getName();
-
+
private static final String BLOCK_LEVEL_EVENT_ID_PREFIX
= BlockLevelEventProducer.class.getName();
private EventListener delegate;
private FOUserAgent userAgent;
-
+
/**
* Main constructor.
- * @param delegate the event listener to delegate events to
+ * @param delegate the event listener to delegate events to
* @param userAgent the FO user agent
*/
public FOPEventListenerProxy(EventListener delegate, FOUserAgent userAgent) {
this.delegate = delegate;
this.userAgent = userAgent;
}
-
+
/** {@inheritDoc} */
public synchronized void processEvent(Event event) {
if (event.getEventID().startsWith(FOVALIDATION_EVENT_ID_PREFIX)) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/LoggingEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/LoggingEventListener.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/LoggingEventListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/LoggingEventListener.java Thu Jul 24 02:35:34 2008
@@ -32,17 +32,17 @@
/** Default logger instance */
private static Log defaultLog = LogFactory.getLog(LoggingEventListener.class);
-
+
private Log log;
private boolean skipFatal;
-
+
/**
* Creates an instance logging to the default log category of this class.
*/
public LoggingEventListener() {
this(defaultLog);
}
-
+
/**
* Creates an instance logging to a given logger. Events with fatal severity level will be
* skipped.
@@ -51,7 +51,7 @@
public LoggingEventListener(Log log) {
this(log, true);
}
-
+
/**
* Creates an instance logging to a given logger.
* @param log the target logger
@@ -61,7 +61,7 @@
this.log = log;
this.skipFatal = skipFatal;
}
-
+
/**
* Returns the target logger for this instance.
* @return the target logger
@@ -69,7 +69,7 @@
public Log getLog() {
return this.log;
}
-
+
/** {@inheritDoc} */
public void processEvent(Event event) {
String msg = EventFormatter.format(event);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/PropertyExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/PropertyExceptionFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/PropertyExceptionFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/PropertyExceptionFactory.java Thu Jul 24 02:35:34 2008
@@ -38,10 +38,10 @@
}
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return PropertyException.class;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ResourceEventProducer.java Thu Jul 24 02:35:34 2008
@@ -38,7 +38,7 @@
* Provider class for the event producer.
*/
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -59,7 +59,7 @@
* @event.severity ERROR
*/
void imageNotFound(Object source, String uri, FileNotFoundException fnfe, Locator loc);
-
+
/**
* Error while processing image.
* @param source the event source
@@ -69,7 +69,7 @@
* @event.severity ERROR
*/
void imageError(Object source, String uri, ImageException e, Locator loc);
-
+
/**
* I/O error while loading an image.
* @param source the event source
@@ -105,7 +105,7 @@
* @event.severity ERROR
*/
void ifoNoIntrinsicSize(Object source, Locator loc);
-
+
/**
* Error processing foreign XML content.
* @param source the event source
@@ -124,7 +124,7 @@
* @event.severity ERROR
*/
void foreignXMLNoHandler(Object source, Document doc, String namespaceURI);
-
+
/**
* Cannot delete a temporary file.
* @param source the event source
@@ -132,5 +132,5 @@
* @event.severity ERROR
*/
void cannotDeleteTempFile(Object source, File tempFile);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/UnsupportedOperationExceptionFactory.java Thu Jul 24 02:35:34 2008
@@ -34,10 +34,10 @@
UnsupportedOperationException ex = new UnsupportedOperationException(msg);
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return UnsupportedOperationException.class;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ValidationExceptionFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ValidationExceptionFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ValidationExceptionFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/ValidationExceptionFactory.java Thu Jul 24 02:35:34 2008
@@ -41,11 +41,11 @@
}
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return ValidationException.class;
}
-
-
+
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/AbstractEventModelFactory.java Thu Jul 24 02:35:34 2008
@@ -45,17 +45,17 @@
if (in == null) {
throw new MissingResourceException(
"File " + resourceName + " not found",
- DefaultEventBroadcaster.class.getName(), "");
+ DefaultEventBroadcaster.class.getName(), "");
}
try {
return EventModelParser.parse(new StreamSource(in));
} catch (TransformerException e) {
throw new MissingResourceException(
"Error reading " + resourceName + ": " + e.getMessage(),
- DefaultEventBroadcaster.class.getName(), "");
+ DefaultEventBroadcaster.class.getName(), "");
} finally {
IOUtils.closeQuietly(in);
}
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelFactory.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelFactory.java Thu Jul 24 02:35:34 2008
@@ -29,5 +29,5 @@
* @return the new EventModel instance
*/
EventModel createEventModel();
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelParser.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventModelParser.java Thu Jul 24 02:35:34 2008
@@ -45,7 +45,7 @@
/** Logger instance */
protected static Log log = LogFactory.getLog(EventModelParser.class);
- private static SAXTransformerFactory tFactory
+ private static SAXTransformerFactory tFactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
/**
@@ -54,11 +54,11 @@
* @return the created event model structure
* @throws TransformerException if an error occurs while parsing the XML file
*/
- public static EventModel parse(Source src)
+ public static EventModel parse(Source src)
throws TransformerException {
Transformer transformer = tFactory.newTransformer();
transformer.setErrorListener(new DefaultErrorListener(log));
-
+
EventModel model = new EventModel();
SAXResult res = new SAXResult(getContentHandler(model));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventSeverity.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventSeverity.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventSeverity.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/events/model/EventSeverity.java Thu Jul 24 02:35:34 2008
@@ -26,7 +26,7 @@
public final class EventSeverity implements Serializable {
private static final long serialVersionUID = 4108175215810759243L;
-
+
/** info level */
public static final EventSeverity INFO = new EventSeverity("INFO");
/** warning level */
@@ -35,7 +35,7 @@
public static final EventSeverity ERROR = new EventSeverity("ERROR");
/** fatal error */
public static final EventSeverity FATAL = new EventSeverity("FATAL");
-
+
private String name;
/**
@@ -50,7 +50,7 @@
public String getName() {
return this.name;
}
-
+
/**
* Returns the enumeration/singleton object based on its name.
* @param name the name of the enumeration value
@@ -69,14 +69,14 @@
throw new IllegalArgumentException("Illegal value for enumeration: " + name);
}
}
-
+
private Object readResolve() throws ObjectStreamException {
return valueOf(getName());
}
-
+
/** {@inheritDoc} */
public String toString() {
return "EventSeverity:" + name;
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/CharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/CharIterator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/CharIterator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/CharIterator.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.fo;
import java.util.Iterator;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java Thu Jul 24 02:35:34 2008
@@ -170,7 +170,7 @@
/** FO element constant */
int FO_ROOT = 66;
/** FO element constant - XSL 1.1 */
- int FO_SCALING_VALUE_CITATION = 67;
+ int FO_SCALING_VALUE_CITATION = 67;
/** FO element constant */
int FO_SIMPLE_PAGE_MASTER = 68;
/** FO element constant */
@@ -1166,9 +1166,9 @@
/** Enumeration constant -- font shorthand */
int EN_STATUS_BAR = 185;
/** Enumeration constant -- for page-position, XSL 1.1 */
- int EN_ONLY = 186;
+ int EN_ONLY = 186;
/** Enumeration constant -- for instream-foreign-object and external-graphic, XSL 1.1 */
- int EN_SCALE_DOWN_TO_FIT = 187;
+ int EN_SCALE_DOWN_TO_FIT = 187;
/** Enumeration constant -- for instream-foreign-object and external-graphic, XSL 1.1 */
int EN_SCALE_UP_TO_FIT = 188;
/** Enumeration constant -- for fo:basic-link show-destination */
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMapping.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.
@@ -63,7 +63,7 @@
public String getNamespaceURI() {
return namespaceURI;
}
-
+
/**
* Returns the DOMImplementation used by this ElementMapping. The value returned may be null
* for cases where no DOM is used to represent the element tree (XSL-FO, for example). This
@@ -95,7 +95,7 @@
public String getStandardPrefix() {
return null;
}
-
+
/**
* Indicates whether a particular attribute of the namespace is a property, i.e. the attribute
* value should be converted to a property value.
@@ -105,7 +105,7 @@
public boolean isAttributeProperty(QName attributeName) {
return false;
}
-
+
/**
* Initializes the set of maker objects associated with this ElementMapping
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/ElementMappingRegistry.java Thu Jul 24 02:35:34 2008
@@ -43,7 +43,7 @@
/** logging instance */
protected Log log = LogFactory.getLog(ElementMappingRegistry.class);
-
+
/**
* Table mapping element names to the makers of objects
* representing formatting objects.
@@ -64,7 +64,7 @@
// Add standard element mappings
setupDefaultMappings();
}
-
+
/**
* Sets all the element and property list mappings to their default values.
*/
@@ -127,7 +127,7 @@
* @return the ElementMapping.Maker that can create an FO object for this element
* @throws FOPException if a Maker could not be found for a bound namespace.
*/
- public Maker findFOMaker(String namespaceURI, String localName, Locator locator)
+ public Maker findFOMaker(String namespaceURI, String localName, Locator locator)
throws FOPException {
Map table = (Map)fobjTable.get(namespaceURI);
Maker fobjMaker = null;
@@ -141,7 +141,7 @@
if (fobjMaker == null) {
if (namespaces.containsKey(namespaceURI.intern())) {
- throw new FOPException(FONode.errorText(locator)
+ throw new FOPException(FONode.errorText(locator)
+ "No element mapping definition found for "
+ FONode.getNodeString(namespaceURI, localName), locator);
} else {
@@ -154,7 +154,7 @@
/**
* Tries to determine the DOMImplementation that is used to handled a particular namespace.
* The method may return null for namespaces that don't result in a DOM. It is mostly used
- * in namespaces occurring in foreign objects.
+ * in namespaces occurring in foreign objects.
* @param namespaceURI the namespace URI
* @return the handling DOMImplementation, or null if not applicable
*/
@@ -166,7 +166,7 @@
return mapping.getDOMImplementation();
}
}
-
+
/**
* Returns an ElementMapping class for a namespace URI if there is one.
* @param namespaceURI the namespace URI
@@ -176,7 +176,7 @@
public ElementMapping getElementMapping(String namespaceURI) {
return (ElementMapping)this.namespaces.get(namespaceURI);
}
-
+
/**
* Indicates whether a namespace is known to FOP.
* @param namespaceURI the namespace URI
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOElementMapping.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.
@@ -28,7 +28,7 @@
* Element mapping class for all XSL-FO elements.
*/
public class FOElementMapping extends ElementMapping {
-
+
/** The XSL-FO namespace URI */
public static final String URI = "http://www.w3.org/1999/XSL/Format";
@@ -143,12 +143,12 @@
public String getStandardPrefix() {
return "fo";
}
-
+
/** {@inheritDoc} */
public boolean isAttributeProperty(QName attributeName) {
return true; //All XSL-FO attributes are to be converted to properties.
}
-
+
static class RootMaker extends ElementMapping.Maker {
public FONode make(FONode parent) {
return new org.apache.fop.fo.pagination.Root(parent);
@@ -364,7 +364,7 @@
return new org.apache.fop.fo.flow.PageNumberCitationLast(parent);
}
}
-
+
static class TableAndCaptionMaker extends ElementMapping.Maker {
public FONode make(FONode parent) {
return new org.apache.fop.fo.flow.table.TableAndCaption(parent);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOEventHandler.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.
@@ -63,13 +63,13 @@
* as our MIF and RTF output targets.
*/
public abstract class FOEventHandler {
-
- /**
+
+ /**
* The FOUserAgent for this process
*/
protected FOUserAgent foUserAgent;
- /**
+ /**
* The Font information relevant for this document
*/
protected FontInfo fontInfo;
@@ -142,37 +142,37 @@
}
/**
- *
+ *
* @param pageCite PageNumberCitation that is starting.
*/
public void startPageNumberCitation(PageNumberCitation pageCite) {
}
/**
- *
+ *
* @param pageCite PageNumberCitation that is ending.
*/
public void endPageNumberCitation(PageNumberCitation pageCite) {
}
/**
- *
+ *
* @param pageLast PageNumberCitationLast that is starting.
*/
public void startPageNumberCitationLast(PageNumberCitationLast pageLast) {
}
/**
- *
+ *
* @param pageLast PageNumberCitationLast that is ending.
*/
public void endPageNumberCitationLast(PageNumberCitationLast pageLast) {
}
/**
- * This method is called to indicate the start of a new fo:flow
+ * This method is called to indicate the start of a new fo:flow
* or fo:static-content.
- * This method also handles fo:static-content tags, because the
+ * This method also handles fo:static-content tags, because the
* StaticContent class is derived from the Flow class.
*
* @param fl Flow that is starting.
@@ -447,7 +447,7 @@
*/
public void startFootnote(Footnote footnote) {
}
-
+
/**
* Process the ending of a footnote.
* @param footnote Footnote that is ending
@@ -461,7 +461,7 @@
*/
public void startFootnoteBody(FootnoteBody body) {
}
-
+
/**
* Process the ending of a footnote body.
* @param body FootnoteBody that is ending
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.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.
@@ -163,7 +163,7 @@
public FOTreeBuilderContext getBuilderContext() {
return parent.getBuilderContext();
}
-
+
/**
* Indicates whether this node is a child of an fo:marker.
* @return true if this node is a child of an fo:marker
@@ -338,7 +338,7 @@
* endXXX() events in the {@link FOEventHandler}.
* The method is called by the default {@link #endOfNode()}
* implementation.
- *
+ *
* @throws FOPException in case there was an error
*/
public void finalizeNode() throws FOPException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Thu Jul 24 02:35:34 2008
@@ -101,7 +101,7 @@
* are used be the actual makers as a parameter to .useGeneric(...).
*/
private void createGenerics() {
-
+
PropertyMaker sub;
genericColor = new ColorProperty.Maker(0);
@@ -277,13 +277,13 @@
* @return the maker array.
*/
public static PropertyMaker[] getGenericMappings() {
-
+
if (s_generics == null) {
/* this method was never called before */
s_generics = new PropertyMaker[PROPERTY_COUNT + 1];
FOPropertyMapping gp = new FOPropertyMapping();
-
- /* Create the shorthand first. They are
+
+ /* Create the shorthand first. They are
* referenced by the real properties.
*/
gp.createShorthandProperties();
@@ -313,7 +313,7 @@
gp.createTableProperties();
gp.createWritingModeProperties();
gp.createMiscProperties();
-
+
// Hardcode the subproperties.
addSubpropMakerName("length", CP_LENGTH);
addSubpropMakerName("conditionality", CP_CONDITIONALITY);
@@ -1848,7 +1848,7 @@
m.setInherited(true);
m.setDefault("2");
addPropertyMaker("widows", m);
-
+
// fox:widow-content-limit
m = new LengthProperty.Maker(PR_X_WIDOW_CONTENT_LIMIT);
m.setInherited(true);
@@ -2773,7 +2773,7 @@
m.setDefault("normal");
m.setDatatypeParser(new WhiteSpaceShorthandParser());
addPropertyMaker("white-space", m);
-
+
// xml:lang
m = new StringProperty.Maker(PR_XML_LANG);
m.setInherited(true);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.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/fo/FOTreeBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilder.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.
@@ -63,43 +63,43 @@
/** Main DefaultHandler that handles the FO namespace. */
protected MainFOHandler mainFOHandler;
-
+
/** Current delegate ContentHandler to receive the SAX events */
protected ContentHandler delegate;
/** Provides information used during tree building stage. */
private FOTreeBuilderContext builderContext;
-
+
/** The object that handles formatting and rendering to a stream */
private FOEventHandler foEventHandler;
/** The SAX locator object managing the line and column counters */
- private Locator locator;
-
+ private Locator locator;
+
/** The user agent for this processing run. */
private FOUserAgent userAgent;
-
+
private boolean used = false;
private boolean empty = true;
-
+
private int depth;
-
+
/**
* <code>FOTreeBuilder</code> constructor
- *
+ *
* @param outputFormat the MIME type of the output format to use (ex. "application/pdf").
* @param foUserAgent the {@link FOUserAgent} in effect for this process
* @param stream the <code>OutputStream</code> to direct the results to
* @throws FOPException if the <code>FOTreeBuilder</code> cannot be properly created
*/
public FOTreeBuilder(
- String outputFormat,
+ String outputFormat,
FOUserAgent foUserAgent,
- OutputStream stream)
+ OutputStream stream)
throws FOPException {
this.userAgent = foUserAgent;
- this.elementMappingRegistry = userAgent.getFactory().getElementMappingRegistry();
+ this.elementMappingRegistry = userAgent.getFactory().getElementMappingRegistry();
//This creates either an AreaTreeHandler and ultimately a Renderer, or
//one of the RTF-, MIF- etc. Handlers.
foEventHandler = foUserAgent.getRendererFactory().createFOEventHandler(
@@ -116,16 +116,16 @@
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
-
- /**
+
+ /**
* @return a {@link Locator} instance if it is available and not disabled
*/
protected Locator getEffectiveLocator() {
return (userAgent.isLocatorEnabled() ? this.locator : null);
}
-
+
/** {@inheritDoc} */
- public void characters(char[] data, int start, int length)
+ public void characters(char[] data, int start, int length)
throws SAXException {
delegate.characters(data, start, length);
}
@@ -136,7 +136,7 @@
throw new IllegalStateException("FOTreeBuilder (and the Fop class) cannot be reused."
+ " Please instantiate a new instance.");
}
-
+
used = true;
empty = true;
rootFObj = null; // allows FOTreeBuilder to be reused
@@ -204,7 +204,7 @@
/**
* Provides access to the underlying {@link FOEventHandler} object.
- *
+ *
* @return the FOEventHandler object
*/
public FOEventHandler getEventHandler() {
@@ -215,30 +215,30 @@
* Returns the results of the rendering process. Information includes
* the total number of pages generated and the number of pages per
* page-sequence.
- *
+ *
* @return the results of the rendering process.
*/
public FormattingResults getResults() {
if (getEventHandler() instanceof AreaTreeHandler) {
return ((AreaTreeHandler) getEventHandler()).getResults();
} else {
- //No formatting results available for output formats no
+ //No formatting results available for output formats no
//involving the layout engine.
return null;
}
}
-
+
/**
* Main <code>DefaultHandler</code> implementation which builds the FO tree.
*/
private class MainFOHandler extends DefaultHandler {
-
+
/** Current formatting object being handled */
protected FONode currentFObj = null;
/** Current propertyList for the node being handled */
protected PropertyList currentPropertyList;
-
+
/** Current marker nesting-depth */
private int nestedMarkerDepth = 0;
@@ -253,7 +253,7 @@
// Check to ensure first node encountered is an fo:root
if (rootFObj == null) {
empty = false;
- if (!namespaceURI.equals(FOElementMapping.URI)
+ if (!namespaceURI.equals(FOElementMapping.URI)
|| !localName.equals("root")) {
FOValidationEventProducer eventProducer
= FOValidationEventProducer.Provider.get(
@@ -267,7 +267,7 @@
currentFObj.validateChildNode(locator, namespaceURI, localName);
}
}
-
+
ElementMapping.Maker fobjMaker = findFOMaker(namespaceURI, localName);
try {
@@ -279,7 +279,7 @@
}
propertyList = foNode.createPropertyList(
currentPropertyList, foEventHandler);
- foNode.processNode(localName, getEffectiveLocator(),
+ foNode.processNode(localName, getEffectiveLocator(),
attlist, propertyList);
if (foNode.getNameId() == Constants.FO_MARKER) {
if (builderContext.inMarker()) {
@@ -295,19 +295,19 @@
ContentHandlerFactory chFactory = foNode.getContentHandlerFactory();
if (chFactory != null) {
ContentHandler subHandler = chFactory.createContentHandler();
- if (subHandler instanceof ObjectSource
+ if (subHandler instanceof ObjectSource
&& foNode instanceof ObjectBuiltListener) {
((ObjectSource) subHandler).setObjectBuiltListener(
(ObjectBuiltListener) foNode);
}
-
+
subHandler.startDocument();
- subHandler.startElement(namespaceURI, localName,
+ subHandler.startElement(namespaceURI, localName,
rawName, attlist);
depth = 1;
delegate = subHandler;
}
-
+
if (currentFObj != null) {
currentFObj.addChildNode(foNode);
}
@@ -330,28 +330,28 @@
throws SAXException {
if (currentFObj == null) {
throw new SAXException(
- "endElement() called for " + rawName
+ "endElement() called for " + rawName
+ " where there is no current element.");
- } else if (!currentFObj.getLocalName().equals(localName)
+ } else if (!currentFObj.getLocalName().equals(localName)
|| !currentFObj.getNamespaceURI().equals(uri)) {
- throw new SAXException("Mismatch: " + currentFObj.getLocalName()
- + " (" + currentFObj.getNamespaceURI()
+ throw new SAXException("Mismatch: " + currentFObj.getLocalName()
+ + " (" + currentFObj.getNamespaceURI()
+ ") vs. " + localName + " (" + uri + ")");
}
-
+
// fo:characters can potentially be removed during
// white-space handling.
// Do not notify the FOEventHandler.
if (currentFObj.getNameId() != Constants.FO_CHARACTER) {
currentFObj.endOfNode();
}
-
+
if (currentPropertyList != null
&& currentPropertyList.getFObj() == currentFObj
&& !builderContext.inMarker()) {
currentPropertyList = currentPropertyList.getParentPropertyList();
}
-
+
if (currentFObj.getNameId() == Constants.FO_MARKER) {
if (nestedMarkerDepth == 0) {
builderContext.switchMarkerContext(false);
@@ -359,19 +359,19 @@
nestedMarkerDepth--;
}
}
-
+
if (currentFObj.getParent() == null) {
log.debug("endElement for top-level " + currentFObj.getName());
}
-
+
currentFObj = currentFObj.getParent();
}
/** {@inheritDoc} */
- public void characters(char[] data, int start, int length)
+ public void characters(char[] data, int start, int length)
throws FOPException {
if (currentFObj != null) {
- currentFObj.addCharacters(data, start, length,
+ currentFObj.addCharacters(data, start, length,
currentPropertyList, getEffectiveLocator());
}
}
@@ -380,10 +380,10 @@
public void endDocument() throws SAXException {
currentFObj = null;
}
-
+
/**
* Finds the {@link Maker} used to create {@link FONode} objects of a particular type
- *
+ *
* @param namespaceURI URI for the namespace of the element
* @param localName name of the Element
* @return the ElementMapping.Maker that can create an FO object for this element
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOTreeBuilderContext.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 @@
* This is used so we know if the FO tree contains duplicates.
*/
private Set idReferences = new HashSet();
-
+
/**
* The property list maker.
*/
@@ -42,12 +42,12 @@
* The XMLWhitespaceHandler for this tree
*/
protected XMLWhiteSpaceHandler whiteSpaceHandler = new XMLWhiteSpaceHandler();
-
+
/**
* Indicates whether processing descendants of a marker
*/
private boolean inMarker = false;
-
+
/**
* Returns the set of ID references.
* @return the ID references
@@ -58,22 +58,22 @@
/**
* Return the propertyListMaker.
- *
+ *
* @return the currently active {@link PropertyListMaker}
*/
public PropertyListMaker getPropertyListMaker() {
return propertyListMaker;
}
-
+
/**
* Set a new propertyListMaker.
- *
+ *
* @param propertyListMaker the new {@link PropertyListMaker} to use
*/
public void setPropertyListMaker(PropertyListMaker propertyListMaker) {
this.propertyListMaker = propertyListMaker;
}
-
+
/**
* Return the XMLWhiteSpaceHandler
* @return the whiteSpaceHandler
@@ -86,22 +86,22 @@
* Switch to or from marker context
* (used by FOTreeBuilder when processing
* a marker)
- *
- * @param inMarker true if a marker is being processed;
+ *
+ * @param inMarker true if a marker is being processed;
* false otherwise
*
*/
protected void switchMarkerContext(boolean inMarker) {
this.inMarker = inMarker;
}
-
+
/**
* Check whether in marker context
- *
+ *
* @return true if a marker is being processed
*/
protected boolean inMarker() {
return this.inMarker;
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java Thu Jul 24 02:35:34 2008
@@ -37,7 +37,7 @@
* Provider class for the event producer.
*/
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -55,12 +55,12 @@
* @param elementName the name of the context node
* @param offendingNode the offending node
* @param loc the location of the error or null
- * @throws ValidationException the validation error provoked by the method call
+ * @throws ValidationException the validation error provoked by the method call
* @event.severity FATAL
*/
void tooManyNodes(Object source, String elementName, QName offendingNode,
Locator loc) throws ValidationException;
-
+
/**
* The node order is wrong.
* @param source the event source
@@ -74,7 +74,7 @@
void nodeOutOfOrder(Object source, String elementName,
String tooLateNode, String tooEarlyNode, boolean canRecover,
Locator loc) throws ValidationException;
-
+
/**
* An invalid child was encountered.
* @param source the event source
@@ -112,7 +112,7 @@
*/
void missingProperty(Object source, String elementName, String propertyName,
Locator loc) throws ValidationException;
-
+
/**
* An id was used twice in a document.
* @param source the event source
@@ -334,7 +334,7 @@
*/
void invalidFORoot(Object source, String elementName,
Locator loc) throws ValidationException;
-
+
/**
* No FO document was found.
* @param source the event source
@@ -342,7 +342,7 @@
* @event.severity FATAL
*/
void emptyDocument(Object source) throws ValidationException;
-
+
/**
* An unknown/unsupported formatting object has been encountered.
* @param source the event source
@@ -353,5 +353,5 @@
*/
void unknownFormattingObject(Object source, String elementName,
QName offendingNode, Locator loc);
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.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,22 +42,22 @@
* All standard formatting object classes extend this class.
*/
public abstract class FObj extends FONode implements Constants {
-
+
/** the list of property makers */
private static final PropertyMaker[] propertyListTable
= FOPropertyMapping.getGenericMappings();
-
- /**
+
+ /**
* pointer to the descendant subtree
*/
protected FONode firstChild;
-
+
/** The list of extension attachments, null if none */
private List extensionAttachments = null;
-
+
/** The map of foreign attributes, null if none */
private Map foreignAttributes = null;
-
+
/** Used to indicate if this FO is either an Out Of Line FO (see rec)
* or a descendant of one. Used during FO validation.
*/
@@ -65,7 +65,7 @@
/** Markers added to this element. */
private Map markers = null;
-
+
// The value of properties relevant for all fo objects
private String id = null;
// End of property values
@@ -77,7 +77,7 @@
*/
public FObj(FONode parent) {
super(parent);
-
+
// determine if isOutOfLineFODescendant should be set
if (parent != null && parent instanceof FObj) {
if (((FObj) parent).getIsOutOfLineFODescendant()) {
@@ -101,7 +101,7 @@
}
return fobj;
}
-
+
/**
* Returns the PropertyMaker for a given property ID.
* @param propId the property ID
@@ -112,8 +112,8 @@
}
/** {@inheritDoc} */
- public void processNode(String elementName, Locator locator,
- Attributes attlist, PropertyList pList)
+ public void processNode(String elementName, Locator locator,
+ Attributes attlist, PropertyList pList)
throws FOPException {
setLocator(locator);
pList.addAttributesToList(attlist);
@@ -125,10 +125,10 @@
}
/**
- * Create a default property list for this element.
+ * Create a default property list for this element.
* {@inheritDoc}
*/
- protected PropertyList createPropertyList(PropertyList parent,
+ protected PropertyList createPropertyList(PropertyList parent,
FOEventHandler foEventHandler) throws FOPException {
return getBuilderContext().getPropertyListMaker().make(this, parent);
}
@@ -158,7 +158,7 @@
* Setup the id for this formatting object.
* Most formatting objects can have an id that can be referenced.
* This methods checks that the id isn't already used by another FO
- *
+ *
* @param id the id to check
* @throws ValidationException if the ID is already defined elsewhere
* (strict validation only)
@@ -186,11 +186,11 @@
protected void addChildNode(FONode child) throws FOPException {
if (child.getNameId() == FO_MARKER) {
addMarker((Marker) child);
- } else {
+ } else {
ExtensionAttachment attachment = child.getExtensionAttachment();
if (attachment != null) {
- /* This removes the element from the normal children,
- * so no layout manager is being created for them
+ /* This removes the element from the normal children,
+ * so no layout manager is being created for them
* as they are only additional information.
*/
addExtensionAttachment(attachment);
@@ -215,11 +215,11 @@
* @param parent the (cloned) parent node
* @throws FOPException when the child could not be added to the parent
*/
- protected static void addChildTo(FONode child, FObj parent)
+ protected static void addChildTo(FONode child, FObj parent)
throws FOPException {
parent.addChildNode(child);
}
-
+
/** {@inheritDoc} */
public void removeChild(FONode child) {
FONode nextChild = null;
@@ -239,7 +239,7 @@
}
}
}
-
+
/**
* Find the nearest parent, grandparent, etc. FONode that is also an FObj
* @return FObj the nearest ancestor FONode that is an FObj
@@ -276,7 +276,7 @@
public boolean hasChildren() {
return this.firstChild != null;
}
-
+
/**
* Return an iterator over the object's childNodes starting
* at the passed-in node (= first call to iterator.next() will
@@ -307,7 +307,7 @@
/**
* Notifies a FObj that one of it's children is removed.
- * This method is subclassed by Block to clear the
+ * This method is subclassed by Block to clear the
* firstInlineChild variable in case it doesn't generate
* any areas (see addMarker()).
* @param node the node that was removed
@@ -315,7 +315,7 @@
void notifyChildRemoval(FONode node) {
//nop
}
-
+
/**
* Add the marker to this formatting object.
* If this object can contain markers it checks that the marker
@@ -392,7 +392,7 @@
return null;
}
}
-
+
/** {@inheritDoc} */
protected String gatherContextInfo() {
if (getLocator() != null) {
@@ -422,11 +422,11 @@
* incoming node is a member of the "%block;" parameter entity
* as defined in Sect. 6.2 of the XSL 1.0 & 1.1 Recommendations
* @param nsURI namespace URI of incoming node
- * @param lName local name (i.e., no prefix) of incoming node
+ * @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
protected boolean isBlockItem(String nsURI, String lName) {
- return (FO_URI.equals(nsURI)
+ return (FO_URI.equals(nsURI)
&& ("block".equals(lName)
|| "table".equals(lName)
|| "table-and-caption".equals(lName)
@@ -441,11 +441,11 @@
* incoming node is a member of the "%inline;" parameter entity
* as defined in Sect. 6.2 of the XSL 1.0 & 1.1 Recommendations
* @param nsURI namespace URI of incoming node
- * @param lName local name (i.e., no prefix) of incoming node
+ * @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
protected boolean isInlineItem(String nsURI, String lName) {
- return (FO_URI.equals(nsURI)
+ return (FO_URI.equals(nsURI)
&& ("bidi-override".equals(lName)
|| "character".equals(lName)
|| "external-graphic".equals(lName)
@@ -470,7 +470,7 @@
* incoming node is a member of the "%block;" parameter entity
* or "%inline;" parameter entity
* @param nsURI namespace URI of incoming node
- * @param lName local name (i.e., no prefix) of incoming node
+ * @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
protected boolean isBlockOrInlineItem(String nsURI, String lName) {
@@ -482,11 +482,11 @@
* incoming node is a member of the neutral item list
* as defined in Sect. 6.2 of the XSL 1.0 & 1.1 Recommendations
* @param nsURI namespace URI of incoming node
- * @param lName local name (i.e., no prefix) of incoming node
+ * @param lName local name (i.e., no prefix) of incoming node
* @return true if a member, false if not
*/
boolean isNeutralItem(String nsURI, String lName) {
- return (FO_URI.equals(nsURI)
+ return (FO_URI.equals(nsURI)
&& ("multi-switch".equals(lName)
|| "multi-properties".equals(lName)
|| "wrapper".equals(lName)
@@ -494,12 +494,12 @@
|| "retrieve-marker".equals(lName)
|| "retrieve-table-marker".equals(lName)));
}
-
+
/**
* Convenience method for validity checking. Checks if the
* current node has an ancestor of a given name.
* @param ancestorID ID of node name to check for (e.g., FO_ROOT)
- * @return number of levels above FO where ancestor exists,
+ * @return number of levels above FO where ancestor exists,
* -1 if not found
*/
protected int findAncestor(int ancestorID) {
@@ -514,19 +514,19 @@
}
return -1;
}
-
+
/**
* Clears the list of child nodes.
*/
public void clearChildNodes() {
this.firstChild = null;
}
-
+
/** @return the "id" property. */
public String getId() {
return id;
}
-
+
/** @return whether this object has an id set */
public boolean hasId() {
return id != null && id.length() > 0;
@@ -543,9 +543,9 @@
}
/**
- * Add a new extension attachment to this FObj.
+ * Add a new extension attachment to this FObj.
* (see org.apache.fop.fo.FONode for details)
- *
+ *
* @param attachment the attachment to add.
*/
void addExtensionAttachment(ExtensionAttachment attachment) {
@@ -557,13 +557,13 @@
extensionAttachments = new java.util.ArrayList();
}
if (log.isDebugEnabled()) {
- log.debug("ExtensionAttachment of category "
- + attachment.getCategory() + " added to "
+ log.debug("ExtensionAttachment of category "
+ + attachment.getCategory() + " added to "
+ getName() + ": " + attachment);
}
extensionAttachments.add(attachment);
}
-
+
/** @return the extension attachments of this FObj. */
public List getExtensionAttachments() {
if (extensionAttachments == null) {
@@ -579,7 +579,7 @@
* @param value the attribute value
*/
public void addForeignAttribute(QName attributeName, String value) {
- /* TODO: Handle this over FOP's property mechanism so we can use
+ /* TODO: Handle this over FOP's property mechanism so we can use
* inheritance.
*/
if (attributeName == null) {
@@ -590,7 +590,7 @@
}
foreignAttributes.put(attributeName, value);
}
-
+
/** @return the map of foreign attributes */
public Map getForeignAttributes() {
if (foreignAttributes == null) {
@@ -599,7 +599,7 @@
return foreignAttributes;
}
}
-
+
/** {@inheritDoc} */
public String toString() {
return (super.toString() + "[@id=" + this.id + "]");
@@ -607,28 +607,28 @@
/** Basic {@link FONodeIterator} implementation */
public class FObjIterator implements FONodeIterator {
-
+
private static final int F_NONE_ALLOWED = 0;
private static final int F_SET_ALLOWED = 1;
private static final int F_REMOVE_ALLOWED = 2;
-
+
private FONode currentNode;
private final FObj parentNode;
private int currentIndex;
private int flags = F_NONE_ALLOWED;
-
+
FObjIterator(FObj parent) {
this.parentNode = parent;
this.currentNode = parent.firstChild;
this.currentIndex = 0;
this.flags = F_NONE_ALLOWED;
}
-
+
/** {@inheritDoc} */
public FObj parentNode() {
return parentNode;
}
-
+
/** {@inheritDoc} */
public Object next() {
if (currentNode != null) {
@@ -660,7 +660,7 @@
throw new NoSuchElementException();
}
}
-
+
/** {@inheritDoc} */
public void set(Object o) {
if ((flags & F_SET_ALLOWED) == F_SET_ALLOWED) {
@@ -678,7 +678,7 @@
throw new IllegalStateException();
}
}
-
+
/** {@inheritDoc} */
public void add(Object o) {
FONode newNode = (FONode) o;
@@ -713,7 +713,7 @@
|| (currentNode.siblings != null
&& currentNode.siblings[0] != null);
}
-
+
/** {@inheritDoc} */
public int nextIndex() {
return currentIndex + 1;
@@ -754,19 +754,19 @@
}
return currentNode;
}
-
+
/** {@inheritDoc} */
public FONode firstNode() {
currentNode = parentNode.firstChild;
currentIndex = 0;
return currentNode;
}
-
+
/** {@inheritDoc} */
public FONode nextNode() {
return (FONode) next();
}
-
+
/** {@inheritDoc} */
public FONode previousNode() {
return (FONode) previous();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObjMixed.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.
@@ -71,7 +71,7 @@
// send character[s]() events to the FOEventHandler
sendCharacters();
}
-
+
}
/**
@@ -180,10 +180,10 @@
/**
* Returns a {@link CharIterator} over this FO's character content
- *
+ *
* @return iterator for this object
*/
public CharIterator charIterator() {
return new RecursiveCharIterator(this);
- }
+ }
}
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/GraphicsProperties.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/GraphicsProperties.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/GraphicsProperties.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/GraphicsProperties.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.
@@ -47,7 +47,7 @@
* @return the "width" property.
*/
Length getWidth();
-
+
/**
* @return the "content-height" property.
*/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/InlineCharIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/InlineCharIterator.java?rev=679326&r1=679325&r2=679326&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/InlineCharIterator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/InlineCharIterator.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.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org