[mapguide-commits] r6126 - in trunk/Tools/Maestro/Maestro.Base:
Commands Commands/SiteExplorer Editor Services/DragDropHandlers UI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Sep 7 06:32:51 EDT 2011
Author: jng
Date: 2011-09-07 03:32:51 -0700 (Wed, 07 Sep 2011)
New Revision: 6126
Modified:
trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
Log:
Remove the ISiteExplorer compatibility shim and fix the resulting breakage
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -48,7 +48,7 @@
if (res == System.Windows.Forms.DialogResult.OK)
{
- exp.RefreshModel();
+ exp.RefreshModel(conn.DisplayName);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -145,6 +145,9 @@
}
}
}
+ var refreshFolder = UI.SiteExplorer.GetCommonParent(itemsToPaste);
+ exp.RefreshModel(itemsToPaste.First().ConnectionName, refreshFolder);
+ exp.ExpandNode(itemsToPaste.First().ConnectionName, refreshFolder);
}
if (sourceItemsNotMoved.Count > 0)
MessageService.ShowMessage(string.Format(Properties.Resources.ItemsNotMovedDueToBeingOpen, Environment.NewLine + string.Join(Environment.NewLine, sourceItemsNotMoved.ToArray())));
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -65,8 +65,8 @@
item.Model.RaiseStructureChanged(new Aga.Controls.Tree.TreeModelEventArgs(path, new object[0]));
//Expand so user can see this new folder
- exp.ExpandNode(item.ResourceId);
- exp.SelectNode(item.ResourceId + name + "/");
+ exp.ExpandNode(conn.DisplayName, item.ResourceId);
+ exp.SelectNode(conn.DisplayName, item.ResourceId + name + "/");
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -32,7 +32,7 @@
var exp = wb.ActiveSiteExplorer;
if (exp != null)
{
- exp.RefreshModel();
+ exp.RefreshModel(exp.ConnectionName);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -59,8 +59,8 @@
LoggingService.Info("Created Folder: " + fid); //LOCALIZEME
}
}
- exp.RefreshModel(current);
- exp.ExpandNode(current);
+ exp.RefreshModel(conn.DisplayName, current);
+ exp.ExpandNode(conn.DisplayName, current);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -67,12 +67,12 @@
public override void RequestRefresh()
{
- _siteExp.RefreshModel();
+ _siteExp.RefreshModel(_editCopy.CurrentConnection.DisplayName);
}
public override void RequestRefresh(string folderId)
{
- _siteExp.RefreshModel(folderId);
+ _siteExp.RefreshModel(_editCopy.CurrentConnection.DisplayName, folderId);
}
public override void OpenResource(string resourceId)
Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -58,7 +58,7 @@
if (res == System.Windows.Forms.DialogResult.OK)
{
- exp.RefreshModel();
+ exp.RefreshModel(conn.DisplayName);
}
return false; //Already refreshed if successful
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs 2011-09-07 10:22:36 UTC (rev 6125)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs 2011-09-07 10:32:51 UTC (rev 6126)
@@ -103,38 +103,4 @@
/// </summary>
None
}
-}
-
-//This is a compatibility shim. Most existing consumers of these APIs operate based on the active connection anyway
-
-namespace Maestro.Base
-{
- using UI;
-
- internal static class SiteExplorerShims
- {
- public static void RefreshModel(this ISiteExplorer explorer)
- {
- Check.NotNull(explorer, "explorer");
- explorer.RefreshModel(explorer.ConnectionName);
- }
-
- public static void ExpandNode(this ISiteExplorer explorer, string resId)
- {
- Check.NotNull(explorer, "explorer");
- explorer.ExpandNode(explorer.ConnectionName, resId);
- }
-
- public static void FlagNode(this ISiteExplorer explorer, string resId, NodeFlagAction action)
- {
- Check.NotNull(explorer, "explorer");
- explorer.FlagNode(explorer.ConnectionName, resId, action);
- }
-
- public static void SelectNode(this ISiteExplorer explorer, string resId)
- {
- Check.NotNull(explorer, "explorer");
- explorer.SelectNode(explorer.ConnectionName, resId);
- }
- }
}
\ No newline at end of file
More information about the mapguide-commits
mailing list