pbwest 2002/09/18 08:42:13
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FOTree.java Properties.java PropertyConsts.java
PropertySets.java
Log:
Changes to import names.
Revision Changes Path
No revision
No revision
1.19.2.8 +6 -6 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -r1.19.2.7 -r1.19.2.8
--- FONode.java 18 Sep 2002 06:01:51 -0000 1.19.2.7
+++ FONode.java 18 Sep 2002 15:42:12 -0000 1.19.2.8
@@ -5,11 +5,11 @@
import org.apache.fop.fo.FObjects;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.PropertyValueList;
-import org.apache.fop.fo.expr.PropertyTriplet;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
+import org.apache.fop.datatypes.PropertyTriplet;
import org.apache.fop.datastructs.Tree;
-import org.apache.fop.datatypes.Inherit;
+import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
1.1.2.11 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FOTree.java 18 Sep 2002 06:06:24 -0000 1.1.2.10
+++ FOTree.java 18 Sep 2002 15:42:12 -0000 1.1.2.11
@@ -3,7 +3,7 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.Numeric;
-import org.apache.fop.datatypes.Inherit;
+import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
import org.apache.fop.datatypes.TextDecorations;
@@ -16,8 +16,8 @@
import org.apache.fop.fo.Properties;
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.PropertyTriplet;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyTriplet;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyParser;
1.1.2.24 +11 -10 xml-fop/src/org/apache/fop/fo/Attic/Properties.java
Index: Properties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Properties.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- Properties.java 15 Sep 2002 05:00:54 -0000 1.1.2.23
+++ Properties.java 18 Sep 2002 15:42:12 -0000 1.1.2.24
@@ -25,9 +25,9 @@
import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FObjects;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.AbstractPropertyValue;
-import org.apache.fop.fo.expr.PropertyValueList;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.AbstractPropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.expr.PropertyNotImplementedException;
import org.apache.fop.fo.expr.SystemFontFunction;
@@ -53,15 +53,15 @@
import org.apache.fop.datatypes.Literal;
import org.apache.fop.datatypes.Auto;
import org.apache.fop.datatypes.None;
-import org.apache.fop.datatypes.Inherit;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.FontFamilySet;
import org.apache.fop.datatypes.TextDecorations;
import org.apache.fop.datatypes.TextDecorator;
import org.apache.fop.datatypes.ShadowEffect;
-import org.apache.fop.datatypes.FromParent;
-import org.apache.fop.datatypes.FromNearestSpecified;
import org.apache.fop.datatypes.Slash;
+import org.apache.fop.datatypes.indirect.Inherit;
+import org.apache.fop.datatypes.indirect.FromParent;
+import org.apache.fop.datatypes.indirect.FromNearestSpecified;
/**
* Parent class for all of the individual property classes. It also contains
@@ -4385,7 +4385,8 @@
// First, check that we have a list
if (type != PropertyValue.LIST) {
if ( ! nested && type == PropertyValue.INHERIT) {
- return ((Inherit)value).resolve(foTree);
+ return value; // DUMMY
+ //return ((Inherit)value).resolve(foTree);
}
if ( ! (value instanceof StringType))
throw new PropertyException
1.1.2.8 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PropertyConsts.java 27 Aug 2002 15:33:04 -0000 1.1.2.7
+++ PropertyConsts.java 18 Sep 2002 15:42:12 -0000 1.1.2.8
@@ -31,7 +31,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datastructs.ROStringArray;
-import org.apache.fop.fo.expr.PropertyValue;
+import org.apache.fop.datatypes.PropertyValue;
/**
* <p>
1.1.2.12 +5 -5 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- PropertySets.java 30 Aug 2002 17:22:23 -0000 1.1.2.11
+++ PropertySets.java 18 Sep 2002 15:42:12 -0000 1.1.2.12
@@ -22,8 +22,8 @@
import java.util.Collections;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.expr.PropertyValue;
-import org.apache.fop.fo.expr.PropertyValueList;
+import org.apache.fop.datatypes.PropertyValue;
+import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.fo.PropNames;
import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datatypes.Ints;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
