[mapguide-commits] r7455 - in trunk/Tools/Maestro/Maestro.Base: Editor Services

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-04-08 04:02:16 -0700 (Mon, 08 Apr 2013)
New Revision: 7455

Modified:
   trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
Log:
Resource Preview fixes:
 - Show any exception thrown during resource preview generation
 - Allow WebLayout previews for versions not recognised by Maestro. (ie. The v2.6.0 schema introduced with RFC128)

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs	2013-04-08 10:46:33 UTC (rev 7454)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs	2013-04-08 11:02:16 UTC (rev 7455)
@@ -255,10 +255,9 @@
 
             var sessionId = _edSvc.SessionID;
             var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
-            var wl = (IWebLayout)res;
-            var conn = wl.CurrentConnection;
+            var conn = res.CurrentConnection;
 
-            conn.ResourceService.SaveResourceAs(wl, resId);
+            conn.ResourceService.SaveResourceAs(res, resId);
             url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId + "&LOCALE=" + GetLocale(locale); //NOXLATE
 
             return url;

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs	2013-04-08 10:46:33 UTC (rev 7454)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs	2013-04-08 11:02:16 UTC (rev 7455)
@@ -292,17 +292,24 @@
                 }
             };
             Action<object, Exception> onComplete = (result, ex) => {
-                var urlResult = result as UrlPreviewResult;
-                var imgResult = result as ImagePreviewResult;
-                if (urlResult != null)
+                if (ex != null)
                 {
-                    var url = urlResult.Url;
-                    var launcher = ServiceRegistry.GetService<UrlLauncherService>();
-                    launcher.OpenUrl(url);
+                    ErrorDialog.Show(ex);
                 }
-                else if (imgResult != null)
+                else
                 {
-                    new SymbolPreviewDialog(imgResult.ImagePreview).Show(null);
+                    var urlResult = result as UrlPreviewResult;
+                    var imgResult = result as ImagePreviewResult;
+                    if (urlResult != null)
+                    {
+                        var url = urlResult.Url;
+                        var launcher = ServiceRegistry.GetService<UrlLauncherService>();
+                        launcher.OpenUrl(url);
+                    }
+                    else if (imgResult != null)
+                    {
+                        new SymbolPreviewDialog(imgResult.ImagePreview).Show(null);
+                    }
                 }
             };
             BusyWaitDialog.Run(Strings.PrgPreparingResourcePreview, worker, onComplete);