[fusion-commits] r2331 - branches/fusion-2.2/widgets/Theme/classes sandbox/adsk/2.3r/widgets/Theme/classes trunk/widgets/Theme/classes

[svn_fusion at osgeo.org]

Author: liuar
Date: 2011-01-28 02:01:08 -0800 (Fri, 28 Jan 2011)
New Revision: 2331

Modified:
   branches/fusion-2.2/widgets/Theme/classes/theme.php
   sandbox/adsk/2.3r/widgets/Theme/classes/theme.php
   trunk/widgets/Theme/classes/theme.php
Log:
Ticket #421
MapGuide upgraded LayerDefinition schema from 1.3.0 to 2.3.0.
So, the theme widget need to be enhanced to support the latest version of layer definition. 

The new layer definition could be found at  http://trac.osgeo.org/mapguide/browser/trunk/MgDev/Common/Schema/LayerDefinition-2.3.0.xsd


Modified: branches/fusion-2.2/widgets/Theme/classes/theme.php
===================================================================
--- branches/fusion-2.2/widgets/Theme/classes/theme.php	2011-01-28 09:22:35 UTC (rev 2330)
+++ branches/fusion-2.2/widgets/Theme/classes/theme.php	2011-01-28 10:01:08 UTC (rev 2331)
@@ -274,9 +274,9 @@
         }
 
         $CompositeTypeStyles = $vectorScaleRangecElement->getElementsByTagName('CompositeTypeStyle');
-        
+        $isEnhancedStyle = ($CompositeTypeStyles->length != 0);
         // Remove any existing <CompositeTypeStyle> elements with Polygon <GeometryContext>.
-        if($CompositeTypeStyles != null)
+        if($isEnhancedStyle)
         {
             $template = 'templates/arearuletemplate-'.$version.'-Enhanced.xml';
             $styleCount = $CompositeTypeStyles->length;
@@ -356,7 +356,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);
@@ -410,7 +410,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);

Modified: sandbox/adsk/2.3r/widgets/Theme/classes/theme.php
===================================================================
--- sandbox/adsk/2.3r/widgets/Theme/classes/theme.php	2011-01-28 09:22:35 UTC (rev 2330)
+++ sandbox/adsk/2.3r/widgets/Theme/classes/theme.php	2011-01-28 10:01:08 UTC (rev 2331)
@@ -274,9 +274,9 @@
         }
 
         $CompositeTypeStyles = $vectorScaleRangecElement->getElementsByTagName('CompositeTypeStyle');
-        
+        $isEnhancedStyle = ($CompositeTypeStyles->length != 0);
         // Remove any existing <CompositeTypeStyle> elements with Polygon <GeometryContext>.
-        if($CompositeTypeStyles != null)
+        if($isEnhancedStyle)
         {
             $template = 'templates/arearuletemplate-'.$version.'-Enhanced.xml';
             $styleCount = $CompositeTypeStyles->length;
@@ -356,7 +356,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);
@@ -410,7 +410,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);

Modified: trunk/widgets/Theme/classes/theme.php
===================================================================
--- trunk/widgets/Theme/classes/theme.php	2011-01-28 09:22:35 UTC (rev 2330)
+++ trunk/widgets/Theme/classes/theme.php	2011-01-28 10:01:08 UTC (rev 2331)
@@ -274,9 +274,9 @@
         }
 
         $CompositeTypeStyles = $vectorScaleRangecElement->getElementsByTagName('CompositeTypeStyle');
-        
+        $isEnhancedStyle = ($CompositeTypeStyles->length != 0);
         // Remove any existing <CompositeTypeStyle> elements with Polygon <GeometryContext>.
-        if($CompositeTypeStyles != null)
+        if($isEnhancedStyle)
         {
             $template = 'templates/arearuletemplate-'.$version.'-Enhanced.xml';
             $styleCount = $CompositeTypeStyles->length;
@@ -356,7 +356,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);
@@ -410,7 +410,7 @@
                       $areaTypeStyle->appendChild($areaNode);
                     }
                 }
-                if($CompositeTypeStyles != null)
+                if($isEnhancedStyle)
                 {
                     $compositeTypeStyle = $doc->createElement('CompositeTypeStyle');
                     $compositeTypeStyle->appendChild($areaNode);