[mapguide-commits] r5967 - in trunk/Tools/Maestro: ExtendedModels/WatermarkDefinition-2.3.0 Generated Maestro.Base/Events

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-07-05 05:08:46 -0700 (Tue, 05 Jul 2011)
New Revision: 5967

Modified:
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
   trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
Log:
#1707: Remove default value assignment in ctors of Text/Image/Path Symbol Definition elements. Also purge root level attributes being applied to the deserialized watermark definition due to inlined Symbol Definition content.

Modified: trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs	2011-07-05 09:18:40 UTC (rev 5966)
+++ trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs	2011-07-05 12:08:46 UTC (rev 5967)
@@ -54,7 +54,11 @@
 
         public static IResource Deserialize(string xml)
         {
-            return WatermarkDefinition.Deserialize(xml);
+            IWatermarkDefinition wdf = WatermarkDefinition.Deserialize(xml);
+            if (wdf.Content != null)
+                wdf.Content.RemoveSchemaAttributes();
+
+            return wdf;
         }
 
         public static Stream Serialize(IResource res)

Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs	2011-07-05 09:18:40 UTC (rev 5966)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs	2011-07-05 12:08:46 UTC (rev 5967)
@@ -428,12 +428,14 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
+            /*
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
             this.angleField = "0.0";
             this.positionXField = "0.0";
             this.positionYField = "0.0";
+             */
         }
         
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="base64Binary")]
@@ -2758,11 +2760,13 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
+            /*
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
             this.lineJoinField = "\'Round\'";
             this.lineMiterLimitField = "5.0";
+             */
         }
         
         public string Geometry {
@@ -3378,6 +3382,7 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
+            /*
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -3392,6 +3397,7 @@
             this.justificationField = "\'FromAlignment\'";
             this.lineSpacingField = "1.05";
             this.textColorField = "ff000000";
+             */
         }
         
         public string Content {

Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs	2011-07-05 09:18:40 UTC (rev 5966)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs	2011-07-05 12:08:46 UTC (rev 5967)
@@ -428,12 +428,14 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Image() {
+            /*
             this.sizeXField = "1.0";
             this.sizeYField = "1.0";
             this.sizeScalableField = "true";
             this.angleField = "0.0";
             this.positionXField = "0.0";
             this.positionYField = "0.0";
+             */
         }
         
         [System.Xml.Serialization.XmlElementAttribute("Content", typeof(byte[]), DataType="base64Binary")]
@@ -2754,11 +2756,13 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Path() {
+            /*
             this.lineWeightField = "0.0";
             this.lineWeightScalableField = "true";
             this.lineCapField = "\'Round\'";
             this.lineJoinField = "\'Round\'";
             this.lineMiterLimitField = "5.0";
+             */
         }
         
         public string Geometry {
@@ -3386,6 +3390,7 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public Text() {
+            /*
             this.fontNameField = "\'Arial\'";
             this.boldField = "false";
             this.italicField = "false";
@@ -3404,6 +3409,7 @@
             this.lineSpacingField = "1.05";
             this.textColorField = "ff000000";
             this.markupField = "\'Plain\'";
+             */
         }
         
         public string Content {

Modified: trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs	2011-07-05 09:18:40 UTC (rev 5966)
+++ trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs	2011-07-05 12:08:46 UTC (rev 5967)
@@ -49,6 +49,8 @@
             _keepAliveTimer.Start();
         }
 
+        static bool smShowingError = false;
+
         static void OnKeepAliveTimerElapsed(object sender, EventArgs e)
         {
             var svc = ServiceRegistry.GetService<ServerConnectionManager>();
@@ -65,7 +67,18 @@
                     }
                     catch (Exception ex)
                     {
-                        MessageService.ShowError(Properties.Resources.KeepAliveFailed);
+                        if (smShowingError)
+                            return;
+
+                        try
+                        {
+                            smShowingError = true;
+                            MessageService.ShowError(Properties.Resources.KeepAliveFailed);
+                        }
+                        finally
+                        {
+                            smShowingError = false;
+                        }
                     }
                 }
             }