- fix minor checkstyle issues

- add missing headers
- add an entry in status.xml for the new named destinations feature

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@525078 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/DestinationData.java b/src/java/org/apache/fop/area/DestinationData.java
index 920cd814a94181d33b20cc335911b7570066281e..5d36969b934ee500d5a9e179eb92b8b2e0633834 100644 (file)
--- a/src/java/org/apache/fop/area/DestinationData.java
+++ b/src/java/org/apache/fop/area/DestinationData.java
@@ -1,3 +1,22 @@
+/*\r
+ * Licensed to the Apache Software Foundation (ASF) under one or more\r
+ * contributor license agreements.  See the NOTICE file distributed with\r
+ * this work for additional information regarding copyright ownership.\r
+ * The ASF licenses this file to You under the Apache License, Version 2.0\r
+ * (the "License"); you may not use this file except in compliance with\r
+ * the License.  You may obtain a copy of the License at\r
+ * \r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+/* $Id$ */\r
+\r
 package org.apache.fop.area;\r
 \r
 import java.util.List;\r

diff --git a/src/java/org/apache/fop/fo/extensions/destination/Destination.java b/src/java/org/apache/fop/fo/extensions/destination/Destination.java
index b16962b740b8826cdbc96cc2b865828a63baea17..01ce4419681268050ae7342c93f6b6155c7cfe0a 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/destination/Destination.java
+++ b/src/java/org/apache/fop/fo/extensions/destination/Destination.java
@@ -1,3 +1,22 @@
+/*\r
+ * Licensed to the Apache Software Foundation (ASF) under one or more\r
+ * contributor license agreements.  See the NOTICE file distributed with\r
+ * this work for additional information regarding copyright ownership.\r
+ * The ASF licenses this file to You under the Apache License, Version 2.0\r
+ * (the "License"); you may not use this file except in compliance with\r
+ * the License.  You may obtain a copy of the License at\r
+ * \r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+/* $Id$ */\r
+\r
 package org.apache.fop.fo.extensions.destination;\r
 \r
 import org.apache.fop.fo.ValidationException;\r

diff --git a/src/java/org/apache/fop/fo/extensions/destination/DestinationElementMapping.java b/src/java/org/apache/fop/fo/extensions/destination/DestinationElementMapping.java
index 8e9d926f5f058a351b8406038ca4c6c275b70cb2..33a953689391b641bbd7abb00a7a12a017cc6cbb 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/destination/DestinationElementMapping.java
+++ b/src/java/org/apache/fop/fo/extensions/destination/DestinationElementMapping.java
@@ -1,3 +1,22 @@
+/*\r
+ * Licensed to the Apache Software Foundation (ASF) under one or more\r
+ * contributor license agreements.  See the NOTICE file distributed with\r
+ * this work for additional information regarding copyright ownership.\r
+ * The ASF licenses this file to You under the Apache License, Version 2.0\r
+ * (the "License"); you may not use this file except in compliance with\r
+ * the License.  You may obtain a copy of the License at\r
+ * \r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * \r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+/* $Id$ */\r
+\r
 package org.apache.fop.fo.extensions.destination;\r
 \r
 import java.util.HashMap;\r

diff --git a/src/java/org/apache/fop/fo/extensions/destination/package.html b/src/java/org/apache/fop/fo/extensions/destination/package.html
index 10157e862ef8da83212b849a3f4eee8ef13b8135..ff2bdbc88f8213ac4247bc50b959ebbb1a84ae8d 100644 (file)
--- a/src/java/org/apache/fop/fo/extensions/destination/package.html
+++ b/src/java/org/apache/fop/fo/extensions/destination/package.html
@@ -14,9 +14,10 @@
   See the License for the specific language governing permissions and\r
   limitations under the License.\r
 -->\r
+<!-- $Id$ -->\r
 <HTML>\r
 <TITLE>org.apache.fop.destination Package</TITLE>\r
 <BODY>\r
 <P>Classes to support named destinations (only relevant for PDF output)</P>\r
 </BODY>\r
-</HTML>
\ No newline at end of file
+</HTML>\r

diff --git a/src/java/org/apache/fop/pdf/PDFDestination.java b/src/java/org/apache/fop/pdf/PDFDestination.java
index e8228acfd98965dc50d4e41996fd86fb169487c1..e68428a19e146fb8059bb43cd74747f16733d67f 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFDestination.java
+++ b/src/java/org/apache/fop/pdf/PDFDestination.java
@@ -79,7 +79,7 @@ public class PDFDestination extends PDFObject {
     /**\r
      * Sets the GoToReference in the associated DestinationData object.\r
      *\r
-     * @param the GoToReference to set in the associated DestinationData object.\r
+     * @param goToReference the reference to set in the associated DestinationData object.\r
      */\r
     public void setGoToReference(String goToReference) {\r
         this.goToReference = goToReference;\r
@@ -90,8 +90,7 @@ public class PDFDestination extends PDFObject {
      *\r
      * @return the GoToReference from the associated DestinationData object.\r
      */\r
-    public String getGoToReference()\r
-    {\r
+    public String getGoToReference() {\r
         return this.goToReference;\r
     }\r
 \r
@@ -109,8 +108,7 @@ public class PDFDestination extends PDFObject {
      *\r
      * @return the RefID from the associated DestinationData object.\r
      */\r
-    public String getIDRef()\r
-    {\r
+    public String getIDRef() {\r
         return this.idRef;\r
     }\r
 \r

diff --git a/src/java/org/apache/fop/pdf/PDFDocument.java b/src/java/org/apache/fop/pdf/PDFDocument.java
index 042d3d00bd4443b00a5beb90bcc5dce4d43385bf..09e1eccffc562061c7e5407bf482450703d4adef 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFDocument.java
+++ b/src/java/org/apache/fop/pdf/PDFDocument.java
@@ -759,7 +759,7 @@ public class PDFDocument {
     /**
      * Sets whether the document has named destinations.
      *
-     * @param whether the document has named destinations.
+     * @param hasDestinations whether the document has named destinations.
      */
     public void setHasDestinations(boolean hasDestinations) {
         this.hasDestinations = hasDestinations;

diff --git a/src/java/org/apache/fop/pdf/PDFLimits.java b/src/java/org/apache/fop/pdf/PDFLimits.java
index ece7a3dfba20046a5faf70a179a6d36936f147e1..2687ff1cc8d5d3d75a4dff4bc69ee1606b06417d 100644 (file)
--- a/src/java/org/apache/fop/pdf/PDFLimits.java
+++ b/src/java/org/apache/fop/pdf/PDFLimits.java
@@ -45,7 +45,7 @@ public class PDFLimits extends PDFObject {
     public String toPDFString() {\r
         String[] idRefs = new String[destinationList.size()];\r
         String kidsString = "";\r
-        for(int i = 0; i < destinationList.size(); i++) {\r
+        for (int i = 0; i < destinationList.size(); i++) {\r
             PDFDestination dest = (PDFDestination)destinationList.get(i);\r
             idRefs[i] = dest.getIDRef();\r
             kidsString += dest.referencePDF();\r

diff --git a/status.xml b/status.xml
index 105fe986d138b7386e06dd37a6e53eb22133151a..1e281b91df8fa261c7f7b8216e911bc0eabf2af5 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JB" type="add" importance="high">
+        Add support for named destinations in PDF.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Fixed a problem with keep-with-next on table-rows. Once a keep-with-next was set
         inside a table, the FO following the table would always be glued to the previous table.