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 ma...@apache.org on 2009/10/29 14:19:36 UTC
svn commit: r830929 - in /xmlgraphics/fop/trunk/src:
documentation/content/xdocs/trunk/ java/org/apache/fop/afp/modca/triplets/
java/org/apache/fop/render/afp/ java/org/apache/fop/render/afp/extensions/
Author: maxberger
Date: Thu Oct 29 13:19:36 2009
New Revision: 830929
URL: http://svn.apache.org/viewvc?rev=830929&view=rev
Log:
Fixed SVN Props
Modified:
xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/accessibility.xml (props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeQualifierTriplet.java (props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeValueTriplet.java (props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/Triplet.java (props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPEventProducer.xml (props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java (contents, props changed)
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java (contents, props changed)
Propchange: xmlgraphics/fop/trunk/src/documentation/content/xdocs/trunk/accessibility.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Oct 29 13:19:36 2009
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeQualifierTriplet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeQualifierTriplet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeValueTriplet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/AttributeValueTriplet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/Triplet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/Triplet.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPEventProducer.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Oct 29 13:19:36 2009
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java?rev=830929&r1=830928&r2=830929&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java Thu Oct 29 13:19:36 2009
@@ -1,107 +1,107 @@
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id: AFPIncludeFormMap.java 798207 2009-07-27 16:33:01Z jeremias $ */
-
-package org.apache.fop.render.afp.extensions;
-
-import java.net.URI;
-
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import org.apache.fop.fo.extensions.ExtensionAttachment;
-
-/**
- * This extension allows to include an AFP Page Overlay resource. It is implemented as an extension
- * attachment ({@link ExtensionAttachment}).
- */
-public class AFPPageOverlay extends AFPExtensionAttachment {
-
- private static final long serialVersionUID = 8548056652642588919L;
-
- /** X coordinate attribute */
- protected static final String ATT_X = "X";
- /** X coordinate attribute */
- protected static final String ATT_Y = "Y";
-
- /**
- * The x coordinate
- */
- private int x = 0;
-
- /**
- * The y coordinate
- */
- private int y = 0;
-
- /**
- * Default constructor.
- */
- public AFPPageOverlay() {
- super(AFPElementMapping.INCLUDE_PAGE_OVERLAY);
- }
-
- /**
- * returns X coordinate
- * @return x integer
- */
- public int getX() {
- return x;
- }
-
- /**
- * Sets the X coordinate
- * @param x The integer to be set.
- */
- public void setX(int x) {
- this.x = x;
- }
-
- /**
- * returns Y coordinate
- * @return y integer
- */
- public int getY() {
- return y;
- }
-
- /**
- * Sets the Y coordinate
- * @param y The integer to be set.
- */
- public void setY(int y) {
- this.y = y;
- }
-
- /** {@inheritDoc} */
- public void toSAX(ContentHandler handler) throws SAXException {
- AttributesImpl atts = new AttributesImpl();
- if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
- }
- handler.startElement(CATEGORY, elementName, elementName, atts);
- handler.endElement(CATEGORY, elementName, elementName);
- }
-
- /** {@inheritDoc} */
- public String toString() {
- return getClass().getName() + "(element-name=" + getElementName()
- + " name=" + getName() + " x=" + getX() + " y=" + getY() + ")";
- }
-}
+/*
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.render.afp.extensions;
+
+import java.net.URI;
+
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+
+import org.apache.fop.fo.extensions.ExtensionAttachment;
+
+/**
+ * This extension allows to include an AFP Page Overlay resource. It is implemented as an extension
+ * attachment ({@link ExtensionAttachment}).
+ */
+public class AFPPageOverlay extends AFPExtensionAttachment {
+
+ private static final long serialVersionUID = 8548056652642588919L;
+
+ /** X coordinate attribute */
+ protected static final String ATT_X = "X";
+ /** X coordinate attribute */
+ protected static final String ATT_Y = "Y";
+
+ /**
+ * The x coordinate
+ */
+ private int x = 0;
+
+ /**
+ * The y coordinate
+ */
+ private int y = 0;
+
+ /**
+ * Default constructor.
+ */
+ public AFPPageOverlay() {
+ super(AFPElementMapping.INCLUDE_PAGE_OVERLAY);
+ }
+
+ /**
+ * returns X coordinate
+ * @return x integer
+ */
+ public int getX() {
+ return x;
+ }
+
+ /**
+ * Sets the X coordinate
+ * @param x The integer to be set.
+ */
+ public void setX(int x) {
+ this.x = x;
+ }
+
+ /**
+ * returns Y coordinate
+ * @return y integer
+ */
+ public int getY() {
+ return y;
+ }
+
+ /**
+ * Sets the Y coordinate
+ * @param y The integer to be set.
+ */
+ public void setY(int y) {
+ this.y = y;
+ }
+
+ /** {@inheritDoc} */
+ public void toSAX(ContentHandler handler) throws SAXException {
+ AttributesImpl atts = new AttributesImpl();
+ if (name != null && name.length() > 0) {
+ atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ }
+ handler.startElement(CATEGORY, elementName, elementName, atts);
+ handler.endElement(CATEGORY, elementName, elementName);
+ }
+
+ /** {@inheritDoc} */
+ public String toString() {
+ return getClass().getName() + "(element-name=" + getElementName()
+ + " name=" + getName() + " x=" + getX() + " y=" + getY() + ")";
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java?rev=830929&r1=830928&r2=830929&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java Thu Oct 29 13:19:36 2009
@@ -1,97 +1,97 @@
-/*
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id: AFPPageSetupElement.java 798207 2009-07-27 16:33:01Z jeremias $ */
-
-package org.apache.fop.render.afp.extensions;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.extensions.ExtensionAttachment;
-import org.apache.fop.afp.AFPPaintingState;
-import org.apache.fop.afp.AFPUnitConverter;
-import org.apache.xmlgraphics.util.UnitConv;
-
-/**
- * This class extends the org.apache.fop.render.afp.extensions.AbstractAFPExtensionObject class.
- * This object will be used to map the page overlay object in AFPElementMapping.
- * <p/>
- */
-public class AFPPageOverlayElement extends AbstractAFPExtensionObject {
-
- private static final String ATT_X = "x";
- private static final String ATT_Y = "y";
-
- /**
- * Constructs an AFP object (called by Maker).
- *
- * @param parent the parent formatting object
- * @param name the name of the afp element
- */
- public AFPPageOverlayElement(FONode parent, String name) {
- super(parent, name);
- }
-
- private AFPPageOverlay getPageSetupAttachment() {
- return (AFPPageOverlay)getExtensionAttachment();
- }
-
- /** {@inheritDoc} */
- protected void startOfNode() throws FOPException {
- super.startOfNode();
- if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(getLocalName())) {
- if (parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER
- && parent.getNameId() != Constants.FO_PAGE_SEQUENCE) {
- invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(),
- "rule.childOfPageSequenceOrSPM");
- }
- } else {
- if (parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER) {
- invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(),
- "rule.childOfSPM");
- }
- }
- }
-
-
- /** {@inheritDoc} */
- public void processNode(String elementName, Locator locator,
- Attributes attlist, PropertyList propertyList)
- throws FOPException {
- super.processNode(elementName, locator, attlist, propertyList);
- AFPPageOverlay pageOverlay = getPageSetupAttachment();
- if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(elementName)) {
- // convert user specific units to mpts and set the coordinates for the page overlay
- AFPPaintingState paintingState = new AFPPaintingState();
- AFPUnitConverter unitConverter = new AFPUnitConverter(paintingState);
- int x = (int)unitConverter.mpt2units(UnitConv.convert(attlist.getValue(ATT_X)));
- int y = (int)unitConverter.mpt2units(UnitConv.convert(attlist.getValue(ATT_Y)));
- pageOverlay.setX(x);
- pageOverlay.setY(y);
- }
- }
-
- /** {@inheritDoc} */
- protected ExtensionAttachment instantiateExtensionAttachment() {
- return new AFPPageOverlay();
- }
-}
+/*
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.render.afp.extensions;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.extensions.ExtensionAttachment;
+import org.apache.fop.afp.AFPPaintingState;
+import org.apache.fop.afp.AFPUnitConverter;
+import org.apache.xmlgraphics.util.UnitConv;
+
+/**
+ * This class extends the org.apache.fop.render.afp.extensions.AbstractAFPExtensionObject class.
+ * This object will be used to map the page overlay object in AFPElementMapping.
+ * <p/>
+ */
+public class AFPPageOverlayElement extends AbstractAFPExtensionObject {
+
+ private static final String ATT_X = "x";
+ private static final String ATT_Y = "y";
+
+ /**
+ * Constructs an AFP object (called by Maker).
+ *
+ * @param parent the parent formatting object
+ * @param name the name of the afp element
+ */
+ public AFPPageOverlayElement(FONode parent, String name) {
+ super(parent, name);
+ }
+
+ private AFPPageOverlay getPageSetupAttachment() {
+ return (AFPPageOverlay)getExtensionAttachment();
+ }
+
+ /** {@inheritDoc} */
+ protected void startOfNode() throws FOPException {
+ super.startOfNode();
+ if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(getLocalName())) {
+ if (parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER
+ && parent.getNameId() != Constants.FO_PAGE_SEQUENCE) {
+ invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(),
+ "rule.childOfPageSequenceOrSPM");
+ }
+ } else {
+ if (parent.getNameId() != Constants.FO_SIMPLE_PAGE_MASTER) {
+ invalidChildError(getLocator(), parent.getName(), getNamespaceURI(), getName(),
+ "rule.childOfSPM");
+ }
+ }
+ }
+
+
+ /** {@inheritDoc} */
+ public void processNode(String elementName, Locator locator,
+ Attributes attlist, PropertyList propertyList)
+ throws FOPException {
+ super.processNode(elementName, locator, attlist, propertyList);
+ AFPPageOverlay pageOverlay = getPageSetupAttachment();
+ if (AFPElementMapping.INCLUDE_PAGE_OVERLAY.equals(elementName)) {
+ // convert user specific units to mpts and set the coordinates for the page overlay
+ AFPPaintingState paintingState = new AFPPaintingState();
+ AFPUnitConverter unitConverter = new AFPUnitConverter(paintingState);
+ int x = (int)unitConverter.mpt2units(UnitConv.convert(attlist.getValue(ATT_X)));
+ int y = (int)unitConverter.mpt2units(UnitConv.convert(attlist.getValue(ATT_Y)));
+ pageOverlay.setX(x);
+ pageOverlay.setY(y);
+ }
+ }
+
+ /** {@inheritDoc} */
+ protected ExtensionAttachment instantiateExtensionAttachment() {
+ return new AFPPageOverlay();
+ }
+}
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/extensions/AFPPageOverlayElement.java
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org