Renamed some variables and methods for consistency.

Improved javadocs.
Code clean-up and simplification.


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

2 files changed, 18 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java b/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
index 8a4237af1..340b2e068 100644
--- a/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
+++ b/src/java/org/apache/fop/render/intermediate/extensions/AbstractAction.java
@@ -27,7 +27,7 @@ import org.apache.xmlgraphics.util.XMLizable;
 public abstract class AbstractAction implements XMLizable {
 
     private String id;
-    private String ptr; // used for accessibility
+    private String structurePointer;
 
     /**
      * Sets an ID to make the action referencable.
@@ -44,23 +44,23 @@ public abstract class AbstractAction implements XMLizable {
     public String getID() {
         return this.id;
     }
-    
+
     /**
-     * Used for accessibility   
-     * @param s representing the ptr
+     * Sets the structure element corresponding to this action.
+     * @param structurePointer a reference to the structure element
      */
-    public void setPtr(String s) {
-        this.ptr = s;
+    public void setStructurePointer(String structurePointer) {
+        this.structurePointer = structurePointer;
     }
-    
+
     /**
-     * Used for accessibility
-     * @return the ptr
+     * Returns the structure element corresponding to this action.
+     * @return the reference to the structure element
      */
-    public String getPtr() {
-        return this.ptr;
+    public String getStructurePointer() {
+        return structurePointer;
     }
-    
+
     /**
      * Indicates whether the action has an ID and is therefore referencable.
      * @return true if the action has an ID
diff --git a/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java b/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
index 6a27a929d..5ca480f4a 100644
--- a/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
+++ b/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
@@ -48,7 +48,7 @@ public class DocumentNavigationHandler extends DefaultHandler
 
     private IFDocumentNavigationHandler navHandler;
 
-    private String accessibilityPointer;
+    private String structurePointer;
 
     /**
      * Main constructor.
@@ -98,7 +98,7 @@ public class DocumentNavigationHandler extends DefaultHandler
                     throw new SAXException(localName + " must be the root element!");
                 }
                 Rectangle targetRect = XMLUtil.getAttributeAsRectangle(attributes, "rect");
-                accessibilityPointer = attributes.getValue("ptr");
+                structurePointer = attributes.getValue("ptr");
                 Link link = new Link(null, targetRect);
                 objectStack.push(link);
             } else if (GOTO_XY.getLocalName().equals(localName)) {
@@ -121,8 +121,8 @@ public class DocumentNavigationHandler extends DefaultHandler
                     }
                     action = new GoToXYAction(id, pageIndex, location);
                 }
-                if (accessibilityPointer != null) {
-                    action.setPtr(accessibilityPointer);
+                if (structurePointer != null) {
+                    action.setStructurePointer(structurePointer);
                 }
                 objectStack.push(action);
             } else if (GOTO_URI.getLocalName().equals(localName)) {
@@ -134,8 +134,8 @@ public class DocumentNavigationHandler extends DefaultHandler
                 if (id != null) {
                     action.setID(id);
                 }
-                if (accessibilityPointer != null) {
-                    action.setPtr(accessibilityPointer);
+                if (structurePointer != null) {
+                    action.setStructurePointer(structurePointer);
                 }
                 objectStack.push(action);
             } else {