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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-04-04 08:27:16 -0700 (Mon, 04 Apr 2011)
New Revision: 5676

Modified:
   trunk/Tools/Maestro/Install/Maestro.nsi
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
   trunk/Tools/Maestro/Maestro/changelog.txt
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
   trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
Log:
A few nasty fusion bugs slipped through the cracks (NullReferenceException when selected map group, and Yahoo API key not being recorded). Rebuild the beta 3 with these fixes rolled in

Modified: trunk/Tools/Maestro/Install/Maestro.nsi
===================================================================
--- trunk/Tools/Maestro/Install/Maestro.nsi	2011-04-04 14:53:31 UTC (rev 5675)
+++ trunk/Tools/Maestro/Install/Maestro.nsi	2011-04-04 15:27:16 UTC (rev 5676)
@@ -72,8 +72,8 @@
 !define PROJECT_URL "http://trac.osgeo.org/mapguide/wiki/maestro"
 !define INST_SRC "."
 !define INST_LICENSE "..\Maestro\license.txt"
-#!define INST_OUTPUT "MapGuide Maestro-${SLN_CONFIG}-${RELEASE_VERSION}-${CPU}-Setup.exe"
-!define INST_OUTPUT "MapGuide Maestro-${SLN_CONFIG}-${RELEASE_VERSION}-Setup.exe"
+#!define INST_OUTPUT "MapGuideMaestro-${SLN_CONFIG}-${RELEASE_VERSION}-${CPU}-Setup.exe"
+!define INST_OUTPUT "MapGuideMaestro-${SLN_CONFIG}-${RELEASE_VERSION}-Setup.exe"
 
 # We'll disable this for preview releases, because release version will not be a valid version string
 

Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2011-04-04 14:53:31 UTC (rev 5675)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2011-04-04 15:27:16 UTC (rev 5676)
@@ -1,5 +1,16 @@
-3.0 Beta 2
+3.0 Beta 3
 ----------
+ - Added a command to purge cached information for a feature source
+ - Added resource validation error codes
+ - UI layout tweaks for the ODBC Feature Source editor
+ - Fix: Added missing button to close tabs in Feature Source Preview tool
+ - Fix: Prevent ODBC feature source editor configuration/reset functionality if connection is not valid
+ - Fix: Added missing Site Administrator command
+ - Fix: Usability tweaks for the New Resource Dialog
+ - Fix: Refined Load Procedure logic for handling default Coordinate Systems
+
+3.0 Beta 2
+----------
  - Added WMS specialized feature source editor
  - Added missing connection testing functionality for various specialized feature source editors
  - New dialog for creating folders

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs	2011-04-04 14:53:31 UTC (rev 5675)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs	2011-04-04 15:27:16 UTC (rev 5676)
@@ -533,7 +533,7 @@
             if (_noEvents)
                 return;
 
-            _appDef.SetValue("YahooScript", YAHOO_URL + txtGoogApiKey.Text);
+            _appDef.SetValue("YahooScript", YAHOO_URL + txtYahooApiKey.Text);
         }
 
         const string GOOGLE_URL = "http://maps.google.com/maps?file=api&v=2&key=";

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2011-04-04 14:53:31 UTC (rev 5675)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2011-04-04 15:27:16 UTC (rev 5676)
@@ -861,10 +861,13 @@
             Check.NotNull(ext, "ext");
             Check.NotEmpty(name, "name");
 
-            var el = ext.Extension.Content.FindElementByName(name);
-            if (el != null)
+            if (ext.Extension.Content != null)
             {
-                return el.InnerText;
+                var el = ext.Extension.Content.FindElementByName(name);
+                if (el != null)
+                {
+                    return el.InnerText;
+                }
             }
             return string.Empty;
         }

Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-04-04 14:53:31 UTC (rev 5675)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2011-04-04 15:27:16 UTC (rev 5676)
@@ -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("3.0.0.5675")]
-[assembly: AssemblyFileVersion("3.0.0.5675")]
+[assembly: AssemblyVersion("3.0.0.5676")]
+[assembly: AssemblyFileVersion("3.0.0.5676")]