[FOray-commit] SF.net SVN: foray: [8538] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [8538] trunk/foray
|
From: <vic...@us...> - 2007-01-28 20:14:08
|
Revision: 8538
http://svn.sourceforge.net/foray/?rev=8538&view=rev
Author: victormote
Date: 2007-01-28 12:14:08 -0800 (Sun, 28 Jan 2007)
Log Message:
-----------
Conform to new aXSL enumeration of XSL-FO Objects.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2007-01-27 22:12:13 UTC (rev 8537)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2007-01-28 20:14:08 UTC (rev 8538)
@@ -90,7 +90,7 @@
import org.foray.fotree.fo.obj.Title;
import org.foray.fotree.fo.obj.Wrapper;
-import org.axsl.common.Constants;
+import org.axsl.common.FoObject;
import org.xml.sax.Locator;
@@ -114,7 +114,7 @@
* @return The enumerated value of the object name.
*/
public static byte enumerateObjectName(final String objectName) {
- return (byte) Arrays.binarySearch(Constants.OBJECT_NAME_LIST,
+ return (byte) Arrays.binarySearch(FoObject.OBJECT_NAME_LIST,
objectName);
}
@@ -130,218 +130,218 @@
column = locator.getColumnNumber();
}
switch (enumeration) {
- case Constants.FO_BASIC_LINK: {
+ case FoObject.BASIC_LINK: {
return new BasicLink(parent, propertyList, systemId, line, column);
}
- case Constants.FO_BIDI_OVERRIDE: {
+ case FoObject.BIDI_OVERRIDE: {
return new BidiOverride(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_BLOCK: {
+ case FoObject.BLOCK: {
return new Block(parent, propertyList, systemId, line, column);
}
- case Constants.FO_BLOCK_CONTAINER: {
+ case FoObject.BLOCK_CONTAINER: {
return new BlockContainer(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_BOOKMARK: {
+ case FoObject.BOOKMARK: {
return new Bookmark(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_BOOKMARK_TITLE: {
+ case FoObject.BOOKMARK_TITLE: {
return new BookmarkTitle(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_BOOKMARK_TREE: {
+ case FoObject.BOOKMARK_TREE: {
return new BookmarkTree(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_CHARACTER: {
+ case FoObject.CHARACTER: {
return new Character(parent, propertyList, systemId, line, column);
}
- case Constants.FO_COLOR_PROFILE: {
+ case FoObject.COLOR_PROFILE: {
return new ColorProfile(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_CONDITIONAL_PAGE_MASTER_REFERENCE: {
+ case FoObject.CONDITIONAL_PAGE_MASTER_REFERENCE: {
return new ConditionalPageMasterReference(parent, propertyList,
systemId, line, column);
}
- case Constants.FO_DECLARATIONS: {
+ case FoObject.DECLARATIONS: {
return new Declarations(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_EXTERNAL_GRAPHIC: {
+ case FoObject.EXTERNAL_GRAPHIC: {
return new ExternalGraphic(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_FLOAT: {
+ case FoObject.FLOAT: {
return new Float(parent, propertyList, systemId, line, column);
}
- case Constants.FO_FLOW: {
+ case FoObject.FLOW: {
return new Flow(parent, propertyList, systemId, line, column);
}
- case Constants.FO_FOOTNOTE: {
+ case FoObject.FOOTNOTE: {
return new Footnote(parent, propertyList, systemId, line, column);
}
- case Constants.FO_FOOTNOTE_BODY: {
+ case FoObject.FOOTNOTE_BODY: {
return new FootnoteBody(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_INITIAL_PROPERTY_SET: {
+ case FoObject.INITIAL_PROPERTY_SET: {
return new InitialPropertySet(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_INLINE: {
+ case FoObject.INLINE: {
return new Inline(parent, propertyList, systemId, line, column);
}
- case Constants.FO_INLINE_CONTAINER: {
+ case FoObject.INLINE_CONTAINER: {
return new InlineContainer(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_INSTREAM_FOREIGN_OBJECT: {
+ case FoObject.INSTREAM_FOREIGN_OBJECT: {
return new InstreamForeignObject(parent, propertyList, systemId,
line, column);
}
- case Constants.FO_LAYOUT_MASTER_SET: {
+ case FoObject.LAYOUT_MASTER_SET: {
return new LayoutMasterSet(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_LEADER: {
+ case FoObject.LEADER: {
return new Leader(parent, propertyList, systemId, line, column);
}
- case Constants.FO_LIST_BLOCK: {
+ case FoObject.LIST_BLOCK: {
return new ListBlock(parent, propertyList, systemId, line, column);
}
- case Constants.FO_LIST_ITEM: {
+ case FoObject.LIST_ITEM: {
return new ListItem(parent, propertyList, systemId, line, column);
}
- case Constants.FO_LIST_ITEM_BODY: {
+ case FoObject.LIST_ITEM_BODY: {
return new ListItemBody(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_LIST_ITEM_LABEL: {
+ case FoObject.LIST_ITEM_LABEL: {
return new ListItemLabel(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_MARKER: {
+ case FoObject.MARKER: {
return new Marker(parent, propertyList, systemId, line, column);
}
- case Constants.FO_MULTI_CASE: {
+ case FoObject.MULTI_CASE: {
return new MultiCase(parent, propertyList, systemId, line, column);
}
- case Constants.FO_MULTI_PROPERTIES: {
+ case FoObject.MULTI_PROPERTIES: {
return new MultiProperties(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_MULTI_PROPERTY_SET: {
+ case FoObject.MULTI_PROPERTY_SET: {
return new MultiPropertySet(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_MULTI_SWITCH: {
+ case FoObject.MULTI_SWITCH: {
return new MultiSwitch(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_MULTI_TOGGLE: {
+ case FoObject.MULTI_TOGGLE: {
return new MultiToggle(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_PAGE_NUMBER: {
+ case FoObject.PAGE_NUMBER: {
return new PageNumber(parent, propertyList, systemId, line, column);
}
- case Constants.FO_PAGE_NUMBER_CITATION: {
+ case FoObject.PAGE_NUMBER_CITATION: {
return new PageNumberCitation(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_PAGE_SEQUENCE: {
+ case FoObject.PAGE_SEQUENCE: {
return new PageSequence(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_PAGE_SEQUENCE_MASTER: {
+ case FoObject.PAGE_SEQUENCE_MASTER: {
return new PageSequenceMaster(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_REGION_AFTER: {
+ case FoObject.REGION_AFTER: {
return new RegionAfter(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_REGION_BEFORE: {
+ case FoObject.REGION_BEFORE: {
return new RegionBefore(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_REGION_BODY: {
+ case FoObject.REGION_BODY: {
return new RegionBody(parent, propertyList, systemId, line, column);
}
- case Constants.FO_REGION_END: {
+ case FoObject.REGION_END: {
return new RegionEnd(parent, propertyList, systemId, line, column);
}
- case Constants.FO_REGION_START: {
+ case FoObject.REGION_START: {
return new RegionStart(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES: {
+ case FoObject.REPEATABLE_PAGE_MASTER_ALTERNATIVES: {
return new RepeatablePMAlternatives(parent, propertyList,
systemId, line, column);
}
- case Constants.FO_REPEATABLE_PAGE_MASTER_REFERENCE: {
+ case FoObject.REPEATABLE_PAGE_MASTER_REFERENCE: {
return new RepeatablePMReference(parent, propertyList,
systemId, line, column);
}
- case Constants.FO_RETRIEVE_MARKER: {
+ case FoObject.RETRIEVE_MARKER: {
return new RetrieveMarker(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_ROOT: {
+ case FoObject.ROOT: {
return new Root(parent, propertyList, systemId, line, column);
}
- case Constants.FO_SIMPLE_PAGE_MASTER: {
+ case FoObject.SIMPLE_PAGE_MASTER: {
return new SimplePageMaster(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_SINGLE_PAGE_MASTER_REFERENCE: {
+ case FoObject.SINGLE_PAGE_MASTER_REFERENCE: {
return new SinglePageMasterReference(parent, propertyList, systemId,
line, column);
}
- case Constants.FO_STATIC_CONTENT: {
+ case FoObject.STATIC_CONTENT: {
return new StaticContent(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE: {
+ case FoObject.TABLE: {
return new Table(parent, propertyList, systemId, line, column);
}
- case Constants.FO_TABLE_AND_CAPTION: {
+ case FoObject.TABLE_AND_CAPTION: {
return new TableAndCaption(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE_BODY: {
+ case FoObject.TABLE_BODY: {
return new TableBody(parent, propertyList, systemId, line, column);
}
- case Constants.FO_TABLE_CAPTION: {
+ case FoObject.TABLE_CAPTION: {
return new TableCaption(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE_CELL: {
+ case FoObject.TABLE_CELL: {
return new TableCell(parent, propertyList, systemId, line, column);
}
- case Constants.FO_TABLE_COLUMN: {
+ case FoObject.TABLE_COLUMN: {
return new TableColumn(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE_FOOTER: {
+ case FoObject.TABLE_FOOTER: {
return new TableFooter(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE_HEADER: {
+ case FoObject.TABLE_HEADER: {
return new TableHeader(parent, propertyList, systemId, line,
column);
}
- case Constants.FO_TABLE_ROW: {
+ case FoObject.TABLE_ROW: {
return new TableRow(parent, propertyList, systemId, line, column);
}
- case Constants.FO_TITLE: {
+ case FoObject.TITLE: {
return new Title(parent, propertyList, systemId, line, column);
}
- case Constants.FO_WRAPPER: {
+ case FoObject.WRAPPER: {
return new Wrapper(parent, propertyList, systemId, line, column);
}
default: {
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-01-27 22:12:13 UTC (rev 8537)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2007-01-28 20:14:08 UTC (rev 8538)
@@ -39,6 +39,7 @@
import org.axsl.areaW.RegionArea;
import org.axsl.areaW.RegionRABody;
import org.axsl.common.Constants;
+import org.axsl.common.FoObject;
import org.axsl.foR.FONode;
import org.axsl.foR.FONodeProxy;
import org.axsl.foR.FOText;
@@ -511,18 +512,18 @@
public static final byte[] listUnsupportedObjectsFO() {
return new byte[] {
- Constants.FO_BIDI_OVERRIDE,
- Constants.FO_FLOAT,
- Constants.FO_INITIAL_PROPERTY_SET,
- Constants.FO_INLINE_CONTAINER,
- Constants.FO_MULTI_PROPERTIES,
- Constants.FO_MULTI_CASE,
- Constants.FO_MULTI_PROPERTY_SET,
- Constants.FO_MULTI_SWITCH,
- Constants.FO_MULTI_TOGGLE,
- Constants.FO_TABLE_AND_CAPTION,
- Constants.FO_TABLE_CAPTION,
- Constants.FO_TITLE,
+ FoObject.BIDI_OVERRIDE,
+ FoObject.FLOAT,
+ FoObject.INITIAL_PROPERTY_SET,
+ FoObject.INLINE_CONTAINER,
+ FoObject.MULTI_PROPERTIES,
+ FoObject.MULTI_CASE,
+ FoObject.MULTI_PROPERTY_SET,
+ FoObject.MULTI_SWITCH,
+ FoObject.MULTI_TOGGLE,
+ FoObject.TABLE_AND_CAPTION,
+ FoObject.TABLE_CAPTION,
+ FoObject.TITLE,
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
