pbwest 2002/10/01 18:26:53
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Made nonInheritedProps an ROBitSet.
Revision Changes Path
No revision
No revision
1.1.2.12 +19 -9 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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- PropertyConsts.java 26 Sep 2002 14:33:17 -0000 1.1.2.11
+++ PropertyConsts.java 2 Oct 2002 01:26:53 -0000 1.1.2.12
@@ -32,6 +32,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datastructs.ROIntArray;
import org.apache.fop.datastructs.ROStringArray;
+import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.datatypes.PropertyValue;
/**
@@ -166,7 +167,7 @@
} catch (IllegalAccessException iae) {
throw new PropertyException(iae.getMessage());
} catch (InvocationTargetException ite) {
- throw new PropertyException(ite.getMessage());
+ throw new PropertyException(ite);
}
}
@@ -460,14 +461,22 @@
public static final ROIntArray inherited;
/**
+ * An <tt>ROBitSet</tt> of properties which are not normally inherited.
+ * It is defined relative to the set of all properties; i.e. the
+ * non-inheritance of any property can be established by testing the
+ * bit in this set that corresponds to the queried property's index.
+ */
+ public static final ROBitSet nonInheritedProps;
+
+ /**
* A <tt>BitSet</tt> of properties which are not normally inherited.
* It is defined relative to the set of all properties; i.e. the
* non-inheritance of any property can be established by testing the
* bit in this set that corresponds to the queried property's index.
- * <p>The <tt>BitSet</tt> is private. An accessor method is defined
- * which returns a clone of this set.
+ * <p>The <tt>BitSet</tt> is private and is the basis for
+ * <i>nonInheritedProperties</i>.
*/
- private static final BitSet nonInheritedProps;
+ private static final BitSet noninheritedprops;
/** <p>
* An int[] array of the types of the <i>initialValue</i> field of each
@@ -551,7 +560,7 @@
toIndex = new HashMap(PropNames.LAST_PROPERTY_INDEX + 1);
classToIndex = new HashMap(PropNames.LAST_PROPERTY_INDEX + 1);
inherit = new int[PropNames.LAST_PROPERTY_INDEX + 1];
- nonInheritedProps = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
+ noninheritedprops = new BitSet(PropNames.LAST_PROPERTY_INDEX + 1);
initialValueTypes = new int[PropNames.LAST_PROPERTY_INDEX + 1];
traitMappings = new int[PropNames.LAST_PROPERTY_INDEX + 1];
datatypes = new int[PropNames.LAST_PROPERTY_INDEX + 1];
@@ -622,7 +631,7 @@
Class vclass = classes[i];
cname = vclass.getName();
inherit[i] = classes[i].getField("inherited").getInt(null);
- if (inherit[i] == Properties.NO) nonInheritedProps.set(i);
+ if (inherit[i] == Properties.NO) noninheritedprops.set(i);
initialValueTypes[i] =
classes[i].getField("initialValueType").getInt(null);
traitMappings[i] =
@@ -659,6 +668,7 @@
propertyClasses = Collections.unmodifiableList
(Arrays.asList(classes));
inherited = new ROIntArray(inherit);
+ nonInheritedProps = new ROBitSet(noninheritedprops);
dataTypes = new ROIntArray(datatypes);
refineParsingMethods = Collections.unmodifiableList
(Arrays.asList(refineparsingmethods));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
