[FOray-commit] SF.net SVN: foray: [7805] trunk/foray/foray-fotree/src/java/org/foray/fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7805] trunk/foray/foray-fotree/src/java/org/foray/fotree
|
From: <vic...@us...> - 2006-07-22 16:17:14
|
Revision: 7805 Author: victormote Date: 2006-07-22 09:15:41 -0700 (Sat, 22 Jul 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7805&view=rev Log Message: ----------- Consolidate unexpected value reporting a bit. Modified Paths: -------------- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvDistanceBetween.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvLabelSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SwitchTo.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -95,6 +95,17 @@ return propertyType; } + protected PropertyException unexpectedValue(String value, + PropertyList propertyList) { + return unexpectedValue(value, propertyList, null); + } + + protected PropertyException unexpectedValue(String value, + PropertyList propertyList, String reason) { + return new PropertyException(unexpectedValueMessage(reason, value, + propertyList)); + } + /** * Creates an "Unexpected value" message suitable for user messages or * exception reporting. @@ -103,7 +114,7 @@ * @return A formatted, ready-to-present message describing the error. * @see #unexpectedValueMessage(String, String, PropertyList) */ - public String unexpectedValueMessage(String value, + private String unexpectedValueMessage(String value, PropertyList propertyList) { return unexpectedValueMessage(null, value, propertyList); } @@ -118,7 +129,7 @@ * @return A formatted, ready-to-present message describing the error. * @see #unexpectedValueMessage(String, PropertyList) */ - public String unexpectedValueMessage(String reason, String value, + private String unexpectedValueMessage(String reason, String value, PropertyList propertyList) { StringBuffer buffer = new StringBuffer(); FObj fobj = propertyList.getFObj(); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteDimension.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -76,8 +76,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte relativeAxis, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte direction, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -77,8 +77,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentBaseline.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -65,8 +65,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ return pv; } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public double getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -79,8 +79,7 @@ } } if (! isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } PropertyValue pv = checkKeywords(remainingValue); @@ -91,23 +90,20 @@ case Constants.FOVAL_RIGHTWARDS: case Constants.FOVAL_INHERIT: { if (this.isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } } return pv; } if (this.isBehind) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } pv = DtAngle.makeAngleDT(value); if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public float getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -75,8 +75,7 @@ // Tokenize the input & put the tokens into an ArrayList StringTokenizer st = new StringTokenizer(value); if (st.countTokens() < 1 || st.countTokens() > MAX_TOKENS) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } ArrayList tokenList = new ArrayList(st.countTokens()); while (st.hasMoreTokens()) { @@ -87,8 +86,7 @@ for (int i = 0; i < tokenList.size(); i++) { short contentType = getContentType((String) tokenList.get(i)); if (contentType < 0) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } positionArray[i] = contentType; } @@ -101,8 +99,7 @@ switch (positionArray[i]) { case Constants.FOPROP_BACKGROUND_COLOR: { if (colorFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new BackgroundColor(propertyList, positionArray[i], propertyFullName, @@ -111,8 +108,7 @@ } case Constants.FOPROP_BACKGROUND_IMAGE: { if (imageFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new BackgroundImage(propertyList, positionArray[i], propertyFullName, @@ -121,8 +117,7 @@ } case Constants.FOPROP_BACKGROUND_REPEAT: { if (repeatFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new Enumerated(propertyList, positionArray[i], propertyFullName, @@ -131,8 +126,7 @@ } case Constants.FOPROP_BACKGROUND_ATTACHMENT: { if (attachmentFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new Enumerated(propertyList, positionArray[i], propertyFullName, @@ -141,8 +135,7 @@ } case Constants.FOPROP_BACKGROUND_POSITION: { if (positionFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } String propertyInput = (String) tokenList.get(i); if (i < positionArray.length && positionArray[i + 1] Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -69,8 +69,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public Graphic getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -90,8 +90,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, @@ -106,8 +105,7 @@ } StringTokenizer st = new StringTokenizer(value); if (st.countTokens() < 1 || st.countTokens() > 2) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } while (st.hasMoreTokens()) { String token = st.nextToken(); @@ -132,8 +130,7 @@ (propertyList, propertyType, pv); collection.addItem(property); } else { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } if (collection.getCount() == 1) { @@ -149,16 +146,14 @@ if (pv2 instanceof DtPercentage || pv2 instanceof DtLength) { return collection; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /* * If the first item is a keyword, the other needs to be also. */ if (pv instanceof PropertyKeyword) { if (! (pv2 instanceof PropertyKeyword)) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } } // The two keywords need to be from each of the two sets. Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -67,8 +67,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -61,8 +61,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public boolean getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -79,8 +79,7 @@ while (st.hasMoreTokens()) { Property property = parseToken(propertyList, st.nextToken()); if (property == null) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } if (collection == null) { collection = new PropertyCollection(); @@ -90,8 +89,7 @@ if (collection != null) { return collection; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public Property parseToken(PropertyList propertyList, String token) Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -77,8 +77,7 @@ if (pv instanceof ExprColor) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (pv instanceof DtInteger) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj, byte direction) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -76,8 +76,7 @@ return new DtLengthBPIPDirection(null, ((DtLength) pv)); } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, byte axis, FObj fobj) { @@ -152,8 +151,7 @@ if (pv instanceof DtLength) { length = (DtLength) pv; } else { - throw new PropertyException(unexpectedValueMessage(attributeValue, - propertyList)); + throw unexpectedValue(attributeValue, propertyList); } String subPropertyName = Property.getSubPropertyName(propertyFullName); if (subPropertyName.equals("block-progression-direction")) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -83,8 +83,7 @@ return new DtLengthBPIPDirection(length2, length1); } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -93,8 +93,7 @@ if (kw != null) { return kw; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -93,8 +93,7 @@ if (pv instanceof DtLengthConditional) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -45,8 +45,7 @@ if (value.length() != 0) { return new DtString(value); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (value.length() == 1) { return new DtCharacter(value.charAt(0)); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /* For "hyphenation-character", which can be inherited. */ Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -60,8 +60,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public Shape getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -72,8 +72,7 @@ if (pv instanceof ExprColor) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public java.awt.Color getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -60,8 +60,7 @@ ((DtInteger) pv).setMinimumValue(1); return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -64,8 +64,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -54,8 +54,7 @@ integer.setMinimumValue(1); return integer; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private boolean validateFObj(PropertyList propertyList) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -58,8 +58,7 @@ // Used to store proportional column width return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj, int tableWidth) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -65,8 +65,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } /** Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -56,8 +56,7 @@ if (value.length() != 0) { return new DtString(value); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue(FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -64,8 +64,7 @@ if (DtCountry.validCountry(value)) { return new DtCountry(value); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -75,16 +75,14 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createShorthandValue(PropertyList propertyList, String value) throws PropertyException { StringTokenizer st = new StringTokenizer(value); if (st.countTokens() != 1 && st.countTokens() != 2) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } PropertyCollection collection = new PropertyCollection(); while (st.hasMoreTokens()) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -51,8 +51,7 @@ if (pv instanceof DtLength) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -58,8 +58,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -66,8 +66,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -64,8 +64,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public float getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -59,8 +59,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -68,8 +68,7 @@ if (pv instanceof DtPercentage) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -46,8 +46,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -110,16 +110,14 @@ tokenList.add(token); } if (tokenList.size() < 1 || tokenList.size() > MAX_TOKENS) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } // Create an array indicating which property is in each position short[] positionArray = new short[tokenList.size()]; for (int i = 0; i < tokenList.size(); i++) { short contentType = getContentType((String) tokenList.get(i)); if (contentType < 0) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } positionArray[i] = contentType; } @@ -133,8 +131,7 @@ switch (positionArray[i]) { case Constants.FOPROP_FONT_STYLE: { if (styleFound || sizeFound || lineHeightFound || familyFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new FontStyle(propertyList, positionArray[i], propertyFullName, @@ -144,8 +141,7 @@ case Constants.FOPROP_FONT_VARIANT: { if (variantFound || sizeFound || lineHeightFound || familyFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new FontVariant(propertyList, positionArray[i], propertyFullName, @@ -155,8 +151,7 @@ case Constants.FOPROP_FONT_WEIGHT: { if (weightFound || sizeFound || lineHeightFound || familyFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new FontWeight(propertyList, positionArray[i], propertyFullName, @@ -165,8 +160,7 @@ } case Constants.FOPROP_FONT_SIZE: { if (sizeFound || lineHeightFound || familyFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new FontSize(propertyList, positionArray[i], propertyFullName, @@ -175,8 +169,7 @@ } case Constants.FOPROP_LINE_HEIGHT: { if (lineHeightFound || familyFound || ! sizeFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } // Strip the leading "/" character. String adjustedToken @@ -188,8 +181,7 @@ } case Constants.FOPROP_FONT_FAMILY: { if (familyFound || ! sizeFound) { - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } collection.addItem(new FontFamily(propertyList, positionArray[i], propertyFullName, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -97,8 +97,7 @@ return pv; } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -65,8 +65,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public double getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -70,8 +70,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -63,8 +63,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -61,8 +61,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -83,8 +83,7 @@ } return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -60,8 +60,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -45,8 +45,7 @@ if (value.length() != 0) { return new DtString(value); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -67,8 +67,7 @@ if (pv != null) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public short getValue(FOContext context, FObj fobj, byte axis) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -50,8 +50,7 @@ if (pv instanceof DtInteger) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -62,8 +62,7 @@ if (pv instanceof DtInteger) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -59,8 +59,7 @@ ((DtInteger) pv).setMinimumValue(1); return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -60,8 +60,7 @@ ((DtInteger) pv).setMinimumValue(1); return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int traitValue(FOContext context, FObj fobj) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -46,8 +46,7 @@ if (pv instanceof DtName) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public String getValue() { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -81,8 +81,7 @@ return pv; } } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj, byte direction, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -62,8 +62,7 @@ if (pv instanceof DtInteger) { return pv; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, FObj fobj, int lastPageNumberUsed) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -44,8 +44,7 @@ String value) throws PropertyException { DtName pv = DtName.makeNameDT(value); if (pv == null) { - throw new PropertyException(unexpectedValueMessage("Invalid NCName", - value, propertyList)); + throw unexpectedValue(value, propertyList, "Invalid NCName"); } return pv; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-07-19 02:15:55 UTC (rev 7804) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java 2006-07-22 16:15:41 UTC (rev 7805) @@ -84,8 +84,7 @@ int integer = ((DtInteger) pv).getValue(); return new DtKeep(integer, integer, integer); } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } private PropertyValue createPropertyValueSpace(PropertyList propertyList, @@ -96,8 +95,7 @@ if (keepDT != null) { return keepDT; } - throw new PropertyException(unexpectedValueMessage(value, - propertyList)); + throw unexpectedValue(value, propertyList); } public int getValue(FOContext context, int subProperty, FObj fobj) { @@ -246,8 +244,7 @@ return keepDT; } default: {... [truncated message content] |
