|
From: <vic...@us...> - 2022-12-07 12:52:57
|
Revision: 12800
http://sourceforge.net/p/foray/code/12800
Author: victormote
Date: 2022-12-07 12:52:54 +0000 (Wed, 07 Dec 2022)
Log Message:
-----------
For enums of object names in each namespace, append "Id" to the name of the enum class.
Modified Paths:
--------------
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/svg/NamespaceSvg.java
Added Paths:
-----------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObjectId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObjectId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObjectId.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObjectId.java
Removed Paths:
-------------
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObject.java
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java 2022-12-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -1,85 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.axsl;
-
-import java.util.Arrays;
-
-/**
- * An enumeration for object extensions to the XSL-FO standard. These objects
- * live in the "axsl" namespace.
- */
-public enum AxslObject {
-
- /*
- * This list is maintained in the same order as OBJECT_NAME_LIST to
- * facilitate using a binary search on that array and having the index
- * correspond to the ordinal value of the enumeration.
- */
-
- /** Constant indicating a "metadata" FO. */
- METADATA; // 0
-
- /**
- * A sorted list of valid object names.
- * This list should always be maintained in sorted order, so that binary
- * searches can be used.
- */
- private static final String[] OBJECT_NAME_LIST = {
- "metadata", // 0
- };
-
- /**
- * Converts an object name enumeration to its name.
- * For example, the enumeration {@link AxslObject#METADATA}
- * converts to the name "metadata".
- * @return The name for the object enumeration.
- */
- public String toExtensionName() {
- return AxslObject.OBJECT_NAME_LIST[this.ordinal()];
- }
-
- /**
- * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
- * XSL-FO name of the object instead of its enumerated name.
- * For example, suppose an enum for "continued-label", that is named
- * CONTINUED_LABEL.
- * The Java 1.5 Enum valueOf(String) method would operate on the enum name
- * "CONTINUED_LABEL".
- * This method instead operates on "continued-label".
- * @param name The name of the XSL-FO object for which the enumerated
- * value is needed.
- * @return The enumerated value for {@code xslName}.
- */
- public static AxslObject extensionValueOf(final String name) {
- final int ordinal = Arrays.binarySearch(
- AxslObject.OBJECT_NAME_LIST, name);
- return AxslObject.values()[ordinal];
- }
-
-}
Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObjectId.java (from rev 12798, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObject.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObjectId.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/AxslObjectId.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.axsl;
+
+import java.util.Arrays;
+
+/**
+ * An enumeration for object extensions to the XSL-FO standard. These objects
+ * live in the "axsl" namespace.
+ */
+public enum AxslObjectId {
+
+ /*
+ * This list is maintained in the same order as OBJECT_NAME_LIST to
+ * facilitate using a binary search on that array and having the index
+ * correspond to the ordinal value of the enumeration.
+ */
+
+ /** Constant indicating a "metadata" FO. */
+ METADATA; // 0
+
+ /**
+ * A sorted list of valid object names.
+ * This list should always be maintained in sorted order, so that binary
+ * searches can be used.
+ */
+ private static final String[] OBJECT_NAME_LIST = {
+ "metadata", // 0
+ };
+
+ /**
+ * Converts an object name enumeration to its name.
+ * For example, the enumeration {@link AxslObjectId#METADATA}
+ * converts to the name "metadata".
+ * @return The name for the object enumeration.
+ */
+ public String toExtensionName() {
+ return AxslObjectId.OBJECT_NAME_LIST[this.ordinal()];
+ }
+
+ /**
+ * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
+ * XSL-FO name of the object instead of its enumerated name.
+ * For example, suppose an enum for "continued-label", that is named
+ * CONTINUED_LABEL.
+ * The Java 1.5 Enum valueOf(String) method would operate on the enum name
+ * "CONTINUED_LABEL".
+ * This method instead operates on "continued-label".
+ * @param name The name of the XSL-FO object for which the enumerated
+ * value is needed.
+ * @return The enumerated value for {@code xslName}.
+ */
+ public static AxslObjectId extensionValueOf(final String name) {
+ final int ordinal = Arrays.binarySearch(
+ AxslObjectId.OBJECT_NAME_LIST, name);
+ return AxslObjectId.values()[ordinal];
+ }
+
+}
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-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/NamespaceAxsl.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -118,7 +118,7 @@
*/
public FoObj makeObject(final String objectName, final FoObj parent, final PropertyList propertyList,
final Locator locator) {
- final AxslObject enumeration = AxslObject.extensionValueOf(objectName);
+ final AxslObjectId enumeration = AxslObjectId.extensionValueOf(objectName);
switch (enumeration) {
case METADATA: {
if (parent instanceof Declarations4a) {
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java 2022-12-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -1,404 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.fo;
-
-import java.util.Arrays;
-
-/**
- * An enumeration for XSL-FO objects.
- */
-public enum FoObject {
-
- /*
- * This list is maintained in the same order as OBJECT_NAME_LIST to
- * facilitate using a binary search on that array and having the index
- * correspond to the ordinal value of the enumeration.
- */
-
- /** Constant indicating a "basic-link" FO. */
- BASIC_LINK, // 0
-
- /** Constant indicating a "bidi-override" FO. */
- BIDI_OVERRIDE, // 1
-
- /** Constant indicating a "block" FO. */
- BLOCK, // 2
-
- /** Constant indicating a "block-container" FO. */
- BLOCK_CONTAINER, // 3
-
- /** Constant indicating a "bookmark" FO. */
- BOOKMARK, // 4
-
- /** Constant indicating a "bookmark-title" FO. */
- BOOKMARK_TITLE, // 5
-
- /** Constant indicating a "bookmark-tree" FO. */
- BOOKMARK_TREE, // 6
-
- /** Constant indicating a "change-bar-begin" FO. */
- CHANGE_BAR_BEGIN, // 7
-
- /** Constant indicating a "change-bar-end" FO. */
- CHANGE_BAR_END, // 8
-
- /** Constant indicating a "character" FO. */
- CHARACTER, // 9
-
- /** Constant indicating a "color-profile" FO. */
- COLOR_PROFILE, // 10
-
- /** Constant indicating a "conditional-page-master-reference" FO. */
- CONDITIONAL_PAGE_MASTER_REFERENCE, // 11
-
- /** Constant indicating a "declarations" FO. */
- DECLARATIONS, // 12
-
- /** Constant indicating an "external-graphic" FO. */
- EXTERNAL_GRAPHIC, // 13
-
- /** Constant indicating a "float" FO. */
- FLOAT, // 14
-
- /** Constant indicating a "flow" FO. */
- FLOW, // 15
-
- /** Constant indicating a "flow-assignment" FO. */
- FLOW_ASSIGNMENT, // 16
-
- /** Constant indicating a "flow-map" FO. */
- FLOW_MAP, // 17
-
- /** Constant indicating a "flow-name-specifier" FO. */
- FLOW_NAME_SPECIFIER, // 18
-
- /** Constant indicating a "flow-source-list" FO. */
- FLOW_SOURCE_LIST, // 19
-
- /** Constant indicating a "flow-target-list" FO. */
- FLOW_TARGET_LIST, // 20
-
- /** Constant indicating a "folio-prefix" FO. */
- FOLIO_PREFIX, // 21
-
- /** Constant indicating a "folio-suffix" FO. */
- FOLIO_SUFFIX, // 22
-
- /** Constant indicating a "footnote" FO. */
- FOOTNOTE, // 23
-
- /** Constant indicating a "footnote-body" FO. */
- FOOTNOTE_BODY, // 24
-
- /** Constant indicating an "index-key-reference" FO. */
- INDEX_KEY_REFERENCE, // 25
-
- /** Constant indicating an "index-page-citation-list" FO. */
- INDEX_PAGE_CITATION_LIST, // 26
-
- /** Constant indicating an "index-page-citation-list-separator" FO. */
- INDEX_PAGE_CITATION_LIST_SEPARATOR, // 27
-
- /** Constant indicating an "index-page-citation-range-separator" FO. */
- INDEX_PAGE_CITATION_RANGE_SEPARATOR, // 28
-
- /** Constant indicating an "index-page-number-prefix" FO. */
- INDEX_PAGE_NUMBER_PREFIX, // 29
-
- /** Constant indicating an "index-page-number-suffix" FO. */
- INDEX_PAGE_NUMBER_SUFFIX, // 30
-
- /** Constant indicating an "index-range-begin" FO. */
- INDEX_RANGE_BEGIN, // 31
-
- /** Constant indicating an "index-range-end" FO. */
- INDEX_RANGE_END, // 32
-
- /** Constant indicating an "initial-property-set" FO. */
- INITIAL_PROPERTY_SET, // 33
-
- /** Constant indicating an "inline" FO. */
- INLINE, // 34
-
- /** Constant indicating an "inline-container" FO. */
- INLINE_CONTAINER, // 35
-
- /** Constant indicating an "instream-foreign-object" FO. */
- INSTREAM_FOREIGN_OBJECT, // 36
-
- /** Constant indicating a "layout-master-set" FO. */
- LAYOUT_MASTER_SET, // 37
-
- /** Constant indicating a "leader" FO. */
- LEADER, // 38
-
- /** Constant indicating a "list-block" FO. */
- LIST_BLOCK, // 39
-
- /** Constant indicating a "list-item" FO. */
- LIST_ITEM, // 40
-
- /** Constant indicating a "list-item-body". */
- LIST_ITEM_BODY, // 41
-
- /** Constant indicating a "list-item-label" FO. */
- LIST_ITEM_LABEL, // 42
-
- /** Constant indicating a "marker" FO. */
- MARKER, // 43
-
- /** Constant indicating a "multi-case" FO. */
- MULTI_CASE, // 44
-
- /** Constant indicating a "multi-properties" FO. */
- MULTI_PROPERTIES, // 45
-
- /** Constant indicating a "multi-property-set" FO. */
- MULTI_PROPERTY_SET, // 46
-
- /** Constant indicating a "multi-switch" FO. */
- MULTI_SWITCH, // 47
-
- /** Constant indicating a "multi-toggle" FO. */
- MULTI_TOGGLE, // 48
-
- /** Constant indicating a "page-number" FO. */
- PAGE_NUMBER, // 49
-
- /** Constant indicating a "page-number-citation" FO. */
- PAGE_NUMBER_CITATION, // 50
-
- /** Constant indicating a "page-number-citation-last" FO. */
- PAGE_NUMBER_CITATION_LAST, // 51
-
- /** Constant indicating a "page-sequence" FO. */
- PAGE_SEQUENCE, // 52
-
- /** Constant indicating a "page-sequence-master" FO. */
- PAGE_SEQUENCE_MASTER, // 53
-
- /** Constant indicating a "page-sequence-wrapper" FO. */
- PAGE_SEQUENCE_WRAPPER, // 54
-
- /** Constant indicating a "region-after" FO. */
- REGION_AFTER, // 55
-
- /** Constant indicating a "region-before" FO. */
- REGION_BEFORE, // 56
-
- /** Constant indicating a "region-body" FO. */
- REGION_BODY, // 57
-
- /** Constant indicating a "region-end" FO. */
- REGION_END, // 58
-
- /** Constant indicating a "region-name-specifier" FO. */
- REGION_NAME_SPECIFIER, // 59
-
- /** Constant indicating a "region-start" FO. */
- REGION_START, // 60
-
- /** Constant indicating a "repeatable-page-master-alternatives" FO. */
- REPEATABLE_PAGE_MASTER_ALTERNATIVES, // 61
-
- /** Constant indicating a "repeatable-page-master-reference" FO. */
- REPEATABLE_PAGE_MASTER_REFERENCE, // 62
-
- /** Constant indicating a "retrieve-marker" FO. */
- RETRIEVE_MARKER, // 63
-
- /** Constant indicating a "retrieve-table-marker" FO. */
- RETRIEVE_TABLE_MARKER, // 64
-
- /** Constant indicating a "root" FO. */
- ROOT, // 65
-
- /** Constant indicating a "scaling-value-citation" FO. */
- SCALING_VALUE_CITATION, // 66
-
- /** Constant indicating a "simple-page-master". */
- SIMPLE_PAGE_MASTER, // 67
-
- /** Constant indicating a "single-page-master-reference" FO. */
- SINGLE_PAGE_MASTER_REFERENCE, // 68
-
- /** Constant indicating a "static-content" FO. */
- STATIC_CONTENT, // 69
-
- /** Constant indicating a "table" FO. */
- TABLE, // 70
-
- /** Constant indicating a "table-and-caption" FO. */
- TABLE_AND_CAPTION, // 71
-
- /** Constant indicating a "table-body" FO. */
- TABLE_BODY, // 72
-
- /** Constant indicating a "table-caption" FO. */
- TABLE_CAPTION, // 73
-
- /** Constant indicating a "table-cell" FO. */
- TABLE_CELL, // 74
-
- /** Constant indicating a "table-column" FO. */
- TABLE_COLUMN, // 75
-
- /** Constant indicating a "table-footer" FO. */
- TABLE_FOOTER, // 76
-
- /** Constant indicating a "table-header" FO. */
- TABLE_HEADER, // 77
-
- /** Constant indicating a "table-row" FO. */
- TABLE_ROW, // 78
-
- /** Constant indicating a "title" FO. */
- TITLE, // 79
-
- /** Constant indicating a "wrapper" FO. */
- WRAPPER; // 80
-
- /**
- * A sorted list of valid object names.
- * This list should always be maintained in sorted order, so that binary
- * searches can be used.
- */
- private static final String[] OBJECT_NAME_LIST = {
- "basic-link", // 0
- "bidi-override", // 1
- "block", // 2
- "block-container", // 3
- "bookmark", // 4
- "bookmark-title", // 5
- "bookmark-tree", // 6
- "change-bar-begin", // 7
- "change-bar-end", // 8
- "character", // 9
- "color-profile", // 10
- "conditional-page-master-reference", // 11
- "declarations", // 12
- "external-graphic", // 13
- "float", // 14
- "flow", // 15
- "flow-assignment", // 16
- "flow-map", // 17
- "flow-name-specifier", // 18
- "flow-source-list", // 19
- "flow-target-list", // 20
- "folio-prefix", // 21
- "folio-suffix", // 22
- "footnote", // 23
- "footnote-body", // 24
- "index-key-reference", // 25
- "index-page-citation-list", // 26
- "index-page-citation-list-separator", // 27
- "index-page-citation-range-separator", // 28
- "index-page-number-prefix", // 29
- "index-page-number-suffix", // 30
- "index-range-begin", // 31
- "index-range-end", // 32
- "initial-property-set", // 33
- "inline", // 34
- "inline-container", // 35
- "instream-foreign-object", // 36
- "layout-master-set", // 37
- "leader", // 38
- "list-block", // 39
- "list-item", // 40
- "list-item-body", // 41
- "list-item-label", // 42
- "marker", // 43
- "multi-case", // 44
- "multi-properties", // 45
- "multi-property-set", // 46
- "multi-switch", // 47
- "multi-toggle", // 48
- "page-number", // 49
- "page-number-citation", // 50
- "page-number-citation-last", // 51
- "page-sequence", // 52
- "page-sequence-master", // 53
- "page-sequence-wrapper", // 54
- "region-after", // 55
- "region-before", // 56
- "region-body", // 57
- "region-end", // 58
- "region-name-specifier", // 59
- "region-start", // 60
- "repeatable-page-master-alternatives", // 61
- "repeatable-page-master-reference", // 62
- "retrieve-marker", // 63
- "retrieve-table-marker", // 64
- "root", // 65
- "scaling-value-citation", // 66
- "simple-page-master", // 67
- "single-page-master-reference", // 68
- "static-content", // 69
- "table", // 70
- "table-and-caption", // 71
- "table-body", // 72
- "table-caption", // 73
- "table-cell", // 74
- "table-column", // 75
- "table-footer", // 76
- "table-header", // 77
- "table-row", // 78
- "title", // 79
- "wrapper", // 80
- };
-
- /**
- * Converts an object name enumeration to its XSL-FO name.
- * For example, the enumeration {@link FoObject#TABLE_ROW} converts to the
- * XSL-FO name "table-row".
- * @return The XSL-FO name for the object enumeration.
- */
- public String toXslFo() {
- return FoObject.OBJECT_NAME_LIST[this.ordinal()];
- }
-
- /**
- * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
- * XSL-FO name of the object instead of its enumerated name.
- * For example, for the XSL-FO object "table-row", the enum is
- * {@link FoObject#TABLE_ROW}.
- * The Java 1.5 Enum valueOf(String) method would operate on the enum name
- * "TABLE_ROW".
- * This method instead operates on "table-row".
- * @param xslName The name of the XSL-FO object for which the enumerated
- * value is needed.
- * @return The enumerated value for {@code xslName}.
- */
- public static FoObject xslValueOf(final String xslName) {
- final int ordinal = Arrays.binarySearch(FoObject.OBJECT_NAME_LIST,
- xslName);
- return FoObject.values()[ordinal];
- }
-
-}
Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObjectId.java (from rev 12798, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObject.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObjectId.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/FoObjectId.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.fo;
+
+import java.util.Arrays;
+
+/**
+ * An enumeration for XSL-FO objects.
+ */
+public enum FoObjectId {
+
+ /*
+ * This list is maintained in the same order as OBJECT_NAME_LIST to
+ * facilitate using a binary search on that array and having the index
+ * correspond to the ordinal value of the enumeration.
+ */
+
+ /** Constant indicating a "basic-link" FO. */
+ BASIC_LINK, // 0
+
+ /** Constant indicating a "bidi-override" FO. */
+ BIDI_OVERRIDE, // 1
+
+ /** Constant indicating a "block" FO. */
+ BLOCK, // 2
+
+ /** Constant indicating a "block-container" FO. */
+ BLOCK_CONTAINER, // 3
+
+ /** Constant indicating a "bookmark" FO. */
+ BOOKMARK, // 4
+
+ /** Constant indicating a "bookmark-title" FO. */
+ BOOKMARK_TITLE, // 5
+
+ /** Constant indicating a "bookmark-tree" FO. */
+ BOOKMARK_TREE, // 6
+
+ /** Constant indicating a "change-bar-begin" FO. */
+ CHANGE_BAR_BEGIN, // 7
+
+ /** Constant indicating a "change-bar-end" FO. */
+ CHANGE_BAR_END, // 8
+
+ /** Constant indicating a "character" FO. */
+ CHARACTER, // 9
+
+ /** Constant indicating a "color-profile" FO. */
+ COLOR_PROFILE, // 10
+
+ /** Constant indicating a "conditional-page-master-reference" FO. */
+ CONDITIONAL_PAGE_MASTER_REFERENCE, // 11
+
+ /** Constant indicating a "declarations" FO. */
+ DECLARATIONS, // 12
+
+ /** Constant indicating an "external-graphic" FO. */
+ EXTERNAL_GRAPHIC, // 13
+
+ /** Constant indicating a "float" FO. */
+ FLOAT, // 14
+
+ /** Constant indicating a "flow" FO. */
+ FLOW, // 15
+
+ /** Constant indicating a "flow-assignment" FO. */
+ FLOW_ASSIGNMENT, // 16
+
+ /** Constant indicating a "flow-map" FO. */
+ FLOW_MAP, // 17
+
+ /** Constant indicating a "flow-name-specifier" FO. */
+ FLOW_NAME_SPECIFIER, // 18
+
+ /** Constant indicating a "flow-source-list" FO. */
+ FLOW_SOURCE_LIST, // 19
+
+ /** Constant indicating a "flow-target-list" FO. */
+ FLOW_TARGET_LIST, // 20
+
+ /** Constant indicating a "folio-prefix" FO. */
+ FOLIO_PREFIX, // 21
+
+ /** Constant indicating a "folio-suffix" FO. */
+ FOLIO_SUFFIX, // 22
+
+ /** Constant indicating a "footnote" FO. */
+ FOOTNOTE, // 23
+
+ /** Constant indicating a "footnote-body" FO. */
+ FOOTNOTE_BODY, // 24
+
+ /** Constant indicating an "index-key-reference" FO. */
+ INDEX_KEY_REFERENCE, // 25
+
+ /** Constant indicating an "index-page-citation-list" FO. */
+ INDEX_PAGE_CITATION_LIST, // 26
+
+ /** Constant indicating an "index-page-citation-list-separator" FO. */
+ INDEX_PAGE_CITATION_LIST_SEPARATOR, // 27
+
+ /** Constant indicating an "index-page-citation-range-separator" FO. */
+ INDEX_PAGE_CITATION_RANGE_SEPARATOR, // 28
+
+ /** Constant indicating an "index-page-number-prefix" FO. */
+ INDEX_PAGE_NUMBER_PREFIX, // 29
+
+ /** Constant indicating an "index-page-number-suffix" FO. */
+ INDEX_PAGE_NUMBER_SUFFIX, // 30
+
+ /** Constant indicating an "index-range-begin" FO. */
+ INDEX_RANGE_BEGIN, // 31
+
+ /** Constant indicating an "index-range-end" FO. */
+ INDEX_RANGE_END, // 32
+
+ /** Constant indicating an "initial-property-set" FO. */
+ INITIAL_PROPERTY_SET, // 33
+
+ /** Constant indicating an "inline" FO. */
+ INLINE, // 34
+
+ /** Constant indicating an "inline-container" FO. */
+ INLINE_CONTAINER, // 35
+
+ /** Constant indicating an "instream-foreign-object" FO. */
+ INSTREAM_FOREIGN_OBJECT, // 36
+
+ /** Constant indicating a "layout-master-set" FO. */
+ LAYOUT_MASTER_SET, // 37
+
+ /** Constant indicating a "leader" FO. */
+ LEADER, // 38
+
+ /** Constant indicating a "list-block" FO. */
+ LIST_BLOCK, // 39
+
+ /** Constant indicating a "list-item" FO. */
+ LIST_ITEM, // 40
+
+ /** Constant indicating a "list-item-body". */
+ LIST_ITEM_BODY, // 41
+
+ /** Constant indicating a "list-item-label" FO. */
+ LIST_ITEM_LABEL, // 42
+
+ /** Constant indicating a "marker" FO. */
+ MARKER, // 43
+
+ /** Constant indicating a "multi-case" FO. */
+ MULTI_CASE, // 44
+
+ /** Constant indicating a "multi-properties" FO. */
+ MULTI_PROPERTIES, // 45
+
+ /** Constant indicating a "multi-property-set" FO. */
+ MULTI_PROPERTY_SET, // 46
+
+ /** Constant indicating a "multi-switch" FO. */
+ MULTI_SWITCH, // 47
+
+ /** Constant indicating a "multi-toggle" FO. */
+ MULTI_TOGGLE, // 48
+
+ /** Constant indicating a "page-number" FO. */
+ PAGE_NUMBER, // 49
+
+ /** Constant indicating a "page-number-citation" FO. */
+ PAGE_NUMBER_CITATION, // 50
+
+ /** Constant indicating a "page-number-citation-last" FO. */
+ PAGE_NUMBER_CITATION_LAST, // 51
+
+ /** Constant indicating a "page-sequence" FO. */
+ PAGE_SEQUENCE, // 52
+
+ /** Constant indicating a "page-sequence-master" FO. */
+ PAGE_SEQUENCE_MASTER, // 53
+
+ /** Constant indicating a "page-sequence-wrapper" FO. */
+ PAGE_SEQUENCE_WRAPPER, // 54
+
+ /** Constant indicating a "region-after" FO. */
+ REGION_AFTER, // 55
+
+ /** Constant indicating a "region-before" FO. */
+ REGION_BEFORE, // 56
+
+ /** Constant indicating a "region-body" FO. */
+ REGION_BODY, // 57
+
+ /** Constant indicating a "region-end" FO. */
+ REGION_END, // 58
+
+ /** Constant indicating a "region-name-specifier" FO. */
+ REGION_NAME_SPECIFIER, // 59
+
+ /** Constant indicating a "region-start" FO. */
+ REGION_START, // 60
+
+ /** Constant indicating a "repeatable-page-master-alternatives" FO. */
+ REPEATABLE_PAGE_MASTER_ALTERNATIVES, // 61
+
+ /** Constant indicating a "repeatable-page-master-reference" FO. */
+ REPEATABLE_PAGE_MASTER_REFERENCE, // 62
+
+ /** Constant indicating a "retrieve-marker" FO. */
+ RETRIEVE_MARKER, // 63
+
+ /** Constant indicating a "retrieve-table-marker" FO. */
+ RETRIEVE_TABLE_MARKER, // 64
+
+ /** Constant indicating a "root" FO. */
+ ROOT, // 65
+
+ /** Constant indicating a "scaling-value-citation" FO. */
+ SCALING_VALUE_CITATION, // 66
+
+ /** Constant indicating a "simple-page-master". */
+ SIMPLE_PAGE_MASTER, // 67
+
+ /** Constant indicating a "single-page-master-reference" FO. */
+ SINGLE_PAGE_MASTER_REFERENCE, // 68
+
+ /** Constant indicating a "static-content" FO. */
+ STATIC_CONTENT, // 69
+
+ /** Constant indicating a "table" FO. */
+ TABLE, // 70
+
+ /** Constant indicating a "table-and-caption" FO. */
+ TABLE_AND_CAPTION, // 71
+
+ /** Constant indicating a "table-body" FO. */
+ TABLE_BODY, // 72
+
+ /** Constant indicating a "table-caption" FO. */
+ TABLE_CAPTION, // 73
+
+ /** Constant indicating a "table-cell" FO. */
+ TABLE_CELL, // 74
+
+ /** Constant indicating a "table-column" FO. */
+ TABLE_COLUMN, // 75
+
+ /** Constant indicating a "table-footer" FO. */
+ TABLE_FOOTER, // 76
+
+ /** Constant indicating a "table-header" FO. */
+ TABLE_HEADER, // 77
+
+ /** Constant indicating a "table-row" FO. */
+ TABLE_ROW, // 78
+
+ /** Constant indicating a "title" FO. */
+ TITLE, // 79
+
+ /** Constant indicating a "wrapper" FO. */
+ WRAPPER; // 80
+
+ /**
+ * A sorted list of valid object names.
+ * This list should always be maintained in sorted order, so that binary
+ * searches can be used.
+ */
+ private static final String[] OBJECT_NAME_LIST = {
+ "basic-link", // 0
+ "bidi-override", // 1
+ "block", // 2
+ "block-container", // 3
+ "bookmark", // 4
+ "bookmark-title", // 5
+ "bookmark-tree", // 6
+ "change-bar-begin", // 7
+ "change-bar-end", // 8
+ "character", // 9
+ "color-profile", // 10
+ "conditional-page-master-reference", // 11
+ "declarations", // 12
+ "external-graphic", // 13
+ "float", // 14
+ "flow", // 15
+ "flow-assignment", // 16
+ "flow-map", // 17
+ "flow-name-specifier", // 18
+ "flow-source-list", // 19
+ "flow-target-list", // 20
+ "folio-prefix", // 21
+ "folio-suffix", // 22
+ "footnote", // 23
+ "footnote-body", // 24
+ "index-key-reference", // 25
+ "index-page-citation-list", // 26
+ "index-page-citation-list-separator", // 27
+ "index-page-citation-range-separator", // 28
+ "index-page-number-prefix", // 29
+ "index-page-number-suffix", // 30
+ "index-range-begin", // 31
+ "index-range-end", // 32
+ "initial-property-set", // 33
+ "inline", // 34
+ "inline-container", // 35
+ "instream-foreign-object", // 36
+ "layout-master-set", // 37
+ "leader", // 38
+ "list-block", // 39
+ "list-item", // 40
+ "list-item-body", // 41
+ "list-item-label", // 42
+ "marker", // 43
+ "multi-case", // 44
+ "multi-properties", // 45
+ "multi-property-set", // 46
+ "multi-switch", // 47
+ "multi-toggle", // 48
+ "page-number", // 49
+ "page-number-citation", // 50
+ "page-number-citation-last", // 51
+ "page-sequence", // 52
+ "page-sequence-master", // 53
+ "page-sequence-wrapper", // 54
+ "region-after", // 55
+ "region-before", // 56
+ "region-body", // 57
+ "region-end", // 58
+ "region-name-specifier", // 59
+ "region-start", // 60
+ "repeatable-page-master-alternatives", // 61
+ "repeatable-page-master-reference", // 62
+ "retrieve-marker", // 63
+ "retrieve-table-marker", // 64
+ "root", // 65
+ "scaling-value-citation", // 66
+ "simple-page-master", // 67
+ "single-page-master-reference", // 68
+ "static-content", // 69
+ "table", // 70
+ "table-and-caption", // 71
+ "table-body", // 72
+ "table-caption", // 73
+ "table-cell", // 74
+ "table-column", // 75
+ "table-footer", // 76
+ "table-header", // 77
+ "table-row", // 78
+ "title", // 79
+ "wrapper", // 80
+ };
+
+ /**
+ * Converts an object name enumeration to its XSL-FO name.
+ * For example, the enumeration {@link FoObjectId#TABLE_ROW} converts to the
+ * XSL-FO name "table-row".
+ * @return The XSL-FO name for the object enumeration.
+ */
+ public String toXslFo() {
+ return FoObjectId.OBJECT_NAME_LIST[this.ordinal()];
+ }
+
+ /**
+ * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
+ * XSL-FO name of the object instead of its enumerated name.
+ * For example, for the XSL-FO object "table-row", the enum is
+ * {@link FoObjectId#TABLE_ROW}.
+ * The Java 1.5 Enum valueOf(String) method would operate on the enum name
+ * "TABLE_ROW".
+ * This method instead operates on "table-row".
+ * @param xslName The name of the XSL-FO object for which the enumerated
+ * value is needed.
+ * @return The enumerated value for {@code xslName}.
+ */
+ public static FoObjectId xslValueOf(final String xslName) {
+ final int ordinal = Arrays.binarySearch(FoObjectId.OBJECT_NAME_LIST,
+ xslName);
+ return FoObjectId.values()[ordinal];
+ }
+
+}
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-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/NamespaceFo.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -488,8 +488,8 @@
public FoObj makeObject(final FoTree4a foTree, final String objectName, final FoObj parent,
final PropertyList propertyList, final Locator locator)
throws FoTreeException {
- final FoObject enumeration = FoObject.xslValueOf(objectName);
- if (enumeration != FoObject.ROOT
+ final FoObjectId enumeration = FoObjectId.xslValueOf(objectName);
+ if (enumeration != FoObjectId.ROOT
&& parent == null) {
throw new NullPointerException("Parent object cannot be null");
}
@@ -799,7 +799,7 @@
* @return The parent object cast as a {@link Table4a}.
* @throws FoTreeException If parent cannot be converted to a {@link Table4a}.
*/
- private Table4a parentTable(final FoObject newObject,
+ private Table4a parentTable(final FoObjectId newObject,
final FoObj parent, final Locator locator) throws FoTreeException {
if (parent instanceof Table4a) {
return (Table4a) parent;
@@ -820,7 +820,7 @@
* @throws FoTreeException If parent cannot be converted to a
* {@link PageSequence4a}.
*/
- private PageSequence4a parentPageSequence(final FoObject newObject,
+ private PageSequence4a parentPageSequence(final FoObjectId newObject,
final FoObj parent, final Locator locator) throws FoTreeException {
if (parent instanceof PageSequence4a) {
return (PageSequence4a) parent;
@@ -841,7 +841,7 @@
* @throws FoTreeException If parent cannot be converted to a
* {@link Root4a}.
*/
- private Root4a parentRoot(final FoObject newObject,
+ private Root4a parentRoot(final FoObjectId newObject,
final FoObj parent, final Locator locator) throws FoTreeException {
if (parent instanceof Root4a) {
return (Root4a) parent;
@@ -863,7 +863,7 @@
* {@link SimplePageMaster4a}.
*/
private SimplePageMaster4a parentSimplePageMaster(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof SimplePageMaster4a) {
return (SimplePageMaster4a) parent;
@@ -885,7 +885,7 @@
* {@link LayoutMasterSet4a}.
*/
private LayoutMasterSet4a parentLayoutMasterSet(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof LayoutMasterSet4a) {
return (LayoutMasterSet4a) parent;
@@ -907,7 +907,7 @@
* {@link FlowMap4a}.
*/
private FlowMap4a parentFlowMap(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof FlowMap4a) {
return (FlowMap4a) parent;
@@ -929,7 +929,7 @@
* {@link FlowTargetList4a}.
*/
private FlowAssignment4a parentFlowAssignment(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof FlowAssignment4a) {
return (FlowAssignment4a) parent;
@@ -951,7 +951,7 @@
* {@link FlowTargetList4a}.
*/
private FlowTargetList4a parentFlowTargetList(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof FlowTargetList4a) {
return (FlowTargetList4a) parent;
@@ -973,7 +973,7 @@
* {@link FlowSourceList4a}.
*/
private FlowSourceList4a parentFlowSourceList(
- final FoObject newObject, final FoObj parent, final Locator locator)
+ final FoObjectId newObject, final FoObj parent, final Locator locator)
throws FoTreeException {
if (parent instanceof FlowSourceList4a) {
return (FlowSourceList4a) parent;
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java 2022-12-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -1,86 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.foray;
-
-import java.util.Arrays;
-
-/**
- * An enumeration for object extensions to the XSL-FO standard. These objects
- * live in the "foray" namespace.
- */
-public enum ForayObject {
-
- /*
- * This list is maintained in the same order as OBJECT_NAME_LIST to
- * facilitate using a binary search on that array and having the index
- * correspond to the ordinal value of the enumeration.
- */
-
- /** A bogus placeholder, as there are currently no valid objects in the
- * foray namespace. */
- ZZZZ_BOGUS; // 0
-
- /**
- * A sorted list of valid object names.
- * This list should always be maintained in sorted order, so that binary
- * searches can be used.
- */
- private static final String[] OBJECT_NAME_LIST = {
- "zzzz-bogus", // 0
- };
-
- /**
- * Converts an object name enumeration to its name.
- * For example, the enumeration {@link ForayObject#ZZZZ_BOGUS}
- * converts to the name "zzzz-bogus".
- * @return The name for the object enumeration.
- */
- public String toExtensionName() {
- return ForayObject.OBJECT_NAME_LIST[this.ordinal()];
- }
-
- /**
- * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
- * XSL-FO name of the object instead of its enumerated name.
- * For example, suppose an enum for "continued-label", that is named
- * CONTINUED_LABEL.
- * The Java 1.5 Enum valueOf(String) method would operate on the enum name
- * "CONTINUED_LABEL".
- * This method instead operates on "continued-label".
- * @param name The name of the XSL-FO object for which the enumerated
- * value is needed.
- * @return The enumerated value for {@code xslName}.
- */
- public static ForayObject extensionValueOf(final String name) {
- final int ordinal = Arrays.binarySearch(
- ForayObject.OBJECT_NAME_LIST, name);
- return ForayObject.values()[ordinal];
- }
-
-}
Copied: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObjectId.java (from rev 12798, trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObject.java)
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObjectId.java (rev 0)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/ForayObjectId.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed 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.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.fotree.foray;
+
+import java.util.Arrays;
+
+/**
+ * An enumeration for object extensions to the XSL-FO standard. These objects
+ * live in the "foray" namespace.
+ */
+public enum ForayObjectId {
+
+ /*
+ * This list is maintained in the same order as OBJECT_NAME_LIST to
+ * facilitate using a binary search on that array and having the index
+ * correspond to the ordinal value of the enumeration.
+ */
+
+ /** A bogus placeholder, as there are currently no valid objects in the
+ * foray namespace. */
+ ZZZZ_BOGUS; // 0
+
+ /**
+ * A sorted list of valid object names.
+ * This list should always be maintained in sorted order, so that binary
+ * searches can be used.
+ */
+ private static final String[] OBJECT_NAME_LIST = {
+ "zzzz-bogus", // 0
+ };
+
+ /**
+ * Converts an object name enumeration to its name.
+ * For example, the enumeration {@link ForayObjectId#ZZZZ_BOGUS}
+ * converts to the name "zzzz-bogus".
+ * @return The name for the object enumeration.
+ */
+ public String toExtensionName() {
+ return ForayObjectId.OBJECT_NAME_LIST[this.ordinal()];
+ }
+
+ /**
+ * Similar to the Java 1.5 Enum valueOf(String) method, but operates on the
+ * XSL-FO name of the object instead of its enumerated name.
+ * For example, suppose an enum for "continued-label", that is named
+ * CONTINUED_LABEL.
+ * The Java 1.5 Enum valueOf(String) method would operate on the enum name
+ * "CONTINUED_LABEL".
+ * This method instead operates on "continued-label".
+ * @param name The name of the XSL-FO object for which the enumerated
+ * value is needed.
+ * @return The enumerated value for {@code xslName}.
+ */
+ public static ForayObjectId extensionValueOf(final String name) {
+ final int ordinal = Arrays.binarySearch(
+ ForayObjectId.OBJECT_NAME_LIST, name);
+ return ForayObjectId.values()[ordinal];
+ }
+
+}
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-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/foray/NamespaceForay.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -124,7 +124,7 @@
*/
public FoObj makeObject(final String objectName, final FoObj parent,
final PropertyList propertyList) {
- final ForayObject enumeration = ForayObject.extensionValueOf(
+ final ForayObjectId enumeration = ForayObjectId.extensionValueOf(
objectName);
switch (enumeration) {
default: {
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-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/NamespaceSvg.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -125,7 +125,7 @@
*/
public FoObj makeObject(final String objectName, final FoObj parent,
final PropertyList propertyList) throws FoTreeException {
- final SvgObject enumeration = SvgObject.svgValueOf(objectName);
+ final SvgObjectId enumeration = SvgObjectId.svgValueOf(objectName);
if (enumeration == null) {
return null;
}
Deleted: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObject.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObject.java 2022-12-07 12:44:25 UTC (rev 12799)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/svg/SvgObject.java 2022-12-07 12:52:54 UTC (rev 12800)
@@ -1,281 +0,0 @@
-/*
- * Copyright 2007 The FOray Project.
- * http://www.foray.org
- *
- * Licensed 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.fotree.svg;
-
-import java.util.Arrays;
-
-/**
- * An enumeration for SVG objects.
- */
-public enum SvgObject {
-
- /*
- * This list is maintained in the same order as OBJECT_NAME_LIST to
- * facilitate using a binary search on that array and having the index
- * correspond to the ordinal value of the enumeration.
- */
-
- /** Constant indicating SVG element "a". */
- A, // 0
-
- /** Constant indicating SVG element "altGlyph". */
- ALTGLYPH, // 1
-
- /** Constant indicating SVG element "animate". */
- ANIMATE, // 2
-
- /** Constant indicating SVG element "animateColor". */
- ANIMATECOLOR, // 3
-
- /** Constant indicating SVG element "animateMotion". */
- ANIMATEMOTION, // 4
-
- /** Constant indicating SVG element "animateTransform". */
- ANIMATETRANSFORM, // 5
-
- /** Constant indicating SVG element "circle". */
- CIRCLE, ...
[truncated message content] |
