[mapguide-commits] r5651 - in trunk/Tools/Maestro: Maestro.Editors/Fusion OSGeo.MapGuide.MaestroAPI/ObjectModels

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-03-22 02:52:01 -0700 (Tue, 22 Mar 2011)
New Revision: 5651

Modified:
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
Log:
#1635: Some fusion editor fixes:
 - Fix incorrect widget removal logic
 - Rebuild the widget tree view after closing the widget management dialog (as widget references may have been removed due to deleted widgets)


Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs	2011-03-22 08:57:08 UTC (rev 5650)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs	2011-03-22 09:52:01 UTC (rev 5651)
@@ -305,6 +305,9 @@
         private void btnManageWidgets_Click(object sender, EventArgs e)
         {
             new WidgetManagementDialog(_flexLayout, _edsvc, _context).ShowDialog();
+            //Widget references may have been removed, so rebuild
+            trvWidgets.Nodes.Clear();
+            InitWidgetSet();
         }
 
         private void trvWidgets_AfterSelect(object sender, TreeViewEventArgs e)

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2011-03-22 08:57:08 UTC (rev 5650)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2011-03-22 09:52:01 UTC (rev 5651)
@@ -625,7 +625,7 @@
             IWidget matchingWidget = null;
             foreach (var set in appDef.WidgetSets)
             {
-                if (matchingSet != null)
+                if (matchingSet == null)
                 {
                     foreach (var wgt in set.Widgets)
                     {