pbwest 2002/10/08 21:52:21 Modified: src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design PropertyValueList.java Log: Removed stackedBy references. Modified toString(). Revision Changes Path No revision No revision 1.1.2.4 +17 -24 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java Index: PropertyValueList.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- PropertyValueList.java 2 Oct 2002 07:00:08 -0000 1.1.2.3 +++ PropertyValueList.java 9 Oct 2002 04:52:21 -0000 1.1.2.4 @@ -1,5 +1,7 @@ package org.apache.fop.datatypes; +import java.lang.reflect.InvocationTargetException; + import java.util.LinkedList; import java.util.Collection; import java.util.Iterator; @@ -39,11 +41,6 @@ public final int type; /** - * The <tt>FONode</tt> that stacked this value. - */ - private FONode stackedBy = null; - - /** * @param property <tt>int</tt> index of the property. */ public PropertyValueList(int property) throws PropertyException { @@ -184,21 +181,6 @@ } /** - * Set the node that stacked this value. - * @param node - the <tt>FONode</tt> that stacked this value. - */ - public void setStackedBy(FONode node) { - stackedBy = node; - } - - /** - * Get the node that stacked this value. - */ - public FONode getStackedBy() { - return stackedBy; - } - - /** * In some circumstances, the property against which a type is to be * validated may not be the same as the property against which this * <i>AbstractPropertyValue</i> is defined. @@ -248,9 +230,20 @@ Iterator contents = iterator(); while (contents.hasNext()) { int i = 0, j = 0; - cstr = contents.next().toString(); + Object obj = contents.next(); + try { + cstr = (String)(obj.getClass() + .getMethod("toString", null) + .invoke(obj, null)); + } catch (IllegalAccessException e) { + throw new PropertyException (e); + } catch (NoSuchMethodException e) { + throw new PropertyException (e); + } catch (InvocationTargetException e) { + throw new PropertyException (e); + } while (i < cstr.length() && j >= 0) { - j = cstr.indexOf('\n'); + j = cstr.indexOf('\n', j); if (j >= 0) { str = str + ">" + cstr.substring(i, ++j); i = j;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]