[mapguide-commits] r6342 - in trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI: ObjectModels Resource/Validation

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-12-16 00:02:37 -0800 (Fri, 16 Dec 2011)
New Revision: 6342

Modified:
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
Log:
#1890: Fix incorrect layer definition validation of composite/basic styles

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs	2011-12-16 02:16:22 UTC (rev 6341)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs	2011-12-16 08:02:37 UTC (rev 6342)
@@ -668,6 +668,11 @@
         /// Gets or sets the composite styles for this scale range
         /// </summary>
         IEnumerable<ICompositeTypeStyle> CompositeStyle { get; set; }
+
+        /// <summary>
+        /// Gets the composite style count.
+        /// </summary>
+        int CompositeStyleCount { get; }
     }
 
     /// <summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-12-16 02:16:22 UTC (rev 6341)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-12-16 08:02:37 UTC (rev 6342)
@@ -384,6 +384,20 @@
                 Unit = unit
             };
         }
+
+        int IVectorScaleRange2.CompositeStyleCount
+        {
+            get
+            {
+                int count = 0;
+                foreach (var item in this.itemsField)
+                {
+                    if (typeof(ICompositeTypeStyle).IsAssignableFrom(item.GetType()))
+                        count++;
+                }
+                return count;
+            }
+        }
 #endif
     }
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs	2011-12-16 02:16:22 UTC (rev 6341)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs	2011-12-16 08:02:37 UTC (rev 6342)
@@ -97,9 +97,8 @@
                             var area = vsr2.AreaStyle;
                             var line = vsr2.LineStyle;
                             var point = vsr2.PointStyle;
-                            var comp = vsr2.CompositeStyle;
 
-                            if (comp != null && (area != null || line != null || point != null))
+                            if (vsr2.CompositeStyleCount > 0 && (area != null || line != null || point != null))
                             {
                                 issues.Add(new ValidationIssue(resource, ValidationStatus.Warning, ValidationStatusCode.Warning_LayerDefinition_CompositeStyleDefinedAlongsideBasicStyle, string.Format(
                                     Properties.Resources.LDF_CompositeStyleDefinedAlongsideBasicStyle,