- 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

8 files changed, 67 insertions, 8 deletions

diff --git a/src/java/org/apache/fop/area/DestinationData.java b/src/java/org/apache/fop/area/DestinationData.java
index 920cd814a..5d36969b9 100644
--- a/src/java/org/apache/fop/area/DestinationData.java
+++ b/src/java/org/apache/fop/area/DestinationData.java
@@ -1,3 +1,22 @@
+/*

+ * 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.area;

 

 import java.util.List;

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 b16962b74..01ce44196 100644
--- 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 @@
+/*

+ * 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.fo.extensions.destination;

 

 import org.apache.fop.fo.ValidationException;

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 8e9d926f5..33a953689 100644
--- 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 @@
+/*

+ * 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.fo.extensions.destination;

 

 import java.util.HashMap;

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 10157e862..ff2bdbc88 100644
--- 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

   limitations under the License.

 -->

+<!-- $Id$ -->

 <HTML>

 <TITLE>org.apache.fop.destination Package</TITLE>

 <BODY>

 <P>Classes to support named destinations (only relevant for PDF output)</P>

 </BODY>

-</HTML>
\ No newline at end of file
+</HTML>

diff --git a/src/java/org/apache/fop/pdf/PDFDestination.java b/src/java/org/apache/fop/pdf/PDFDestination.java
index e8228acfd..e68428a19 100644
--- 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 {
     /**

      * Sets the GoToReference in the associated DestinationData object.

      *

-     * @param the GoToReference to set in the associated DestinationData object.

+     * @param goToReference the reference to set in the associated DestinationData object.

      */

     public void setGoToReference(String goToReference) {

         this.goToReference = goToReference;

@@ -90,8 +90,7 @@ public class PDFDestination extends PDFObject {
      *

      * @return the GoToReference from the associated DestinationData object.

      */

-    public String getGoToReference()

-    {

+    public String getGoToReference() {

         return this.goToReference;

     }

 

@@ -109,8 +108,7 @@ public class PDFDestination extends PDFObject {
      *

      * @return the RefID from the associated DestinationData object.

      */

-    public String getIDRef()

-    {

+    public String getIDRef() {

         return this.idRef;

     }

 

diff --git a/src/java/org/apache/fop/pdf/PDFDocument.java b/src/java/org/apache/fop/pdf/PDFDocument.java
index 042d3d00b..09e1eccff 100644
--- 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 ece7a3dfb..2687ff1cc 100644
--- 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() {

         String[] idRefs = new String[destinationList.size()];

         String kidsString = "";

-        for(int i = 0; i < destinationList.size(); i++) {

+        for (int i = 0; i < destinationList.size(); i++) {

             PDFDestination dest = (PDFDestination)destinationList.get(i);

             idRefs[i] = dest.getIDRef();

             kidsString += dest.referencePDF();

diff --git a/status.xml b/status.xml
index 105fe986d..1e281b91d 100644
--- 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.