From: Wolfgang M. M. <wol...@us...> - 2004-04-14 12:18:03
|
Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20167/src/org/exist/xquery/value Modified Files: UntypedAtomicValue.java DoubleValue.java StringValue.java DecimalValue.java FloatValue.java BooleanValue.java Log Message: Improved page organization in dom.dbx to fix known XUpdate issues. Index: UntypedAtomicValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/UntypedAtomicValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UntypedAtomicValue.java 29 Jan 2004 15:06:42 -0000 1.1 --- UntypedAtomicValue.java 14 Apr 2004 12:17:22 -0000 1.2 *************** *** 230,234 **** return new Byte((byte) v.getInt()); } else if (target == boolean.class || target == Boolean.class) { ! return new Boolean(effectiveBooleanValue()); } else if (target == char.class || target == Character.class) { if (value.length() > 1 || value.length() == 0) --- 230,234 ---- return new Byte((byte) v.getInt()); } else if (target == boolean.class || target == Boolean.class) { ! return Boolean.valueOf(effectiveBooleanValue()); } else if (target == char.class || target == Character.class) { if (value.length() > 1 || value.length() == 0) Index: FloatValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/FloatValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FloatValue.java 29 Jan 2004 15:06:42 -0000 1.1 --- FloatValue.java 14 Apr 2004 12:17:22 -0000 1.2 *************** *** 257,261 **** return getStringValue(); else if (target == Boolean.class) ! return new Boolean(effectiveBooleanValue()); else if (target == Object.class) return new Double(value); --- 257,261 ---- return getStringValue(); else if (target == Boolean.class) ! return Boolean.valueOf(effectiveBooleanValue()); else if (target == Object.class) return new Double(value); Index: DoubleValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/DoubleValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DoubleValue.java 29 Jan 2004 15:06:42 -0000 1.1 --- DoubleValue.java 14 Apr 2004 12:17:22 -0000 1.2 *************** *** 362,366 **** return getStringValue(); else if (target == Boolean.class) ! return new Boolean(effectiveBooleanValue()); else if (target == Object.class) return new Double(value); --- 362,366 ---- return getStringValue(); else if (target == Boolean.class) ! return Boolean.valueOf(effectiveBooleanValue()); else if (target == Object.class) return new Double(value); Index: StringValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/StringValue.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StringValue.java 17 Feb 2004 15:04:54 -0000 1.3 --- StringValue.java 14 Apr 2004 12:17:22 -0000 1.4 *************** *** 218,222 **** return new Byte((byte)v.getInt()); } else if(target == boolean.class || target == Boolean.class) { ! return new Boolean(effectiveBooleanValue()); } else if(target == char.class || target == Character.class) { if(value.length() > 1 || value.length() == 0) --- 218,222 ---- return new Byte((byte)v.getInt()); } else if(target == boolean.class || target == Boolean.class) { ! return Boolean.valueOf(effectiveBooleanValue()); } else if(target == char.class || target == Character.class) { if(value.length() > 1 || value.length() == 0) Index: DecimalValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/DecimalValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DecimalValue.java 29 Jan 2004 15:06:42 -0000 1.1 --- DecimalValue.java 14 Apr 2004 12:17:22 -0000 1.2 *************** *** 281,285 **** return getStringValue(); else if (target == Boolean.class) ! return new Boolean(effectiveBooleanValue()); else if (target == Object.class) return value; --- 281,285 ---- return getStringValue(); else if (target == Boolean.class) ! return Boolean.valueOf(effectiveBooleanValue()); else if (target == Object.class) return value; Index: BooleanValue.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/value/BooleanValue.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BooleanValue.java 29 Jan 2004 15:06:42 -0000 1.1 --- BooleanValue.java 14 Apr 2004 12:17:22 -0000 1.2 *************** *** 154,158 **** return this; else if(target == Boolean.class || target == boolean.class || target == Object.class) ! return new Boolean(value); else if(target == String.class || target == CharSequence.class) { StringValue v = (StringValue)convertTo(Type.STRING); --- 154,158 ---- return this; else if(target == Boolean.class || target == boolean.class || target == Object.class) ! return Boolean.valueOf(value); else if(target == String.class || target == CharSequence.class) { StringValue v = (StringValue)convertTo(Type.STRING); |