Changes to import names.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195231 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java
index bb078181d74d7db16c173abdbe6a2dff70d565dd..65725072d54d4e761e8ba50dcbf872128aa86e78 100644 (file)
--- a/src/org/apache/fop/fo/FONode.java
+++ b/src/org/apache/fop/fo/FONode.java
@@ -5,11 +5,11 @@ import org.apache.fop.fo.FOAttributes;
 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;

diff --git a/src/org/apache/fop/fo/FOTree.java b/src/org/apache/fop/fo/FOTree.java
index 78a0512d578aa129382bb305bc72958ea5ab96da..8a2a08ad0383650fc4f2bf854f4161bb9e8a4270 100644 (file)
--- a/src/org/apache/fop/fo/FOTree.java
+++ b/src/org/apache/fop/fo/FOTree.java
@@ -3,7 +3,7 @@ package org.apache.fop.fo;
 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.configuration.Configuration;
 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;
 

diff --git a/src/org/apache/fop/fo/Properties.java b/src/org/apache/fop/fo/Properties.java
index 4309d8f61206d71a42f446e6e60a9c49d978af3e..7eb0c8e1a6b85480ebea813e50596f4594bfba2e 100644 (file)
--- a/src/org/apache/fop/fo/Properties.java
+++ b/src/org/apache/fop/fo/Properties.java
@@ -25,9 +25,9 @@ import org.apache.fop.messaging.MessageHandler;
 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.Bool;
 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 @@ public abstract class Properties {
             // 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

diff --git a/src/org/apache/fop/fo/PropertyConsts.java b/src/org/apache/fop/fo/PropertyConsts.java
index 718757aab160c50499cb877bbca2023770cfe8d7..e280c8d317d1e6c44a707084d4f71e06dc14e1de 100644 (file)
--- a/src/org/apache/fop/fo/PropertyConsts.java
+++ b/src/org/apache/fop/fo/PropertyConsts.java
@@ -31,7 +31,7 @@ import org.apache.fop.datatypes.Numeric;
 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>

diff --git a/src/org/apache/fop/fo/PropertySets.java b/src/org/apache/fop/fo/PropertySets.java
index 6e1ba6897de629c7b1aa3bc41f432a279c47af6e..340b332842b9eb3cd880516e77fa7c18d17e1237 100644 (file)
--- a/src/org/apache/fop/fo/PropertySets.java
+++ b/src/org/apache/fop/fo/PropertySets.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
 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;