[FOray-commit] SF.net SVN: foray: [8555] trunk/foray

Revision: 8555
          http://svn.sourceforge.net/foray/?rev=8555&view=rev
Author:   victormote
Date:     2007-01-30 18:34:41 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Conform to axsl changes for a new enumeration class.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-01-31 02:12:48 UTC (rev 8554)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-01-31 02:34:41 UTC (rev 8555)
@@ -37,6 +37,7 @@
 import org.axsl.areaW.TableArea;
 import org.axsl.common.Constants;
 import org.axsl.common.FoValue;
+import org.axsl.common.LinkType;
 import org.axsl.foR.FONode;
 import org.axsl.foR.WritingMode;
 import org.axsl.foR.fo.BasicLink;
@@ -1076,14 +1077,14 @@
     /**
      * If this Area is descended from a fo:basic-link, return the link type
      * for that link.
-     * @return One of: {@link Constants#BASIC_LINK_EXTERNAL} or
-     * {@link Constants#BASIC_LINK_INTERNAL}. If this area is not part
-     * of a link, returns {@link Constants#BASIC_LINK_INVALID}.
+     * @return One of: {@link LinkType#EXTERNAL} or
+     * {@link LinkType#INTERNAL}. If this area is not part
+     * of a link, returns {@link LinkType#INVALID}.
      */
     public byte linkType() {
         final BasicLink link = this.traitGeneratedBy().getBasicLink(this);
         if (link == null) {
-            return Constants.BASIC_LINK_INVALID;
+            return LinkType.INVALID;
         }
         return link.getLinkType();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2007-01-31 02:12:48 UTC (rev 8554)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java	2007-01-31 02:34:41 UTC (rev 8555)
@@ -33,7 +33,7 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.common.Constants;
+import org.axsl.common.LinkType;
 import org.axsl.foR.FOContext;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
@@ -82,10 +82,10 @@
 
     public boolean isValid() {
         switch (getLinkType()) {
-        case Constants.BASIC_LINK_INTERNAL: {
+        case LinkType.INTERNAL: {
             return true;
         }
-        case Constants.BASIC_LINK_EXTERNAL: {
+        case LinkType.EXTERNAL: {
             return true;
         }
         default: {
@@ -107,12 +107,12 @@
 
     public byte getLinkType() {
         if (! traitInternalDestination().equals("")) {
-            return Constants.BASIC_LINK_INTERNAL;
+            return LinkType.INTERNAL;
         }
         if (! traitExternalDestination().equals("")) {
-            return Constants.BASIC_LINK_EXTERNAL;
+            return LinkType.EXTERNAL;
         }
-        return Constants.BASIC_LINK_INVALID;
+        return LinkType.INVALID;
     }
 
     public String getCookedExternalDestination() {
@@ -138,10 +138,10 @@
 
     public String getDestination() {
         switch (this.getLinkType()) {
-        case Constants.BASIC_LINK_INTERNAL: {
+        case LinkType.INTERNAL: {
             return this.traitInternalDestination();
         }
-        case Constants.BASIC_LINK_EXTERNAL: {
+        case LinkType.EXTERNAL: {
             return this.getCookedExternalDestination();
         }
         default: {

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-01-31 02:12:48 UTC (rev 8554)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2007-01-31 02:34:41 UTC (rev 8555)
@@ -51,8 +51,8 @@
 import org.axsl.areaR.PageArea;
 import org.axsl.areaR.SVGArea;
 import org.axsl.areaR.TextArea;
-import org.axsl.common.Constants;
 import org.axsl.common.FoValue;
+import org.axsl.common.LinkType;
 import org.axsl.fontR.Font;
 import org.axsl.fontR.FontUse;
 import org.axsl.graphicR.Graphic;
@@ -446,7 +446,7 @@
 
     protected void createBasicLink(final BasicLinkArea area) {
         boolean externalLink = false;
-        if (area.linkType() == Constants.BASIC_LINK_EXTERNAL) {
+        if (area.linkType() == LinkType.EXTERNAL) {
             externalLink = true;
         }
         this.currentPage.makeLink(area.brPoints(),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.