Thread: [FOray-commit] SF.net SVN: foray:[12910] trunk/foray/foray-fotree/src/main/java/org/foray /fotree (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12910
          http://sourceforge.net/p/foray/code/12910
Author:   victormote
Date:     2022-12-21 14:49:17 +0000 (Wed, 21 Dec 2022)
Log Message:
-----------
Remove "standard" namespace prefix in favor of using QName.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/NamespaceMath.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================

--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -147,6 +147,8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import javax.xml.namespace.QName;
+
 /**
  * Base class for formatting objects.
  */
@@ -401,7 +403,8 @@
      * @return The name of this object, with the typical namespace abbreviation prepended.
      */
     public String getFullName() {
-        return getNamespace().getTypicalPrefix() + ":" + getName();
+        final QName qname = getNamespace().getQname(getName());
+        return qname.toString();
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoTreeServer4a.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -194,22 +194,6 @@
     }
 
     /**
-     * Returns the text property name for a given PropertyType instance.
-     * @param propertyType The property type whose name is needed.
-     * @return The text property name.
-     */
-    public String getPropertyName(final PropertyId propertyType) {
-        final String propertyName = propertyType.getAttributeName();
-        for (Namespace ns : this.namespaceMap.values()) {
-            if (propertyName != null
-                    && ! propertyName.equals("")) {
-                return ns.getTypicalPrefix() + ":" + propertyName;
-            }
-        }
-        return null;
-    }
-
-    /**
      * Creates a Namespace instance for the given class name.
      * @param mappingClassName The name of the Namespace subclass for which
      * an instance should be created.

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/Namespace.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -63,13 +63,6 @@
     public abstract String getNamespaceURI();
 
     /**
-     * Returns the typical prefix for this namespace, minus the ":".
-     * For example, the SVG namespace should return "svg".
-     * @return The typical prefix for this namespace.
-     */
-    public abstract String getTypicalPrefix();
-
-    /**
      * Parse an element in this namespace.
      * @param foTree The parent FO Tree.
      * @param localName The local name of the element.

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -65,11 +65,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "axsl";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
             final PropertyList list, final Locator locator) throws FoTreeException {
         return makeObject(localName, currentFObj, list, locator);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -414,11 +414,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "fo";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
             final PropertyList list, final Locator locator) throws FoTreeException {
         return makeObject(foTree, localName, currentFObj, list, locator);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -62,11 +62,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "foray";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
             final PropertyList list, final Locator locator) throws FoTreeException {
         return makeObject(localName, currentFObj, list);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/NamespaceMath.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/NamespaceMath.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/math/NamespaceMath.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -63,11 +63,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "m";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName,
             final FoObj currentFObj, final PropertyList list,
             final Locator locator) throws FoTreeException {

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -63,11 +63,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "svg";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
             final PropertyList list, final Locator locator) throws FoTreeException {
         return makeObject(localName, currentFObj, list);

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-12-21 14:30:31 UTC (rev 12909)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/xml/NamespaceXml.java	2022-12-21 14:49:17 UTC (rev 12910)
@@ -65,11 +65,6 @@
     }
 
     @Override
-    public String getTypicalPrefix() {
-        return "xml";
-    }
-
-    @Override
     public FoObj parseElementForNS(final FoTree4a foTree, final String localName, final FoObj currentFObj,
             final PropertyList list, final Locator locator) throws FoTreeException {
         // This isn't needed for the xml: namespace.

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





Thread: [FOray-commit] SF.net SVN: foray:[12910] trunk/foray/foray-fotree/src/main/java/org/foray /fotree (Page 3)

Modular XSL-FO Implementation for Java.

foray-commit