[mapguide-commits] r5206 - in sandbox/maestro-3.0: Maestro.Base
Maestro.Base/UI OSGeo.MapGuide.MaestroAPI.Http
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 28 21:17:12 EDT 2010
Author: jng
Date: 2010-09-29 01:17:12 +0000 (Wed, 29 Sep 2010)
New Revision: 5206
Modified:
sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs
sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs
sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
Log:
- Pass information from HttpWebResponse to RequestDispatched (instead of the original request uri)
- Clean up root node display in Site Explorer
Modified: sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2010-09-28 16:58:23 UTC (rev 5205)
+++ sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2010-09-29 01:17:12 UTC (rev 5206)
@@ -80,67 +80,67 @@
<Compile Include="Commands\Toggle\ToggleMessagesCommand.cs" />
<Compile Include="Commands\ValidateResourceCommand.cs" />
<Compile Include="Commands\XmlEditCommand.cs" />
- <Compile Include="Commands\Editor\DrawingSourceEditor.cs">
+ <Compile Include="Editor\DrawingSourceEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\DrawingSourceEditor.Designer.cs">
+ <Compile Include="Editor\DrawingSourceEditor.Designer.cs">
<DependentUpon>DrawingSourceEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\FeatureSourceEditor.cs">
+ <Compile Include="Editor\EditorContentBase.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\FeatureSourceEditor.Designer.cs">
+ <Compile Include="Editor\EditorContentBase.Designer.cs">
+ <DependentUpon>EditorContentBase.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Editor\FeatureSourceEditor.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="Editor\FeatureSourceEditor.Designer.cs">
<DependentUpon>FeatureSourceEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\IEditorFactory.cs" />
- <Compile Include="Commands\Editor\LayerDefinitionEditor.cs">
+ <Compile Include="Editor\IEditorFactory.cs" />
+ <Compile Include="Editor\IEditorViewContent.cs" />
+ <Compile Include="Editor\LayerDefinitionEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\LayerDefinitionEditor.Designer.cs">
+ <Compile Include="Editor\LayerDefinitionEditor.Designer.cs">
<DependentUpon>LayerDefinitionEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\LoadProcedureEditor.cs">
+ <Compile Include="Editor\LoadProcedureEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\LoadProcedureEditor.Designer.cs">
+ <Compile Include="Editor\LoadProcedureEditor.Designer.cs">
<DependentUpon>LoadProcedureEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\MapDefinitionEditor.cs">
+ <Compile Include="Editor\MapDefinitionEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\MapDefinitionEditor.Designer.cs">
+ <Compile Include="Editor\MapDefinitionEditor.Designer.cs">
<DependentUpon>MapDefinitionEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\PrintLayoutEditor.cs">
+ <Compile Include="Editor\PrintLayoutEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\PrintLayoutEditor.Designer.cs">
+ <Compile Include="Editor\PrintLayoutEditor.Designer.cs">
<DependentUpon>PrintLayoutEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\ResourceEditorService.cs" />
- <Compile Include="Commands\Editor\EditorContentBase.cs">
+ <Compile Include="Editor\ResourceEditorService.cs" />
+ <Compile Include="Editor\SymbolDefinitionEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\EditorContentBase.Designer.cs">
- <DependentUpon>EditorContentBase.cs</DependentUpon>
- </Compile>
- <Compile Include="Commands\Editor\IEditorViewContent.cs" />
- <Compile Include="Commands\Editor\SymbolDefinitionEditor.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="Commands\Editor\SymbolDefinitionEditor.Designer.cs">
+ <Compile Include="Editor\SymbolDefinitionEditor.Designer.cs">
<DependentUpon>SymbolDefinitionEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\WebLayoutEditor.cs">
+ <Compile Include="Editor\WebLayoutEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\WebLayoutEditor.Designer.cs">
+ <Compile Include="Editor\WebLayoutEditor.Designer.cs">
<DependentUpon>WebLayoutEditor.cs</DependentUpon>
</Compile>
- <Compile Include="Commands\Editor\XmlEditor.cs">
+ <Compile Include="Editor\XmlEditor.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="Commands\Editor\XmlEditor.Designer.cs">
+ <Compile Include="Editor\XmlEditor.Designer.cs">
<DependentUpon>XmlEditor.cs</DependentUpon>
</Compile>
<Compile Include="Events\EventWatcher.cs" />
@@ -311,40 +311,32 @@
<None Include="Resources\MapGuide Maestro.ico" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Commands\Editor\DrawingSourceEditor.resx">
+ <EmbeddedResource Include="Editor\DrawingSourceEditor.resx">
<DependentUpon>DrawingSourceEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\EditorContentBase.resx">
+ <EmbeddedResource Include="Editor\EditorContentBase.resx">
<DependentUpon>EditorContentBase.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\FeatureSourceEditor.resx">
+ <EmbeddedResource Include="Editor\FeatureSourceEditor.resx">
<DependentUpon>FeatureSourceEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\LayerDefinitionEditor.resx">
+ <EmbeddedResource Include="Editor\LayerDefinitionEditor.resx">
<DependentUpon>LayerDefinitionEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\LoadProcedureEditor.resx">
+ <EmbeddedResource Include="Editor\LoadProcedureEditor.resx">
<DependentUpon>LoadProcedureEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\MapDefinitionEditor.resx">
+ <EmbeddedResource Include="Editor\MapDefinitionEditor.resx">
<DependentUpon>MapDefinitionEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\PrintLayoutEditor.resx">
+ <EmbeddedResource Include="Editor\PrintLayoutEditor.resx">
<DependentUpon>PrintLayoutEditor.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\WebLayoutEditor.resx">
+ <EmbeddedResource Include="Editor\WebLayoutEditor.resx">
<DependentUpon>WebLayoutEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Commands\Editor\XmlEditor.resx">
+ <EmbeddedResource Include="Editor\XmlEditor.resx">
<DependentUpon>XmlEditor.cs</DependentUpon>
- <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Modified: sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs 2010-09-28 16:58:23 UTC (rev 5205)
+++ sandbox/maestro-3.0/Maestro.Base/UI/RepositoryTreeModel.cs 2010-09-29 01:17:12 UTC (rev 5206)
@@ -304,7 +304,7 @@
public string GetToolTip(TreeNodeAdv node, Aga.Controls.Tree.NodeControls.NodeControl nodeControl)
{
RepositoryItem item = node.Tag as RepositoryItem;
- if (item != null)
+ if (item != null && !item.IsRoot)
{
return string.Format(Properties.Resources.SITE_EXPLORER_TOOLTIP_TEMPLATE, Environment.NewLine, item.Name, item.ResourceType, item.CreatedDate, item.ModifiedDate, item.Owner);
}
@@ -320,13 +320,15 @@
{
private RepositoryItem _rootNode;
private TreeViewAdv _tree;
+ private string _connectionName;
private IServerConnection _conn;
- public RepositoryTreeModel(IServerConnection conn, TreeViewAdv tree)
+ public RepositoryTreeModel(IServerConnection conn, TreeViewAdv tree, string connName)
{
_conn = conn;
_tree = tree;
+ _connectionName = connName;
}
private System.Collections.IEnumerable GetSorted(ResourceList list)
@@ -363,6 +365,7 @@
throw new InvalidOperationException(); //Huh?
}
_rootNode = new RepositoryItem((IRepositoryItem)list.Items[0]);
+ _rootNode.Name = _connectionName;
_rootNode.Model = this;
yield return _rootNode;
}
Modified: sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs 2010-09-28 16:58:23 UTC (rev 5205)
+++ sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs 2010-09-29 01:17:12 UTC (rev 5206)
@@ -79,7 +79,7 @@
var mgr = ServiceRegistry.GetService<ServerConnectionManager>();
_conn = mgr.GetConnection(this.ConnectionName);
- _model = new RepositoryTreeModel(_conn, trvResources);
+ _model = new RepositoryTreeModel(_conn, trvResources, this.ConnectionName);
trvResources.Model = _model;
}
Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs 2010-09-28 16:58:23 UTC (rev 5205)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs 2010-09-29 01:17:12 UTC (rev 5206)
@@ -1296,8 +1296,8 @@
var httpreq = HttpWebRequest.Create(req);
if (_cred != null)
httpreq.Credentials = _cred;
- var httpresp = httpreq.GetResponse();
- OnRequestDispatched(req);
+ var httpresp = (HttpWebResponse)httpreq.GetResponse();
+ OnRequestDispatched(string.Format("{0:d} {1} {2} {3}", httpresp.StatusCode, httpresp.StatusDescription, httpresp.Method, httpresp.ResponseUri));
return httpresp.GetResponseStream();
}
catch (Exception ex)
More information about the mapguide-commits
mailing list