You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2008/05/13 10:11:12 UTC
svn commit: r655771 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/properties/StringProperty.java
test/fotree/testcases/id_auto.fo
Author: adelmelle
Date: Tue May 13 01:11:12 2008
New Revision: 655771
URL: http://svn.apache.org/viewvc?rev=655771&view=rev
Log:
Alter auto-id naming to avoid confusion with URI fragment identifiers
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
xmlgraphics/fop/trunk/test/fotree/testcases/id_auto.fo
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java?rev=655771&r1=655770&r2=655771&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/StringProperty.java Tue May 13 01:11:12 2008
@@ -99,7 +99,7 @@
/** {@inheritDoc} */
public Property make(PropertyList propertyList) throws PropertyException {
- String newId = "FO#";
+ String newId = "FO_";
newId += propertyList.getFObj().getFOEventHandler().getNextId();
return new StringProperty(newId);
}
Modified: xmlgraphics/fop/trunk/test/fotree/testcases/id_auto.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/id_auto.fo?rev=655771&r1=655770&r2=655771&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/id_auto.fo (original)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/id_auto.fo Tue May 13 01:11:12 2008
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
- <test:assert property="id" expected="FO#1" />
+ <test:assert property="id" expected="FO_1" />
<fo:layout-master-set>
- <test:assert property="id" expected="FO#2" />
+ <test:assert property="id" expected="FO_2" />
<fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
- <test:assert property="id" expected="FO#3" />
+ <test:assert property="id" expected="FO_3" />
<fo:region-body>
- <test:assert property="id" expected="FO#4" />
+ <test:assert property="id" expected="FO_4" />
</fo:region-body>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="simpleA4">
- <test:assert property="id" expected="FO#5" />
+ <test:assert property="id" expected="FO_5" />
<fo:flow flow-name="xsl-region-body">
- <test:assert property="id" expected="FO#6" />
+ <test:assert property="id" expected="FO_6" />
<fo:block font-size="14pt" id="block">Hello
<test:assert property="id" expected="block"/>
<fo:inline> World!
- <test:assert property="id" expected="FO#7" />
+ <test:assert property="id" expected="FO_7" />
</fo:inline>
</fo:block>
<fo:block font-family="ZapfDingbats">઎
- <test:assert property="id" expected="FO#8" />
+ <test:assert property="id" expected="FO_8" />
</fo:block>
</fo:flow>
</fo:page-sequence>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org