Fix bugzilla 281304

eclipse-birt · Jun 24, 2009 · 5f24018 · 5f24018
1 parent 9686b0c
commit 5f24018
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 29 deletions.
diff --git a/....model/src/org/eclipse/birt/report/tests/model/api/golden/DynamicParameterTest_golden.xml b/....model/src/org/eclipse/birt/report/tests/model/api/golden/DynamicParameterTest_golden.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="createdBy">Eclipse BIRT Designer Version 1.0.1 Build &lt;20051014-0742></property>
     <property name="units">in</property>
+    <property name="layoutPreference">auto layout</property>
     <parameters>
         <scalar-parameter name="Param 1" id="2">
             <text-property name="promptText">abc</text-property>
@@ -10,10 +11,10 @@
             <property name="isRequired">true</property>
             <property name="dataSetName">dataset1</property>
             <expression name="valueExpr">row["ORDERDATE"]</expression>
+            <property name="dataType">dateTime</property>
             <simple-property-list name="defaultValue">
                 <value type="constant">10/15/2005</value>
             </simple-property-list>
-            <property name="dataType">dateTime</property>
             <property name="controlType">list-box</property>
             <property name="mustMatch">false</property>
             <property name="fixedOrder">true</property>

diff --git a/...tests.model/src/org/eclipse/birt/report/tests/model/api/golden/LibraryCreatLib_golden.xml b/...tests.model/src/org/eclipse/birt/report/tests/model/api/golden/LibraryCreatLib_golden.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="theme">defaultTheme</property>
     <parameters>
         <scalar-parameter name="Parameter1" id="30">
             <property name="isRequired">false</property>
+            <property name="dataType">string</property>
             <simple-property-list name="defaultValue">
                 <value type="constant">abc</value>
             </simple-property-list>
-            <property name="dataType">string</property>
             <property name="controlType">text-box</property>
             <structure name="format">
                 <property name="category">Unformatted</property>

diff --git a/...ests.model/src/org/eclipse/birt/report/tests/model/api/golden/LibraryImportDpt_golden.xml b/...ests.model/src/org/eclipse/birt/report/tests/model/api/golden/LibraryImportDpt_golden.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="units">in</property>
+    <property name="layoutPreference">auto layout</property>
     <list-property name="libraries">
         <structure>
             <property name="fileName">LibraryCreatLib.xml</property>

diff --git a/...ts.model/src/org/eclipse/birt/report/tests/model/api/golden/Library_Addin_Test_golden.xml b/...ts.model/src/org/eclipse/birt/report/tests/model/api/golden/Library_Addin_Test_golden.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="units">in</property>
+    <property name="layoutPreference">auto layout</property>
     <list-property name="libraries">
         <structure>
             <property name="fileName">LibraryCreatLib.xml</property>

diff --git a/.../src/org/eclipse/birt/report/tests/model/api/golden/Library_IncludeLibrary_Lib_golden.xml b/.../src/org/eclipse/birt/report/tests/model/api/golden/Library_IncludeLibrary_Lib_golden.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="theme">defaultTheme</property>
     <list-property name="libraries">
         <structure>
@@ -10,10 +10,10 @@
     <parameters>
         <scalar-parameter name="Parameter1" id="2">
             <property name="isRequired">false</property>
+            <property name="dataType">string</property>
             <simple-property-list name="defaultValue">
                 <value type="constant">abc</value>
             </simple-property-list>
-            <property name="dataType">string</property>
             <property name="controlType">text-box</property>
             <structure name="format">
                 <property name="category">Unformatted</property>

diff --git a/...sts.model/src/org/eclipse/birt/report/tests/model/regression/golden/Reg_130271_golden.xml b/...sts.model/src/org/eclipse/birt/report/tests/model/regression/golden/Reg_130271_golden.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.1" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
+    <property name="layoutPreference">auto layout</property>
     <list-property name="libraries">
         <structure>
-            <property name="fileName">Reg_130271.xml</property>
+            <property name="fileName">Reg_130271_lib.xml</property>
             <property name="namespace">lib</property>
         </structure>
     </list-property>

diff --git a/...el/src/org/eclipse/birt/report/tests/model/regression/golden/Regression_121352_golden.xml b/...el/src/org/eclipse/birt/report/tests/model/regression/golden/Regression_121352_golden.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.16" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="author">Report Author</property>
     <list-property name="propertyBindings">
         <structure>
@@ -13,6 +13,7 @@
             <expression name="value">params[p2]</expression>
         </structure>
     </list-property>
+    <property name="layoutPreference">auto layout</property>
     <page-setup>
         <graphic-master-page name="My Page" id="6">
             <property name="comments">Sample page</property>

diff --git a/...el/src/org/eclipse/birt/report/tests/model/regression/golden/Regression_149618_golden.xml b/...el/src/org/eclipse/birt/report/tests/model/regression/golden/Regression_149618_golden.xml
@@ -2,6 +2,7 @@
 <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
     <property name="createdBy">Eclipse BIRT Designer Version 2.1.0.qualifier Build &lt;@BUILD@></property>
     <property name="units">in</property>
