vmote 2003/08/24 11:52:19
Modified: src/java/org/apache/fop/fo/flow Character.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/Character.getInlineArea() to
layoutmgr/AddLMVisitor.getCharacterInlineArea()
Revision Changes Path
1.6 +0 -11 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Character.java 22 Aug 2003 06:27:34 -0000 1.5
+++ Character.java 24 Aug 2003 18:52:19 -0000 1.6
@@ -94,17 +94,6 @@
super(parent);
}
- public InlineArea getInlineArea() {
- String str = this.properties.get("character").getString();
- if (str.length() == 1) {
- org.apache.fop.area.inline.Character ch =
- new org.apache.fop.area.inline.Character(
- str.charAt(0));
- return ch;
- }
- return null;
- }
-
private void setup() throws FOPException {
// Common Aural Properties
1.4 +13 -2 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddLMVisitor.java 22 Aug 2003 17:42:41 -0000 1.3
+++ AddLMVisitor.java 24 Aug 2003 18:52:19 -0000 1.4
@@ -370,7 +370,7 @@
}
public void serveVisitor(Character node) {
- InlineArea inline = node.getInlineArea();
+ InlineArea inline = getCharacterInlineArea(node);
if (inline != null) {
LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
lm.setUserAgent(node.getUserAgent());
@@ -378,6 +378,17 @@
lm.setCurrentArea(inline);
currentLMList.add(lm);
}
+ }
+
+ public InlineArea getCharacterInlineArea(Character node) {
+ String str = node.properties.get("character").getString();
+ if (str.length() == 1) {
+ org.apache.fop.area.inline.Character ch =
+ new org.apache.fop.area.inline.Character(
+ str.charAt(0));
+ return ch;
+ }
+ return null;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
