[mapguide-commits] r6282 - in trunk/Tools/Maestro: Maestro OSGeo.MapGuide.MaestroAPI/Schema Properties

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-12-02 07:28:42 -0800 (Fri, 02 Dec 2011)
New Revision: 6282

Modified:
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
   trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
Log:
#1477: Fix more incorrect xml schema data types being specified when serializing

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2011-12-02 13:50:19 UTC (rev 6281)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2011-12-02 15:28:42 UTC (rev 6282)
@@ -1,9 +1,12 @@
 4.0
 ---
 
+ - Map Definition Editor support for specifying a Google/Yahoo/Bing/OSM compatible finite scale list
+ - OpenStreetMap layer support in the Fusion editor
  - Support for localizing Web Layouts and Application Definitions
  - Tiled maps will be converted to non-tiled maps when previewed in local mode.
  - A whole assortment of API tweaks to improve general usability.
+ - Fix: Inability to toggle Task Bar in the Web Layout editor
  - Fix: Gracefully handle feature sources with no feature classes in the Layer Definition Editor
  - Fix: Minor usability issue when creating Coordinate System Overrides.
  - Fix: Resource Properties command bringing up XML header editor instead of properties dialog

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2011-12-02 13:50:19 UTC (rev 6281)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2011-12-02 15:28:42 UTC (rev 6282)
@@ -100,11 +100,11 @@
             switch (dataPropertyType)
             {
                 case DataPropertyType.Blob:
-                    return "xs:base64Binary";
+                    return "xs:hexBinary";
                 case DataPropertyType.Boolean:
                     return "xs:boolean";
                 case DataPropertyType.Byte:
-                    return "fdo:byte";
+                    return "xs:unsignedByte";
                 case DataPropertyType.DateTime:
                     return "xs:dateTime";
                 case DataPropertyType.Double:
@@ -114,13 +114,13 @@
                 case DataPropertyType.Int32:
                     return "xs:int";
                 case DataPropertyType.Int64:
-                    return "xs:int64";
+                    return "xs:long";
                 case DataPropertyType.Single:
                     return "xs:float";
                 case DataPropertyType.String:
                     return "xs:string";
                 case DataPropertyType.Clob:
-                    return "xs:string";
+                    return "fdo:clob";
                 default:
                     throw new ArgumentException();
             }
@@ -178,8 +178,8 @@
                     return DataPropertyType.Single;
                 case "xs:string":
                     return DataPropertyType.String;
-                //case "xs:string":
-                //    return DataPropertyType.Clob;
+                case "fdo:clob":
+                    return DataPropertyType.Clob;
                 default:
                     throw new ArgumentException();
             }

Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-12-02 13:50:19 UTC (rev 6281)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-12-02 15:28:42 UTC (rev 6282)
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.6216")]
-[assembly: AssemblyFileVersion("4.0.0.6216")]
+[assembly: AssemblyVersion("4.0.0.6282")]
+[assembly: AssemblyFileVersion("4.0.0.6282")]