+    <property name="layoutPreference">auto layout</property>
     <data-sources>
         <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="Data Source" id="4">
             <text-property name="displayName">Data Source</text-property>

diff --git a/.../org/eclipse/birt/report/tests/model/regression/golden/regression_215762_golden.rptdesign b/.../org/eclipse/birt/report/tests/model/regression/golden/regression_215762_golden.rptdesign
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="units">in</property>
     <property name="comments">Copyright (c) 2008 &lt;&lt;Your Company Name here>></property>
     <property name="iconFile">/templates/blank_report.gif</property>
+    <property name="layoutPreference">auto layout</property>
     <data-sources>
         <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="Data Source" id="31">
             <property name="odaDriverClass">org.eclipse.birt.report.data.oda.sampledb.Driver</property>
@@ -15,39 +16,39 @@
             <list-property name="columnHints">
                 <structure>
                     <property name="columnName">OFFICECODE</property>
-                    <property name="displayName">OFFICECODE</property>
+                    <text-property name="displayName">OFFICECODE</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">CITY</property>
-                    <property name="displayName">CITY</property>
+                    <text-property name="displayName">CITY</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">PHONE</property>
-                    <property name="displayName">PHONE</property>
+                    <text-property name="displayName">PHONE</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">ADDRESSLINE1</property>
-                    <property name="displayName">ADDRESSLINE1</property>
+                    <text-property name="displayName">ADDRESSLINE1</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">ADDRESSLINE2</property>
-                    <property name="displayName">ADDRESSLINE2</property>
+                    <text-property name="displayName">ADDRESSLINE2</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">STATE</property>
-                    <property name="displayName">STATE</property>
+                    <text-property name="displayName">STATE</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">COUNTRY</property>
-                    <property name="displayName">COUNTRY</property>
+                    <text-property name="displayName">COUNTRY</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">POSTALCODE</property>
-                    <property name="displayName">POSTALCODE</property>
+                    <text-property name="displayName">POSTALCODE</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">TERRITORY</property>
-                    <property name="displayName">TERRITORY</property>
+                    <text-property name="displayName">TERRITORY</text-property>
                 </structure>
             </list-property>
             <structure name="cachedMetaData">

diff --git a/...rc/org/eclipse/birt/report/tests/model/regression/golden/regression_236825_lib_golden.xml b/...rc/org/eclipse/birt/report/tests/model/regression/golden/regression_236825_lib_golden.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<library xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="units">in</property>
     <data-sources>
         <oda-data-source extensionID="org.eclipse.birt.report.data.oda.jdbc" name="Data Source" id="5">
@@ -13,15 +13,15 @@
             <list-property name="columnHints">
                 <structure>
                     <property name="columnName">OFFICECODE</property>
-                    <property name="displayName">OFFICECODE</property>
+                    <text-property name="displayName">OFFICECODE</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">CITY</property>
-                    <property name="displayName">CITY</property>
+                    <text-property name="displayName">CITY</text-property>
                 </structure>
                 <structure>
                     <property name="columnName">COUNTRY</property>
-                    <property name="displayName">COUNTRY</property>
+                    <text-property name="displayName">COUNTRY</text-property>
                 </structure>
             </list-property>
             <structure name="cachedMetaData">
@@ -148,19 +148,19 @@ from CLASSICMODELS.OFFICES]]></xml-property>
             <list-property name="boundDataColumns">
                 <structure>
                     <property name="name">OFFICECODE</property>
-                    <property name="displayName">OFFICECODE</property>
+                    <text-property name="displayName">OFFICECODE</text-property>
                     <expression name="expression">dataSetRow["OFFICECODE"]</expression>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="name">CITY</property>
-                    <property name="displayName">CITY</property>
+                    <text-property name="displayName">CITY</text-property>
                     <expression name="expression">dataSetRow["CITY"]</expression>
                     <property name="dataType">string</property>
                 </structure>
                 <structure>
                     <property name="name">COUNTRY</property>
-                    <property name="displayName">COUNTRY</property>
+                    <text-property name="displayName">COUNTRY</text-property>
                     <expression name="expression">dataSetRow["COUNTRY"]</expression>
                     <property name="dataType">string</property>
                 </structure>

diff --git a/...el/src/org/eclipse/birt/report/tests/model/regression/golden/regression_240813_golden.xml b/...el/src/org/eclipse/birt/report/tests/model/regression/golden/regression_240813_golden.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.19" id="1">
+<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.20" id="1">
     <property name="units">in</property>
     <property name="iconFile">/templates/blank_report.gif</property>
+    <property name="layoutPreference">auto layout</property>
     <property name="bidiLayoutOrientation">ltr</property>
     <list-property name="libraries">
         <structure>