[mapguide-commits] r7009 - in trunk/Tools/Maestro: Maestro.AddIn.Scripting/UI Maestro.Base/Commands/SiteExplorer Maestro.Base/Editor Maestro.Editors Maestro.Editors/Common Maestro.Editors/Diff Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors Maestro.Editors/Fusion Maestro.Editors/Fusion/WidgetEditors Maestro.Editors/Generic Maestro.Editors/Generic/XmlEditor Maestro.Editors/MapDefinition Maestro.Editors/MapDefinition/Live Maestro.Editors/SymbolDefinition Maestro.Packaging MaestroAPITestRunner MgCooker OSGeo.MapGuide.ExtendedObjectModels OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Commands OSGeo.MapGuide.MaestroAPI/Exceptions OSGeo.MapGuide.MaestroAPI/Feature OSGeo.MapGuide.MaestroAPI/Internal OSGeo.MapGuide.MaestroAPI/Mapping OSGeo.MapGuide.MaestroAPI/ObjectModels OSGeo.MapGuide.MaestroAPI/Resource/Comparison OSGeo.MapGuide.MaestroAPI/Services OSGeo.MapGuide.MaestroAPI.Native OSGeo.MapGuide.MaestroAPI.Native/Commands RtMapInspector RtMapInspector/Properties Thirdparty/Sha rpDevelop/ICSharpCode.Core.WinForms Thirdparty/SharpDevelop/ICSharpCode.TextEditor
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 13 06:37:14 PDT 2012
Author: jng
Date: 2012-09-13 06:37:14 -0700 (Thu, 13 Sep 2012)
New Revision: 7009
Added:
trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
trunk/Tools/Maestro/RtMapInspector/Strings.resx
Removed:
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditorDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs
trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.resx
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.designer.cs
trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs
trunk/Tools/Maestro/MgCooker/SetupRun.cs
trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs
trunk/Tools/Maestro/MgCooker/SetupRun.resx
trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
trunk/Tools/Maestro/RtMapInspector/MainForm.cs
trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
trunk/Tools/Maestro/RtMapInspector/Properties/Resources.resx
trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj
Log:
#2110: Localization cleanup for RtMapInspector. Also giving Visual Studio 2012 Express a test run, fixing 300 odd compiler warnings that it reported.
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronTextBox.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -829,7 +829,7 @@
engine.Runtime.IO.SetOutput(new IPEStreamWrapper(IPEStreamWrapper.IPEngineResponse), engine.Runtime.IO.InputEncoding);
//Create a temp object to use
- object tempobject;
+ //object tempobject;
//Begin IronTextBox evaluation if something there....
if (command != string.Empty)
@@ -923,11 +923,10 @@
//Need to do a ReadStatement...
try
{
- bool isMultiLine = false;
- int autoIndentSize = 0;
+ //bool isMultiLine = false;
int numberOfBlankLines = 0;
object ExecWrapper = null;
- bool result;
+ //bool result;
string line = command;
if (line == null)
@@ -936,15 +935,13 @@
{
//Ops.Call(ExecWrapper, new object[] { null });//not needed for IP2?
}
- result = false;
+ //result = false;
}
defBuilder.Append(line);
defBuilder.Append("\r\n"); //NOXLATE
bool endOfInput = (line.Length == 0);
- bool parsingMultiLineString;
- bool parsingMultiLineCmpdStmt;
//old//s = ParsetheText(consoleTextBox.global_eng.Sys, new CompilerContext(), defBuilder.ToString(), endOfInput, out parsingMultiLineString, out isMultiLine);
string[] seperators = new string[] { "\r" }; //NOXLATE
@@ -960,11 +957,11 @@
{
// Note that splitting a string literal over multiple lines does not
// constitute a multi-line statement.
- isMultiLine = true;
+ //isMultiLine = true;
}
//autoIndentSize = Parser.GetNextAutoIndentSize(defBuilder.ToString(), autoIndentSize);//Not needed in IP2?
- result = true;
+ //result = true;
}
catch
{
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -299,7 +299,6 @@
public event RequestEventHandler RequestDispatched;
-
public event EventHandler SessionIDChanged;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditorDialog.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditorDialog.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -91,13 +91,15 @@
private set;
}
- private bool _enableResourceTypeValidation = false;
-
+ /// <summary>
+ /// Sets the XML content and the type of resource this XML content is supposed to represent
+ /// </summary>
+ /// <param name="xml"></param>
+ /// <param name="type"></param>
public void SetXmlContent(string xml, ResourceTypes type)
{
_ed.XmlContent = xml;
this.ResourceType = type;
- _enableResourceTypeValidation = true;
}
private string _lastSnapshot;
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -32,25 +32,44 @@
namespace Maestro.Editors.Common
{
+ /// <summary>
+ /// A control that provides a tree-based view of the repository
+ /// </summary>
public partial class RepositoryView : UserControl
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public RepositoryView()
{
InitializeComponent();
}
+ /// <summary>
+ /// Raises the Load event
+ /// </summary>
+ /// <param name="e"></param>
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
RepositoryIcons.PopulateImageList(resImageList);
}
+ /// <summary>
+ /// Navigates to the given folder, expanding any parent nodes along the way
+ /// </summary>
+ /// <param name="folderId"></param>
public void NavigateTo(string folderId)
{
if (_model != null)
_model.NavigateTo(folderId);
}
+ /// <summary>
+ /// Initializes this view
+ /// </summary>
+ /// <param name="resSvc"></param>
+ /// <param name="bFoldersOnly"></param>
public void Init(IResourceService resSvc, bool bFoldersOnly)
{
if (_model != null)
@@ -71,6 +90,9 @@
private RepositoryFolderTreeModel _model;
+ /// <summary>
+ /// Gets the currently selected item
+ /// </summary>
public IRepositoryItem SelectedItem
{
get
@@ -85,12 +107,26 @@
}
}
+ /// <summary>
+ /// Raised when a repository item is selected
+ /// </summary>
public event EventHandler ItemSelected;
+ /// <summary>
+ /// Adds a resource type to filter on
+ /// </summary>
+ /// <param name="rt"></param>
public void AddResourceTypeFilter(ResourceTypes rt) { if (_model != null) _model.AddResourceTypeFilter(rt); }
+ /// <summary>
+ /// Clears all applied resource type filters
+ /// </summary>
public void ClearResourceTypeFilters() { if (_model != null) _model.ClearResourceTypeFilters(); }
+ /// <summary>
+ /// Gets whether this view has resource type filters applied
+ /// </summary>
+ /// <returns></returns>
public bool HasFilteredTypes()
{
if (_model != null)
@@ -99,6 +135,10 @@
return false;
}
+ /// <summary>
+ /// Refreshes the model of the repostiory from the specified folder id
+ /// </summary>
+ /// <param name="folderId"></param>
public void RefreshModel(string folderId)
{
if (_model != null)
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -115,12 +115,24 @@
return true;
}
+ /// <summary>
+ ///
+ /// </summary>
public event EventHandler<TreeModelEventArgs> NodesChanged;
+ /// <summary>
+ ///
+ /// </summary>
public event EventHandler<TreeModelEventArgs> NodesInserted;
+ /// <summary>
+ ///
+ /// </summary>
public event EventHandler<TreeModelEventArgs> NodesRemoved;
+ /// <summary>
+ ///
+ /// </summary>
public event EventHandler<TreePathEventArgs> StructureChanged;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -34,8 +34,14 @@
namespace Maestro.Editors.Diff
{
+ /// <summary>
+ /// Displays a visual comparison of two bodies of text
+ /// </summary>
public partial class TextDiffView : Form
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public TextDiffView()
{
InitializeComponent();
@@ -43,6 +49,9 @@
const string NumFormat = "00000";
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public TextDiffView(TextFileDiffList source, TextFileDiffList destination, List<DiffResultSpan> DiffLines, double seconds)
: this()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -153,7 +153,9 @@
OnConnectionChanged();
}
-
+ /// <summary>
+ /// Raised when a resource document reset is required
+ /// </summary>
public event EventHandler RequestDocumentReset;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -30,7 +30,7 @@
namespace Maestro.Editors.Fusion
{
[ToolboxItem(false)]
- public partial class MenuCtrl : UserControl
+ internal partial class MenuCtrl : UserControl
{
private MenuCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -29,8 +29,14 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
+ /// <summary>
+ /// Displays information about the widget and describes its extension parameters
+ /// </summary>
public partial class WidgetInfoDialog : Form
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public WidgetInfoDialog(IWidgetInfo info)
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -317,7 +317,7 @@
}
}
- public class TextRange : AbstractSegment
+ internal class TextRange : AbstractSegment
{
IDocument _document;
public TextRange(IDocument document, int offset, int length)
@@ -330,7 +330,7 @@
/// <summary>This class finds occurrances of a search string in a text
/// editor's IDocument... it's like Find box without a GUI.</summary>
- public class TextEditorSearcher : IDisposable
+ internal class TextEditorSearcher : IDisposable
{
IDocument _document;
public IDocument Document
@@ -420,9 +420,11 @@
/// <summary>Finds next instance of LookFor, according to the search rules
/// (MatchCase, MatchWholeWordOnly).</summary>
/// <param name="beginAtOffset">Offset in Document at which to begin the search</param>
+ /// <param name="searchBackward"></param>
+ /// <param name="loopedAround"></param>
/// <remarks>If there is a match at beginAtOffset precisely, it will be returned.</remarks>
/// <returns>Region of document that matches the search string</returns>
- public TextRange FindNext(int beginAtOffset, bool searchBackward, out bool loopedAround)
+ internal TextRange FindNext(int beginAtOffset, bool searchBackward, out bool loopedAround)
{
Debug.Assert(!string.IsNullOrEmpty(_lookFor));
loopedAround = false;
@@ -512,7 +514,7 @@
/// <summary>Bundles a group of markers together so that they can be cleared
/// together.</summary>
- public class HighlightGroup : IDisposable
+ internal class HighlightGroup : IDisposable
{
List<TextMarker> _markers = new List<TextMarker>();
TextEditorControl _editor;
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -34,6 +34,9 @@
[ToolboxItem(false)]
public class XmlTextEditorControl : TextEditorControl
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public XmlTextEditorControl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -29,7 +29,7 @@
namespace Maestro.Editors.MapDefinition.Live
{
- public partial class NewGroupDialog : Form
+ internal partial class NewGroupDialog : Form
{
private RuntimeMap _map;
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -34,14 +34,23 @@
namespace Maestro.Editors.MapDefinition
{
+ /// <summary>
+ /// A Live Map Definition editor control
+ /// </summary>
[ToolboxItem(true)]
public partial class LiveMapDefinitionEditorCtrl : EditorBase
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public LiveMapDefinitionEditorCtrl()
{
InitializeComponent();
}
+ /// <summary>
+ /// Gets the editor service
+ /// </summary>
public IEditorService EditorService
{
get;
@@ -58,17 +67,32 @@
_rtMap.UpdateMapDefinition(_shadowCopy);
}
+ /// <summary>
+ /// Gets the map definiton that's being edited
+ /// </summary>
+ /// <returns></returns>
public IMapDefinition GetMapDefinition()
{
return _shadowCopy;
}
+ /// <summary>
+ /// Gets or sets whether to convert tiled groups to untiled groups
+ /// </summary>
+ /// <remarks>
+ /// This property is a workaround for the fact that the map viewer currently does not support rendering of tiled
+ /// layers. It is recommended to set this property to true, otherwise such layers and groups are not visible on
+ /// the live preview
+ /// </remarks>
public bool ConvertTiledGroupsToNonTiled
{
get { return viewer.ConvertTiledGroupsToNonTiled; }
set { viewer.ConvertTiledGroupsToNonTiled = value; }
}
+ /// <summary>
+ /// Refreshes the viewer
+ /// </summary>
public void RefreshMap()
{
viewer.RefreshMap();
@@ -78,6 +102,10 @@
private IMapDefinition _shadowCopy;
private IMappingService _mapSvc;
+ /// <summary>
+ /// Binds the specified editor service to this editor
+ /// </summary>
+ /// <param name="service"></param>
public override void Bind(IEditorService service)
{
this.EditorService = service;
@@ -138,7 +166,7 @@
private void repoView_RequestEdit(object sender, EventArgs e)
{
- MessageBox.Show("Not implemented yet");
+ MessageBox.Show(Strings.FeatureNotImplemented);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -28,10 +28,13 @@
namespace Maestro.Editors.MapDefinition
{
/// <summary>
- /// Description of LiveMapEditorDrawOrder.
+ /// A Live Map Editor component that displays the layers of the currently edited map by draw order
/// </summary>
public partial class LiveMapEditorDrawOrder : UserControl
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public LiveMapEditorDrawOrder()
{
InitializeComponent();
@@ -42,6 +45,9 @@
private RuntimeMap _map;
private IMapViewer _viewer;
+ /// <summary>
+ /// Gets or sets the viewer instance
+ /// </summary>
public IMapViewer Viewer
{
get { return _viewer; }
@@ -129,8 +135,14 @@
}
}
+ /// <summary>
+ /// Raised when a layer's draw order has changed
+ /// </summary>
public event LayerEventHandler LayerChanged;
+ /// <summary>
+ /// Raised when a layer has been removed from this view
+ /// </summary>
public event LayerEventHandler LayerDeleted;
private void btnUp_Click(object sender, EventArgs e)
@@ -180,5 +192,10 @@
}
}
+ /// <summary>
+ /// Represents a method that handles events relating to layer manipulation
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="layer"></param>
public delegate void LayerEventHandler(object sender, RuntimeMapLayer layer);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -33,10 +33,13 @@
namespace Maestro.Editors.MapDefinition
{
/// <summary>
- /// Description of LiveMapEditorLegend.
+ /// A Live Map Editor component that displays the legend of the currently edited map
/// </summary>
public partial class LiveMapEditorLegend : UserControl
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public LiveMapEditorLegend()
{
InitializeComponent();
@@ -50,10 +53,19 @@
h(this, e);
}
+ /// <summary>
+ /// Raised when a node in the legend is deleted
+ /// </summary>
public event NodeEventHandler NodeDeleted;
+ /// <summary>
+ /// Raised when a node in the legend is selected
+ /// </summary>
public event NodeEventHandler NodeSelected;
+ /// <summary>
+ /// Gets or sets the associated map viewer
+ /// </summary>
public IMapViewer Viewer
{
get { return legendCtrl.Viewer; }
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -32,13 +32,24 @@
namespace Maestro.Editors.MapDefinition
{
+ /// <summary>
+ /// A Live Map Editor component that provides a view into the currently edited map's resource repository
+ /// </summary>
public partial class LiveMapEditorRepositoryView : UserControl
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public LiveMapEditorRepositoryView()
{
InitializeComponent();
}
+ /// <summary>
+ /// Initializes this view
+ /// </summary>
+ /// <param name="resSvc"></param>
+ /// <param name="filteredTypes"></param>
public void Init(IResourceService resSvc, ResourceTypes[] filteredTypes)
{
repoView.Init(resSvc, false);
@@ -66,10 +77,19 @@
h(this, EventArgs.Empty);
}
+ /// <summary>
+ /// Raised when the currently selected item is requested to be added to the currently edited map
+ /// </summary>
public event EventHandler RequestAddToMap;
+ /// <summary>
+ /// Raised when the currently selected item is requested to be edited
+ /// </summary>
public event EventHandler RequestEdit;
+ /// <summary>
+ /// Gets the selected item in the repository
+ /// </summary>
public IRepositoryItem SelectedItem
{
get { return repoView.SelectedItem; }
Modified: trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -482,8 +482,16 @@
get { return _conn.Capabilities.SupportedServices; }
}
+ /// <summary>
+ /// Runs the specified process with the given arguments
+ /// </summary>
+ /// <param name="processName"></param>
+ /// <param name="args"></param>
public abstract void RunProcess(string processName, params string[] args);
+ /// <summary>
+ /// Performs processing before a resource preview is generated
+ /// </summary>
public void PrePreviewProcess()
{
SyncSessionCopy();
@@ -492,6 +500,9 @@
handler(this, EventArgs.Empty);
}
+ /// <summary>
+ /// Raised when processing is required before a preview is generated
+ /// </summary>
public event EventHandler BeforePreview;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -608,6 +608,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to This feature is not implemented yet.
+ /// </summary>
+ internal static string FeatureNotImplemented {
+ get {
+ return ResourceManager.GetString("FeatureNotImplemented", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to This field is required: {0}.
/// </summary>
internal static string FieldRequired {
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2012-09-13 13:37:14 UTC (rev 7009)
@@ -3192,4 +3192,7 @@
<data name="XmlEditorCursorTemplate" xml:space="preserve">
<value>Line {0}, Column {1}</value>
</data>
+ <data name="FeatureNotImplemented" xml:space="preserve">
+ <value>This feature is not implemented yet</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -28,8 +28,14 @@
namespace Maestro.Editors.SymbolDefinition
{
+ /// <summary>
+ /// Displays an image of a symbol definition preview
+ /// </summary>
public partial class SymbolPreviewDialog : Form
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public SymbolPreviewDialog(Image img)
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -62,6 +62,7 @@
{
service.RegisterCustomNotifier(this);
_sym = (ISimpleSymbolDefinition)service.GetEditedResource();
+ _edSvc = service;
_pu = _sym.PointUsage;
_lu = _sym.LineUsage;
Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.designer.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.designer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -113,7 +113,7 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label OperationLabel;
private System.Windows.Forms.Button CancelBtn;
- public System.Windows.Forms.ProgressBar CurrentProgress;
+ private System.Windows.Forms.ProgressBar CurrentProgress;
private System.ComponentModel.BackgroundWorker backgroundWorker;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/MaestroAPITestRunner.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -53,6 +53,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit-console-runner, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -58,7 +58,13 @@
Assembly.LoadFrom("MGOS22\\OSGeo.MapGuide.MapGuideCommon.dll");
Assembly.LoadFrom("MGOS22\\OSGeo.MapGuide.Web.dll");
*/
- NUnit.ConsoleRunner.Runner.Main(args);
+ var runnerArgs = new string[1];
+ if (args.Length == 1)
+ runnerArgs[0] = args[0];
+ else
+ runnerArgs[0] = "MaestroAPITests.dll";
+
+ NUnit.ConsoleRunner.Runner.Main(runnerArgs);
}
}
}
Modified: trunk/Tools/Maestro/MgCooker/SetupRun.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -43,6 +43,8 @@
private SetupRun()
{
InitializeComponent();
+ MapAgent.Text = "http://localhost/mapguide/mapagent/mapagent.fcgi";
+ Username.Text = "Anonymous";
}
internal SetupRun(string userName, string password, IServerConnection connection, string[] maps, Dictionary<string, string> args)
@@ -57,62 +59,62 @@
{
m_connection = connection;
- grpDifferentConnection.Enabled = chkUseDifferentConnection.Enabled = !m_connection.ProviderName.ToUpper().Equals("MAESTRO.LOCAL");
+ grpDifferentConnection.Enabled = chkUseDifferentConnection.Enabled = !m_connection.ProviderName.ToUpper().Equals("MAESTRO.LOCAL"); //NOXLATE
m_commandlineargs = args;
m_coordinateOverrides = new Dictionary<string, IEnvelope>();
//HttpServerConnection hc = connection as HttpServerConnection;
try
{
- var url = connection.GetCustomProperty("BaseUrl");
+ var url = connection.GetCustomProperty("BaseUrl"); //NOXLATE
if (url != null)
MapAgent.Text = url.ToString();
}
catch { }
- if (m_commandlineargs.ContainsKey("mapdefinitions"))
- m_commandlineargs.Remove("mapdefinitions");
- if (m_commandlineargs.ContainsKey("scaleindex"))
- m_commandlineargs.Remove("scaleindex");
- if (m_commandlineargs.ContainsKey("basegroups"))
- m_commandlineargs.Remove("basegroups");
+ if (m_commandlineargs.ContainsKey("mapdefinitions")) //NOXLATE
+ m_commandlineargs.Remove("mapdefinitions"); //NOXLATE
+ if (m_commandlineargs.ContainsKey("scaleindex")) //NOXLATE
+ m_commandlineargs.Remove("scaleindex"); //NOXLATE
+ if (m_commandlineargs.ContainsKey("basegroups")) //NOXLATE
+ m_commandlineargs.Remove("basegroups"); //NOXLATE
- if (m_commandlineargs.ContainsKey("mapagent"))
- MapAgent.Text = m_commandlineargs["mapagent"];
- if (m_commandlineargs.ContainsKey("username"))
- Username.Text = m_commandlineargs["username"];
- if (m_commandlineargs.ContainsKey("password"))
- Password.Text = m_commandlineargs["password"];
+ if (m_commandlineargs.ContainsKey("mapagent")) //NOXLATE
+ MapAgent.Text = m_commandlineargs["mapagent"]; //NOXLATE
+ if (m_commandlineargs.ContainsKey("username")) //NOXLATE
+ Username.Text = m_commandlineargs["username"]; //NOXLATE
+ if (m_commandlineargs.ContainsKey("password")) //NOXLATE
+ Password.Text = m_commandlineargs["password"]; //NOXLATE
- if (m_commandlineargs.ContainsKey("native-connection"))
+ if (m_commandlineargs.ContainsKey("native-connection")) //NOXLATE
UseNativeAPI.Checked = true;
- if (m_commandlineargs.ContainsKey("limitrows"))
+ if (m_commandlineargs.ContainsKey("limitrows")) //NOXLATE
{
int i;
- if (int.TryParse(m_commandlineargs["limitrows"], out i) && i > 0)
+ if (int.TryParse(m_commandlineargs["limitrows"], out i) && i > 0) //NOXLATE
{
MaxRowLimit.Value = i;
TilesetLimitPanel.Enabled = true;
}
}
- if (m_commandlineargs.ContainsKey("limitcols"))
+ if (m_commandlineargs.ContainsKey("limitcols")) //NOXLATE
{
int i;
- if (int.TryParse(m_commandlineargs["limitcols"], out i) && i > 0)
+ if (int.TryParse(m_commandlineargs["limitcols"], out i) && i > 0) //NOXLATE
{
MaxColLimit.Value = i;
TilesetLimitPanel.Enabled = true;
}
}
- if (m_commandlineargs.ContainsKey("metersperunit"))
+ if (m_commandlineargs.ContainsKey("metersperunit")) //NOXLATE
{
double d;
if (
- double.TryParse(m_commandlineargs["metersperunit"], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.CurrentUICulture, out d)
- || double.TryParse(m_commandlineargs["metersperunit"], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out d)
+ double.TryParse(m_commandlineargs["metersperunit"], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.CurrentUICulture, out d) //NOXLATE
+ || double.TryParse(m_commandlineargs["metersperunit"], System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out d) //NOXLATE
)
if (d >= (double)MetersPerUnit.Minimum && d <= (double)MetersPerUnit.Maximum)
{
@@ -124,7 +126,7 @@
if (maps == null || maps.Length == 0 || (maps.Length == 1 && maps[0].Trim().Length == 0))
{
List<string> tmp = new List<string>();
- foreach (ResourceListResourceDocument doc in m_connection.ResourceService.GetRepositoryResources("Library://", "MapDefinition").Items)
+ foreach (ResourceListResourceDocument doc in m_connection.ResourceService.GetRepositoryResources(StringConstants.RootIdentifier, ResourceTypes.MapDefinition.ToString()).Items)
tmp.Add(doc.ResourceId);
maps = tmp.ToArray();
}
@@ -182,7 +184,7 @@
{
if (UseNativeAPI.Checked)
{
- string webconfig = System.IO.Path.Combine(Application.StartupPath, "webconfig.ini");
+ string webconfig = System.IO.Path.Combine(Application.StartupPath, "webconfig.ini"); //NOXLATE
if (!System.IO.File.Exists(webconfig))
{
MessageBox.Show(this, string.Format(Strings.MissingWebConfigFile, webconfig), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -193,11 +195,11 @@
{
var initP = new NameValueCollection();
- initP["ConfigFile"] = webconfig;
- initP["Username"] = Username.Text;
- initP["Password"] = Password.Text;
+ initP["ConfigFile"] = webconfig; //NOXLATE
+ initP["Username"] = Username.Text; //NOXLATE
+ initP["Password"] = Password.Text; //NOXLATE
- con = ConnectionProviderRegistry.CreateConnection("Maestro.LocalNative", initP);
+ con = ConnectionProviderRegistry.CreateConnection("Maestro.LocalNative", initP); //NOXLATE
}
catch (Exception ex)
{
@@ -212,12 +214,12 @@
{
var initP = new NameValueCollection();
- initP["Url"] = MapAgent.Text;
- initP["Username"] = Username.Text;
- initP["Password"] = Password.Text;
- initP["AllowUntestedVersion"] = "true";
+ initP["Url"] = MapAgent.Text; //NOXLATE
+ initP["Username"] = Username.Text; //NOXLATE
+ initP["Password"] = Password.Text; //NOXLATE
+ initP["AllowUntestedVersion"] = "true"; //NOXLATE
- con = ConnectionProviderRegistry.CreateConnection("Maestro.Http", initP);
+ con = ConnectionProviderRegistry.CreateConnection("Maestro.Http", initP); //NOXLATE
}
catch (Exception ex)
{
@@ -313,58 +315,58 @@
private void button3_Click(object sender, EventArgs e)
{
if (System.Environment.OSVersion.Platform == PlatformID.Unix)
- saveFileDialog1.Filter =
- string.Format(Strings.FileTypeShellScript + "|{0}", "*.sh") +
- string.Format(Strings.FileTypeAllFiles + "|{0}", "*.*");
+ saveFileDialog1.Filter =
+ string.Format(Strings.FileTypeShellScript + "|{0}", "*.sh") + //NOXLATE
+ string.Format(Strings.FileTypeAllFiles + "|{0}", "*.*"); //NOXLATE
if (saveFileDialog1.ShowDialog(this) == DialogResult.OK)
{
StringBuilder args = new StringBuilder();
- args.Append("--mapagent=\"" + MapAgent.Text + "\" ");
- args.Append("--username=\"" + Username.Text + "\" ");
- args.Append("--password=\"" + Password.Text + "\" ");
+ args.Append("--mapagent=\"" + MapAgent.Text + "\" "); //NOXLATE
+ args.Append("--username=\"" + Username.Text + "\" "); //NOXLATE
+ args.Append("--password=\"" + Password.Text + "\" "); //NOXLATE
if (LimitTileset.Checked)
{
if (MaxRowLimit.Value > 0)
- args.Append("--limitrows=\"" + ((int)MaxRowLimit.Value).ToString() + "\" ");
+ args.Append("--limitrows=\"" + ((int)MaxRowLimit.Value).ToString() + "\" "); //NOXLATE
if (MaxColLimit.Value > 0)
- args.Append("--limitcols=\"" + ((int)MaxColLimit.Value).ToString() + "\" ");
+ args.Append("--limitcols=\"" + ((int)MaxColLimit.Value).ToString() + "\" "); //NOXLATE
}
if (UseNativeAPI.Checked)
- args.Append("--native-connection ");
+ args.Append("--native-connection "); //NOXLATE
if (UseOfficialMethod.Checked)
- args.Append("--metersperunit=" + ((double)MetersPerUnit.Value).ToString(System.Globalization.CultureInfo.InvariantCulture) + " ");
+ args.Append("--metersperunit=" + ((double)MetersPerUnit.Value).ToString(System.Globalization.CultureInfo.InvariantCulture) + " "); //NOXLATE
- args.Append("--threadcount=" + ((int)ThreadCount.Value).ToString() + " ");
+ args.Append("--threadcount=" + ((int)ThreadCount.Value).ToString() + " "); //NOXLATE
if (RandomTileOrder.Checked)
- args.Append("--random-tile-order ");
+ args.Append("--random-tile-order "); //NOXLATE
string executable = System.IO.Path.GetFileName(System.Reflection.Assembly.GetExecutingAssembly().Location);
//Windows has problems with console output from GUI applications...
- if (System.Environment.OSVersion.Platform != PlatformID.Unix && executable == "MgCooker.exe" && System.IO.File.Exists(System.IO.Path.Combine(Application.StartupPath, "MgCookerCommandline.exe")))
- executable = System.IO.Path.Combine(Application.StartupPath, "MgCookerCommandline.exe");
+ if (System.Environment.OSVersion.Platform != PlatformID.Unix && executable == "MgCooker.exe" && System.IO.File.Exists(System.IO.Path.Combine(Application.StartupPath, "MgCookerCommandline.exe"))) //NOXLATE
+ executable = System.IO.Path.Combine(Application.StartupPath, "MgCookerCommandline.exe"); //NOXLATE
else
executable = System.IO.Path.Combine(Application.StartupPath, executable);
string exeName = System.IO.Path.GetFileName(executable);
string exePath = System.IO.Path.GetDirectoryName(executable);
- executable = "\"" + executable + "\"";
+ executable = "\"" + executable + "\""; //NOXLATE
using (System.IO.StreamWriter sw = new System.IO.StreamWriter(saveFileDialog1.FileName))
{
if (System.Environment.OSVersion.Platform == PlatformID.Unix)
{
- sw.WriteLine("#!/bin/sh");
- executable = "mono " + executable;
+ sw.WriteLine("#!/bin/sh"); //NOXLATE
+ executable = "mono " + executable; //NOXLATE
}
else
{
- sw.WriteLine("@echo off");
+ sw.WriteLine("@echo off"); //NOXLATE
}
//If on windows, wrap the exe call in a pushd/popd so that the executable is
@@ -373,7 +375,7 @@
if (System.Environment.OSVersion.Platform != PlatformID.MacOSX ||
System.Environment.OSVersion.Platform != PlatformID.Unix)
{
- sw.WriteLine("pushd \"" + exePath + "\"");
+ sw.WriteLine("pushd \"" + exePath + "\""); //NOXLATE
}
foreach (Config c in ReadTree())
@@ -387,28 +389,29 @@
{
sw.Write(executable);
}
- sw.Write(" batch");
- sw.Write(" --mapdefinitions=\"");
+ sw.Write(" batch"); //NOXLATE
+ sw.Write(" --mapdefinitions=\""); //NOXLATE
sw.Write(c.MapDefinition);
- sw.Write("\" --basegroups=\"");
+ sw.Write("\" --basegroups=\""); //NOXLATE
sw.Write(c.Group);
- sw.Write("\" --scaleindex=");
+ sw.Write("\" --scaleindex="); //NOXLATE
for (int i = 0; i < c.ScaleIndexes.Length; i++)
{
if (i != 0)
- sw.Write(",");
+ sw.Write(","); //NOXLATE
sw.Write(c.ScaleIndexes[i].ToString());
}
- sw.Write(" "); // dont forget the space after the list of scaleindexes ticket #1316
+ // dont forget the space after the list of scaleindexes ticket #1316
+ sw.Write(" "); //NOXLATE
if (c.ExtentOverride != null)
{
- sw.Write(" --extentoverride=");
+ sw.Write(" --extentoverride="); //NOXLATE
sw.Write(c.ExtentOverride.MinX.ToString(System.Globalization.CultureInfo.InvariantCulture));
- sw.Write(",");
+ sw.Write(","); //NOXLATE
sw.Write(c.ExtentOverride.MinY.ToString(System.Globalization.CultureInfo.InvariantCulture));
- sw.Write(",");
+ sw.Write(","); //NOXLATE
sw.Write(c.ExtentOverride.MaxX.ToString(System.Globalization.CultureInfo.InvariantCulture));
- sw.Write(",");
+ sw.Write(","); //NOXLATE
sw.Write(c.ExtentOverride.MaxY.ToString(System.Globalization.CultureInfo.InvariantCulture));
}
@@ -419,7 +422,7 @@
if (System.Environment.OSVersion.Platform != PlatformID.MacOSX ||
System.Environment.OSVersion.Platform != PlatformID.Unix)
{
- sw.WriteLine("popd");
+ sw.WriteLine("popd"); //NOXLATE
}
}
}
Modified: trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.designer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -53,7 +53,6 @@
this.chkUseDifferentConnection = new System.Windows.Forms.CheckBox();
this.UseNativeAPI = new System.Windows.Forms.CheckBox();
this.Password = new System.Windows.Forms.TextBox();
- this.Username = new System.Windows.Forms.TextBox();
this.MapAgent = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
@@ -74,6 +73,7 @@
this.MaxColLimit = new System.Windows.Forms.NumericUpDown();
this.label7 = new System.Windows.Forms.Label();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+ this.Username = new System.Windows.Forms.TextBox();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.BoundsOverride.SuspendLayout();
@@ -259,12 +259,6 @@
this.toolTip1.SetToolTip(this.Password, resources.GetString("Password.ToolTip"));
this.Password.UseSystemPasswordChar = true;
//
- // Username
- //
- resources.ApplyResources(this.Username, "Username");
- this.Username.Name = "Username";
- this.toolTip1.SetToolTip(this.Username, resources.GetString("Username.ToolTip"));
- //
// MapAgent
//
resources.ApplyResources(this.MapAgent, "MapAgent");
@@ -421,6 +415,12 @@
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
//
+ // Username
+ //
+ resources.ApplyResources(this.Username, "Username");
+ this.Username.Name = "Username";
+ this.toolTip1.SetToolTip(this.Username, resources.GetString("Username.ToolTip"));
+ //
// SetupRun
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -464,7 +464,6 @@
private System.Windows.Forms.GroupBox grpDifferentConnection;
private System.Windows.Forms.CheckBox UseNativeAPI;
private System.Windows.Forms.TextBox Password;
- private System.Windows.Forms.TextBox Username;
private System.Windows.Forms.TextBox MapAgent;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
@@ -497,5 +496,6 @@
private System.Windows.Forms.Button ResetBounds;
private System.Windows.Forms.Label ModfiedOverrideWarning;
private System.Windows.Forms.CheckBox chkUseDifferentConnection;
+ private System.Windows.Forms.TextBox Username;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/MgCooker/SetupRun.resx
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.resx 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.resx 2012-09-13 13:37:14 UTC (rev 7009)
@@ -238,61 +238,61 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACC
- DAAAAk1TRnQBSQFMAgEBBAEAAVQBAAFUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB+
+ DAAAAk1TRnQBSQFMAgEBBAEAAVwBAAFcAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AKgADHAEoAyQBNgMk
ATYDJAE2AyQBNgMkATYDJAE2AyQBNgMkATYDJAE2AyQBNgMkATYDGwEmHAADFgEeAVsCWAHGAx0BKgMC
- AQOgAAP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wMbASYcAAGG
- Am0B9wH0AeYB4QH/AccBugG5Af0BjAGEAYMB+QFNAkwBkQMRAReYAAP9Af8B9QHoAeQB/wH0AeUB4AH/
+ AQOgAAP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wP9Af8D/QH/A/0B/wMbASYcAAGF
+ Am0B9wH0AeYB4QH/AcQBuQG4Af0BiwGDAYIB+QFNAkwBkQMRAReYAAP9Af8B9QHoAeQB/wH0AeUB4AH/
AfIB4gHdAf8B8QHgAdkB/wHwAd0B1gH/Ae8B2wHTAf8B7gHZAdEB/wHuAdgB0AH/Ae4B2AHQAf8B7gHY
AdAB/wP9Af8DGwEmGAABLAIrAUMB9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/
- AaYBmQGVAfoBaAJaAfABNgI1AVgDCwEPDAADHQEqAx0BKiAAAwUBBwMdASoDHQEqTAAD/QH/AfcB7QHp
- Af8B9gHqAeYB/wH0AecB4wH/Ad0BtQGwAf8BvQFqAWUB/wG+AW4BaQH/AeMBwgG8Af8B7wHaAdIB/wHu
- AdgB0AH/Ae4B2AHQAf8D/QH/AxsBJhgAAY4CegH4AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
- Af8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8B7wHcAdUB/wGcAYYBgAH6AVkCVwHCCwAB/ygAAzABTAMA
- Af9MAAP9Af8B+AHwAe0B/wHtAdcB0gH/AbkBiQFoAf8BWAGTASgB/wHqAbEBMAH/AegBrgEnAf8B6wHB
- AVsB/wGxAVIBTQH/Ae4B2QHSAf8B7gHZAdIB/wP9Af8DGwEmFAADQAFwAfUB6QHlAf8B9QHoAeMB/wH0
+ AaQBlgGSAfoBZwJaAfABNgI1AVgDCwEPDAADHQEqAx0BKiAAAwUBBwMdASoDHQEqTAAD/QH/AfcB7QHp
+ Af8B9gHqAeYB/wH0AecB4wH/Ad0BtQGwAf8BvQFpAWQB/wG+AW0BaAH/AeMBwgG8Af8B7wHaAdIB/wHu
+ AdgB0AH/Ae4B2AHQAf8D/QH/AxsBJhgAAYsCeQH4AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
+ Af8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8B7wHcAdUB/wGaAYMBfgH6AVkCVwHCCwAB/ygAAzABTAMA
+ Af9MAAP9Af8B+AHwAe0B/wHtAdcB0gH/AbkBiQFnAf8BVwGTAScB/wHqAbEBLwH/AegBrgEmAf8B6wHB
+ AVoB/wGxAVEBTAH/Ae4B2QHSAf8B7gHZAdIB/wP9Af8DGwEmFAADQAFwAfUB6QHlAf8B9QHoAeMB/wH0
AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AfEB3wHZAf8B8AHdAdcB/wHvAdwB1QH/Ae8B2gHT
Af8DOAFcCwAB/wgAAUYCRQF/AwAEAQECA0UBfQQAAygBPAMlATcEAAMvAUoDAAH/DAADEQEXA1gB0QMA
- Af8DKAE8EAADOAFcAwAB/xgAA/0B/wH2AeoB5gH/AegBvwGcAf8B+wHLAVsB/wE1Aa0BQgH/AU0BnQEj
- Af8B/gHEATsB/wH+Ab4BJgH/AfYBtgEcAf8BlwFrAUgB/wHwAd0B1gH/A/0B/wMbASYUAAGWAYQBggH4
+ Af8DKAE8EAADOAFcAwAB/xgAA/0B/wH2AeoB5gH/AegBvwGcAf8B+wHLAVoB/wE0Aa0BQQH/AUwBnQEi
+ Af8B/gHEAToB/wH+Ab4BJQH/AfYBtgEbAf8BlwFqAUcB/wHwAd0B1gH/A/0B/wMbASYUAAGUAYEBfwH4
AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AfEB3wHZAf8B8AHd
- AdcB/wHvAdwB1QH/AXcCYgH2AwQBBgsAAf8LAAH/A0UBfQNIAYUDAAH/BwAB/wMAAf8EAAMvAUoDAAH/
- EAADQgF0AwAB/xQAAw0BEQNaAdUYAAP9Af8BuQFYAUMB/wH6Ac4BZwH/AaQBtgFPAf8BNQGtAUMB/wE0
- Aa0BQgH/AckBvwFRAf8B/gHEAToB/wH+AcABKwH/ATMBpQE6Af8BvAFqAWcB/wP9Af8DGwEmEAADUAGe
+ AdcB/wHvAdwB1QH/AXUCYgH2AwQBBgsAAf8LAAH/A0UBfQNIAYUDAAH/BwAB/wMAAf8EAAMvAUoDAAH/
+ EAADQgF0AwAB/xQAAw0BEQNaAdUYAAP9Af8BuQFXAUIB/wH6Ac4BZgH/AaQBtgFOAf8BNAGtAUIB/wEz
+ Aa0BQQH/AckBvwFQAf8B/gHEATkB/wH+AcABKgH/ATIBpQE5Af8BvAFpAWYB/wP9Af8DGwEmEAADUAGe
AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AfIB4QHbAf8B8QHf
- AdkB/wHwAd0B1wH/AbsBsQGtAfwDKAE8DwAB/ygAAy8BSgMAAf8QAANCAXQDAAH/NAAD/QH/AeoBwwGh
- Af8B/QHWAYQB/wGbAbYBVQH/ATMBnwEoAf8B8QHYAZEB/wH9AdEBawH/AZwBsAE8Af8BNQGtAUMB/wE1
- Aa0BQwH/AZgBZgFFAf8D/QH/AxsBJhAAAZcBiAGHAfcB9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHm
- AeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8BaAJZAesDAQECDwAB/ygA
- Ay8BSgMAAf8QAANCAXQDAAH/FAADAgEDA1EBoRgAA/0B/wH6AeIBuQH/ATYBmgEfAf8C1AGbAf8B/QHj
- AbUB/wH9Ad0BnQH/Af0B1AF0Af8B5AHIAVkB/wE0AawBQQH/AUsBnAEgAf8BngGKAVYB/wP9Af8DGwEm
+ AdkB/wHwAd0B1wH/AbkBrwGrAfwDKAE8DwAB/ygAAy8BSgMAAf8QAANCAXQDAAH/NAAD/QH/AeoBwwGh
+ Af8B/QHWAYQB/wGbAbYBVAH/ATIBnwEnAf8B8QHYAZEB/wH9AdEBagH/AZwBsAE7Af8BNAGtAUIB/wE0
+ Aa0BQgH/AZgBZQFEAf8D/QH/AxsBJhAAAZMBhwGGAfcB9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHm
+ AeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHxAd8B2QH/AfAB3QHXAf8BZwJZAesDAQECDwAB/ygA
+ Ay8BSgMAAf8QAANCAXQDAAH/FAADAgEDA1EBoRgAA/0B/wH6AeIBuQH/ATUBmgEeAf8C1AGbAf8B/QHj
+ AbUB/wH9Ad0BnQH/Af0B1AFzAf8B5AHIAVgB/wEzAawBQAH/AUoBnAEfAf8BngGKAVUB/wP9Af8DGwEm
DAABXAJZAckB9wHtAekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0AeYB4QH/AfMB5AHfAf8B8gHj
- Ad0B/wHyAeEB2wH/AfEB3wHZAf8BqQGbAZgB+gMbASYTAAH/KAADLwFKAwAB/xAAA0IBdAMAAf8UAAM+
- AWsDAAH/GAAD/QH/AWgBkAEwAf8BNQGtAUMB/wE1Aa0BQwH/Aa8BwQFvAf8B/QHbAZUB/wH9AdMBbwH/
- Af4BygFNAf8BPQGaAR8B/wEzAZcBGgH/AZwBaAFGAf8D/QH/AxsBJggAAwQBBQGsAaABnwH6AfcB7QHp
+ Ad0B/wHyAeEB2wH/AfEB3wHZAf8BpgGZAZUB+gMbASYTAAH/KAADLwFKAwAB/xAAA0IBdAMAAf8UAAM+
+ AWsDAAH/GAAD/QH/AWcBkAEvAf8BNAGtAUIB/wE0Aa0BQgH/Aa8BwQFuAf8B/QHbAZUB/wH9AdMBbgH/
+ Af4BygFMAf8BPAGaAR4B/wEyAZcBGQH/AZwBZwFFAf8D/QH/AxsBJggAAwQBBQGpAZ4BnQH6AfcB7QHp
Af8B9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8B8gHhAdsB/wHx
- Ad8B2QH/AV0CWQHSFwAB/ygAAy8BSgMAAf8QAANCAXYDAAH/NAAD/QH/Ab4BagFKAf8BNQGtAUMB/wE0
- AaMBMQH/ATQBrQFCAf8BwAHCAWIB/wH+Ac4BXQH/Af4BxgE/Af8BVAGUAREB/wHCAboBQQH/AcUBgQFz
+ Ad8B2QH/AV0CWQHSFwAB/ygAAy8BSgMAAf8QAANCAXYDAAH/NAAD/QH/Ab4BaQFJAf8BNAGtAUIB/wEz
+ AaMBMAH/ATMBrQFBAf8BwAHCAWEB/wH+Ac4BXAH/Af4BxgE+Af8BUwGUARAB/wHCAboBQAH/AcUBgQFy
Af8D/QH/AxsBJggAAWQCXAHnAfgB7gHrAf8B9wHtAekB/wH2AesB5wH/AfUB6QHlAf8B9QHoAeMB/wH0
- AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AZkBigGHAfgDEwEaFwAB/ygAAy8BSgMAAf8MAAMI
- AQsBWgJWAd4DAAH/NAAD/QH/AfcB7QHpAf8BcAGQATQB/wGnAbUBSQH/ATUBkwETAf8BqgG3AUsB/wFI
- AZ4BJAH/AfIBwgE8Af8B/gG9ASEB/wHFAXMBXwH/AfkB8QHuAf8D/QH/AxsBJgQAAxIBGQGtAqIB+gH4
+ AeYB4QH/AfMB5AHfAf8B8gHjAd0B/wHyAeEB2wH/AZcBhwGEAfgDEwEaFwAB/ygAAy8BSgMAAf8MAAMI
+ AQsBWgJYAd4DAAH/NAAD/QH/AfcB7QHpAf8BbwGQATMB/wGnAbUBSAH/ATQBkwESAf8BqgG3AUoB/wFH
+ AZ4BIwH/AfIBwgE7Af8B/gG9ASAB/wHFAXIBXgH/AfkB8QHuAf8D/QH/AxsBJgQAAxIBGQGqAqAB+gH4
Ae4B6wH/AfcB7QHpAf8B9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHmAeEB/wHzAeQB3wH/AfIB4wHd
- Af8B8gHhAdsB/wNUAa8YAAFXAlYB3wFJAkgBhyAAAwsBDwNVAbcBVwJWAd9MAAP9Af8B+QHxAe4B/wHy
- AeEB2wH/Aa0BhgFQAf8B7gHYAYsB/wFJAZ4BJAH/ATQBrQFCAf8BOgGUARYB/wG7AV0BSQH/AfgB8AHt
- Af8B+QHxAe4B/wP9Af8DGwEmCAADAQECAVICUQGnAZICiQH5AfYB6wHnAf8B9QHpAeUB/wH1AegB4wH/
- AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AZYBgQF9AfgDDgETmAAD/QH/AfkB8QHuAf8B+QHxAe4B/wH5
- AfEB7gH/AewB0gHJAf8B0gGVAYIB/wHUAZoBiQH/AfIB4QHcAf8B+QHxAe4B/wH5AfEB7gH/AfkB8QHu
- Af8D/QH/AxsBJhQAAx0BKQFhAlkB5AGeAY0BjAH5AfQB5gHhAf8B8wHkAd8B/wHyAeMB3QH/AUkCSAGI
- nAAD/QH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0
- Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8D/QH/AxsBJiAAAz4BawGQAnoB+gGOAnkB+AMHAQqcAAGl
- AqAB/wGkAaABnwH/AaQCnwH/AaMCngH/AaICnQH/AaECnAH/AaACmwH/AZ8CmgH/AZ0CmQH/AZwBmAGX
- Af8BmwKWAf8BmQKVAf/IAAFCAU0BPgcAAT4DAAEoAwABQAMAASADAAEBAQABAQYAAQEWAAP/gQABwAEB
- AfwBPwT/AcABAQH8AQ8E/wHAAQEB+AEBAc8B8QL/AcABAQH4AQAB3wH5Av8BwAEBAfABAAHYAUkBwwHP
- AcABAQHwAQAB2AFJAecBzwHAAQEB4AEBAd8B+QHnAf8BwAEBAeABAQHfAfkB5wHPAcABAQHAAQMB3wH5
- AecBzwHAAQEBgAEHAd8B+QHnAf8BwAEBAYABBwHfAfkBxwH/AcABAQEAAQ8BzwHxAv8BwAEBAYABDwT/
- AcABAQHwAR8E/wHAAQEB/gEfBP8BwAEDBv8L
+ Af8B8gHhAdsB/wNUAa8YAANXAd8BSQJIAYcgAAMLAQ8DVQG3A1cB30wAA/0B/wH5AfEB7gH/AfIB4QHb
+ Af8BrQGGAU8B/wHuAdgBiwH/AUgBngEjAf8BMwGtAUEB/wE5AZQBFQH/AbsBXAFIAf8B+AHwAe0B/wH5
+ AfEB7gH/A/0B/wMbASYIAAMBAQIBUgJRAacBkAKIAfkB9gHrAecB/wH1AekB5QH/AfUB6AHjAf8B9AHm
+ AeEB/wHzAeQB3wH/AfIB4wHdAf8BlAF+AXwB+AMOAROYAAP9Af8B+QHxAe4B/wH5AfEB7gH/AfkB8QHu
+ Af8B7AHSAckB/wHSAZUBggH/AdQBmgGJAf8B8gHhAdwB/wH5AfEB7gH/AfkB8QHuAf8B+QHxAe4B/wP9
+ Af8DGwEmFAADHQEpAWECWgHkAZoBjAGLAfkB9AHmAeEB/wHzAeQB3wH/AfIB4wHdAf8BSQJIAYicAAP9
+ Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wH6AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wH6
+ AfYB9AH/AfoB9gH0Af8B+gH2AfQB/wP9Af8DGwEmIAADPgFrAY0CeQH6AYsCeAH4AwcBCpwAAaUCoAH/
+ AaQBoAGfAf8BpAKfAf8BowKeAf8BogKdAf8BoQKcAf8BoAKbAf8BnwKaAf8BnQKZAf8BnAGYAZcB/wGb
+ ApYB/wGZApUB/8gAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAHAAQEB/AE/
+ BP8BwAEBAfwBDwT/AcABAQH4AQEBzwHxAv8BwAEBAfgBAAHfAfkC/wHAAQEB8AEAAdgBSQHDAc8BwAEB
+ AfABAAHYAUkB5wHPAcABAQHgAQEB3wH5AecB/wHAAQEB4AEBAd8B+QHnAc8BwAEBAcABAwHfAfkB5wHP
+ AcABAQGAAQcB3wH5AecB/wHAAQEBgAEHAd8B+QHHAf8BwAEBAQABDwHPAfEC/wHAAQEBgAEPBP8BwAEB
+ AfABHwT/AcABAQH+AR8E/wHAAQMG/ws=
</value>
</data>
<data name="MapTree.Location" type="System.Drawing.Point, System.Drawing">
@@ -688,9 +688,6 @@
<data name="Username.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
- <data name="Username.Text" xml:space="preserve">
- <value>Anonymous</value>
- </data>
<data name="Username.ToolTip" xml:space="preserve">
<value>Username used to connect to the server</value>
</data>
@@ -715,9 +712,6 @@
<data name="MapAgent.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
- <data name="MapAgent.Text" xml:space="preserve">
- <value>http://localhost/mapguide/mapagent/mapagent.fcgi</value>
- </data>
<data name="MapAgent.ToolTip" xml:space="preserve">
<value>Enter the URL for the MapAgent</value>
</data>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -59,6 +59,13 @@
[CompilerGenerated]
class NsDoc { }
+ /// <summary>
+ /// A helper class that registers validatiors, serializers and factories for resource types beyond the initial version
+ /// of a resource's XML schema. This allows for the consuming application to be able to properly consume all supported
+ /// versions of any resource type in their object-oriented forms. Versions that are not supported or recognised are treated
+ /// as <see cref="T:OSGeo.MapGuide.ObjectModels.UntypedResource"/> instances which are effectively containers of arbitrary
+ /// XML content
+ /// </summary>
public static class ModelSetup
{
/// <summary>
@@ -66,6 +73,9 @@
///
/// Invoke this method as part of your application's startup process before using any other part of the Maestro API
/// </summary>
+ /// <remarks>
+ /// This only needs to be called once, and should generally be done as part of your application's startup routine
+ /// </remarks>
public static void Initialize()
{
//By default the ObjectFactory, ResourceTypeRegistry and ResourceValidatorSet only
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -122,7 +122,7 @@
public abstract class DefaultInsertCommand<TConn> : DefaultFeatureCommand<TConn>, IInsertFeatures where TConn : IServerConnection
{
/// <summary>
- /// Initializes a new instance of the <see cref="DefaultInsertCommand"/> class.
+ /// Initializes a new instance of the
/// </summary>
/// <param name="conn">The conn.</param>
protected DefaultInsertCommand(TConn conn) : base(conn) { }
@@ -503,12 +503,22 @@
get;
set;
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="doc"></param>
+ /// <param name="currentNode"></param>
public void WriteXml(System.Xml.XmlDocument doc, System.Xml.XmlNode currentNode)
{
throw new NotImplementedException();
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="node"></param>
+ /// <param name="mgr"></param>
public void ReadXml(System.Xml.XmlNode node, System.Xml.XmlNamespaceManager mgr)
{
throw new NotImplementedException();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -26,67 +26,160 @@
namespace OSGeo.MapGuide.MaestroAPI.Commands
{
+ /// <summary>
+ /// Defines a command that works against a Feature Class of a Feature Source
+ /// </summary>
public interface IFeatureCommand : ICommand
{
+ /// <summary>
+ /// Gets or sets the Feature Source ID
+ /// </summary>
string FeatureSourceId { get; set; }
+ /// <summary>
+ /// Gets or sets the Feature Class name
+ /// </summary>
string ClassName { get; set; }
}
+ /// <summary>
+ /// Defines a command that creates a file-based data store on a given feature source
+ /// </summary>
public interface ICreateDataStore : ICommand, IFdoSpatialContext
{
+ /// <summary>
+ /// Gets or sets the Feature Schema that models the structure of the data store
+ /// </summary>
FeatureSchema Schema { get; set; }
+ /// <summary>
+ /// Gets or sets the FDO provider name
+ /// </summary>
string Provider { get; set; }
+ /// <summary>
+ /// Gets or sets the file name for the data store
+ /// </summary>
string FileName { get; set; }
+ /// <summary>
+ /// Gets or sets the Feature Source ID
+ /// </summary>
string FeatureSourceId { get; set; }
+ /// <summary>
+ /// Executes the command
+ /// </summary>
void Execute();
}
+ /// <summary>
+ /// Defines a command that inserts a feature into a Feature Source
+ /// </summary>
public interface IInsertFeatures : IFeatureCommand
{
+ /// <summary>
+ /// The feature to insert
+ /// </summary>
IMutableRecord RecordToInsert { get; set; }
-
+
+ /// <summary>
+ /// Executes the command
+ /// </summary>
+ /// <returns>The feature insert result</returns>
InsertResult Execute();
}
+ /// <summary>
+ /// The result of a <see cref="M:OSGeo.MapGuide.MaestroAPI.Commands.IInsertFeatures.Execute" /> operation
+ /// </summary>
public class InsertResult
{
+ /// <summary>
+ /// Gets the <see cref="T:System.Exception"/> object. If there is no exception, the insert operation succeeded.
+ /// </summary>
public Exception Error { get; set; }
}
+ /// <summary>
+ /// Defines a command that inserts a series of features into a Feature Source
+ /// </summary>
public interface IBatchInsertFeatures : IFeatureCommand
{
+ /// <summary>
+ /// Gets or sets the list of features to insert
+ /// </summary>
ICollection<IRecord> RecordsToInsert { get; set; }
+ /// <summary>
+ /// Executes the command.
+ /// </summary>
+ /// <returns>
+ /// A collection of <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult" /> instances.
+ /// Inspect the individual <see cref="P:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult "/> properties to
+ /// determine which features failed to be inserted.
+ /// </returns>
ICollection<InsertResult> Execute();
}
+ /// <summary>
+ /// Defines a command that updates one or more features in a Feature Source based on some filtering criteria
+ /// </summary>
public interface IUpdateFeatures : IFeatureCommand
{
+ /// <summary>
+ /// Gets or sets the filter that determines which features will be updated. If empty, will cause all
+ /// features to be updated
+ /// </summary>
string Filter { get; set; }
+ /// <summary>
+ /// Gets or sets the collection of values to apply
+ /// </summary>
IMutableRecord ValuesToUpdate { get; set; }
+ /// <summary>
+ /// Executes the command
+ /// </summary>
+ /// <returns>The number of features updated by this command</returns>
int Execute();
}
+ /// <summary>
+ /// Defines a command that deletes one or more features in a Feature Source based on some filtering criteria
+ /// </summary>
public interface IDeleteFeatures : IFeatureCommand
{
+ /// <summary>
+ /// Gets or sets the filter that determines what features will be deleted. If empty, this will delete all features
+ /// </summary>
string Filter { get; set; }
+ /// <summary>
+ /// Executes the command.
+ /// </summary>
+ /// <returns>The number of features deleted</returns>
int Execute();
}
+ /// <summary>
+ /// Defines a command that applies the given Feature Schema to a Feature Source
+ /// </summary>
public interface IApplySchema : ICommand
{
+ /// <summary>
+ /// Gets or sets the Feature Source ID
+ /// </summary>
string FeatureSourceId { get; set; }
+ /// <summary>
+ /// Gets or sets the Feature Schema
+ /// </summary>
FeatureSchema Schema { get; set; }
+ /// <summary>
+ /// Executes the command
+ /// </summary>
void Execute();
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,21 +1,21 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
#endregion
using System;
using System.Collections.Generic;
@@ -29,6 +29,9 @@
{
using Resource;
+ /// <summary>
+ /// Extension methods for feature sources
+ /// </summary>
public static class FeatureSourceCredentialExtensions
{
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -21,6 +21,9 @@
namespace OSGeo.MapGuide.MaestroAPI
{
+ /// <summary>
+ /// Commonly used string constants for MapGuide
+ /// </summary>
public class StringConstants
{
/// <summary>
@@ -33,12 +36,24 @@
/// </summary>
public const string Thumbnail = "Thumbnail"; //NOXLATE
+ /// <summary>
+ /// The username login placeholder token
+ /// </summary>
public const string MgUsernamePlaceholder = "%MG_USERNAME%"; //NOXLATE
+ /// <summary>
+ /// The password login placeholder token
+ /// </summary>
public const string MgPasswordPlaceholder = "%MG_PASSWORD%"; //NOXLATE
+ /// <summary>
+ /// The placeholder token that resolves to the path containing resource data
+ /// </summary>
public const string MgDataFilePath = "%MG_DATA_FILE_PATH%"; //NOXLATE
+ /// <summary>
+ /// The name of the resource data item containing the secured Feature Source credentials
+ /// </summary>
public const string MgUserCredentialsResourceData = "MG_USER_CREDENTIALS"; //NOXLATE
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -23,6 +23,9 @@
namespace OSGeo.MapGuide.MaestroAPI.Exceptions
{
+ /// <summary>
+ /// Thrown when no result exists for a extent query
+ /// </summary>
[global::System.Serializable]
public class NullExtentException : Exception
{
@@ -33,9 +36,29 @@
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
//
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
public NullExtentException() { }
+
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="message"></param>
public NullExtentException(string message) : base(message) { }
+
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="message"></param>
+ /// <param name="inner"></param>
public NullExtentException(string message, Exception inner) : base(message, inner) { }
+
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="info"></param>
+ /// <param name="context"></param>
protected NullExtentException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
Deleted: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,40 +0,0 @@
-#region Disclaimer / License
-// Copyright (C) 2012, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace OSGeo.MapGuide.MaestroAPI
-{
- /// <summary>
- /// Defines a set of externally accessible localized strings
- /// </summary>
- public class ExternalStrings
- {
- public static string CompositeStyleDisplayString
- {
- get
- {
- return Strings.CompositeStyleDisplayString;
- }
- }
- }
-}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -134,6 +134,11 @@
_pos = -1;
}
+ /// <summary>
+ /// Gets the property value type for the property at the specified index
+ /// </summary>
+ /// <param name="index"></param>
+ /// <returns></returns>
public override PropertyValueType GetPropertyType(int index)
{
var prop = this.ClassDefinition.Properties[index];
@@ -147,6 +152,11 @@
throw new ArgumentException();
}
+ /// <summary>
+ /// Gets the property value type for the property of the specified name
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
public override PropertyValueType GetPropertyType(string name)
{
var prop = this.ClassDefinition.FindProperty(name);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -75,6 +75,9 @@
IFeatureReader GetFeatureObject(int index);
}
+ /// <summary>
+ /// Defines a mutable feature record
+ /// </summary>
public interface IMutableFeature : IMutableRecord
{
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -352,6 +352,9 @@
PropertyValueType GetPropertyType(int index);
}
+ /// <summary>
+ /// Defines a records whose properties can be modified
+ /// </summary>
public interface IMutableRecord : IRecord, IRecordInitialize
{
/// <summary>
@@ -386,6 +389,7 @@
/// Sets the boolean value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetBoolean(string name, bool value);
@@ -393,6 +397,7 @@
/// Sets the byte value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetByte(string name, byte value);
@@ -400,6 +405,7 @@
/// Sets the blob value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetBlob(string name, byte[] value);
@@ -407,6 +413,7 @@
/// Sets the clob value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetClob(string name, char[] value);
@@ -414,6 +421,7 @@
/// Sets the double value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetDouble(string name, double value);
@@ -421,6 +429,7 @@
/// Sets the datetime value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetDateTime(string name, DateTime value);
@@ -428,6 +437,7 @@
/// Sets the int16 value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt16(string name, short value);
@@ -435,6 +445,7 @@
/// Sets the int32 value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt32(string name, int value);
@@ -442,6 +453,7 @@
/// Sets the int64 value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt64(string name, long value);
@@ -449,6 +461,7 @@
/// Sets the single value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetSingle(string name, float value);
@@ -456,6 +469,7 @@
/// Sets the string value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetString(string name, string value);
@@ -463,6 +477,7 @@
/// Sets the geometry value of the specified property
/// </summary>
/// <param name="name"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetGeometry(string name, IGeometry value);
@@ -470,6 +485,7 @@
/// Sets the boolean value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetBoolean(int index, bool value);
@@ -477,6 +493,7 @@
/// Sets the byte value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetByte(int index, byte value);
@@ -484,6 +501,7 @@
/// Sets the blob value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetBlob(int index, byte[] value);
@@ -491,6 +509,7 @@
/// Sets the clob value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetClob(int index, char[] value);
@@ -498,6 +517,7 @@
/// Sets the double value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetDouble(int index, double value);
@@ -505,6 +525,7 @@
/// Sets the datetime value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetDateTime(int index, DateTime value);
@@ -512,6 +533,7 @@
/// Sets the int16 value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt16(int index, short value);
@@ -519,6 +541,7 @@
/// Sets the int32 value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt32(int index, int value);
@@ -526,6 +549,7 @@
/// Sets the int64 value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetInt64(int index, long value);
@@ -533,6 +557,7 @@
/// Sets the single value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetSingle(int index, float value);
@@ -540,6 +565,7 @@
/// Sets the string value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetString(int index, string value);
@@ -547,6 +573,7 @@
/// Sets the geometry value at the specified index
/// </summary>
/// <param name="index"></param>
+ /// <param name="value"></param>
/// <returns></returns>
void SetGeometry(int index, IGeometry value);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -24,22 +24,40 @@
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
+ /// <summary>
+ /// Represents a Feature instance whose properties can be modified
+ /// </summary>
public class MutableFeatureBase : MutableRecordBase, IMutableFeature
{
+ /// <summary>
+ /// The class definition
+ /// </summary>
protected ClassDefinition _clsDef;
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="feature"></param>
+ /// <param name="source"></param>
protected MutableFeatureBase(IRecordInitialize feature, ClassDefinition source)
: base(feature)
{
_clsDef = ClassDefinition.Clone(source);
}
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="feat"></param>
protected MutableFeatureBase(MutableFeatureBase feat)
: this(feat, feat.ClassDefinition)
{
}
+ /// <summary>
+ /// Gets the associated class definition
+ /// </summary>
public ClassDefinition ClassDefinition
{
get { return _clsDef; }
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -26,10 +26,14 @@
namespace OSGeo.MapGuide.MaestroAPI.Feature
{
/// <summary>
- /// A mutable record
+ /// A record whose properties can be modified
/// </summary>
public class MutableRecordBase : RecordBase, IMutableRecord
{
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="prototype"></param>
protected MutableRecordBase(IRecordInitialize prototype)
{
_values.Clear();
@@ -43,6 +47,11 @@
}
}
+ /// <summary>
+ /// Creates a clone of the specified <see cref="T:OSGeo.MapGuide.MaestroAPI.Feature.PropertyValue"/>
+ /// </summary>
+ /// <param name="propertyValue">The instance to clone</param>
+ /// <returns>The cloned instance</returns>
protected PropertyValue ClonePropertyValue(PropertyValue propertyValue)
{
if (propertyValue.IsNull)
@@ -501,6 +510,9 @@
/// </summary>
public class MutableRecord : MutableRecordBase
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public MutableRecord() : base(null) { }
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -199,8 +199,14 @@
/// </summary>
public class ByteValue : ValueTypePropertyValue<byte>
{
+ /// <summary>
+ /// Initializes this instance
+ /// </summary>
public ByteValue() : base() { }
+ /// <summary>
+ /// Initializes this instance
+ /// </summary>
public ByteValue(byte value) : base() { }
/// <summary>
@@ -229,8 +235,14 @@
/// </summary>
public class BooleanValue : ValueTypePropertyValue<bool>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public BooleanValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public BooleanValue(bool value) : base(value) { }
/// <summary>
@@ -259,8 +271,14 @@
/// </summary>
public class BlobValue : ReferenceTypePropertyValue<byte[]>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public BlobValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public BlobValue(byte[] value) : base(value) { }
/// <summary>
@@ -297,8 +315,14 @@
/// </summary>
public class ClobValue : ReferenceTypePropertyValue<char[]>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public ClobValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public ClobValue(char[] value) : base(value) { }
/// <summary>
@@ -335,8 +359,14 @@
/// </summary>
public class DateTimeValue : ValueTypePropertyValue<DateTime>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public DateTimeValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public DateTimeValue(DateTime value) : base(value) { }
/// <summary>
@@ -380,8 +410,14 @@
/// </summary>
public class DoubleValue : ValueTypePropertyValue<double>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public DoubleValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public DoubleValue(double value) : base(value) { }
/// <summary>
@@ -410,8 +446,14 @@
/// </summary>
public class FeatureValue : ReferenceTypePropertyValue<IFeature[]>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public FeatureValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public FeatureValue(IFeature[] values) : base(values) { }
/// <summary>
@@ -451,8 +493,14 @@
/// </summary>
public class GeometryValue : ReferenceTypePropertyValue<IGeometry>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public GeometryValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public GeometryValue(IGeometry value) : base(value) { }
/// <summary>
@@ -492,8 +540,14 @@
/// </summary>
public class Int16Value : ValueTypePropertyValue<short>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int16Value() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int16Value(short value) : base(value) { }
/// <summary>
@@ -522,8 +576,14 @@
/// </summary>
public class Int32Value : ValueTypePropertyValue<int>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int32Value() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int32Value(int value) : base(value) { }
/// <summary>
@@ -552,8 +612,14 @@
/// </summary>
public class Int64Value : ValueTypePropertyValue<long>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int64Value() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public Int64Value(long value) : base(value) { }
/// <summary>
@@ -582,8 +648,14 @@
/// </summary>
public class RasterValue : ReferenceTypePropertyValue<byte[]>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public RasterValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public RasterValue(byte[] value) : base(value) { }
/// <summary>
@@ -620,8 +692,14 @@
/// </summary>
public class SingleValue : ValueTypePropertyValue<float>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public SingleValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public SingleValue(float value) : base(value) { }
/// <summary>
@@ -650,8 +728,14 @@
/// </summary>
public class StringValue : ReferenceTypePropertyValue<string>
{
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public StringValue() : base() { }
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public StringValue(string value) : base(value) { }
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -38,10 +38,6 @@
private IPrecisionModel precisionModel;
int index;
- bool hasXY = true;
- bool hasZ = false;
- bool hasM = false;
-
/// <summary>
/// Creates a <c>WKTReader</c> that creates objects using a basic GeometryFactory.
/// </summary>
@@ -92,9 +88,6 @@
tokenizer.Tokenize(tokens); // Read directly all tokens
index = 0; // Reset pointer to start of tokens
- hasXY = true;
- hasZ = false;
- hasM = false;
try
{
return ReadGeometryTaggedText(tokens);
@@ -239,19 +232,14 @@
string nextWord = GetNextWord(tokens);
if (nextWord.Equals("XYZ")) //NOXLATE
{
- hasZ = true;
nextWord = GetNextWord(tokens);
}
else if (nextWord.Equals("XYM")) //NOXLATE
{
- hasM = true;
nextWord = GetNextWord(tokens);
}
else if (nextWord.Equals("ZM")) //NOXLATE
{
- hasXY = false;
- hasZ = true;
- hasM = true;
nextWord = GetNextWord(tokens);
}
if (nextWord.Equals("EMPTY") || nextWord.Equals("(")) //NOXLATE
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -276,7 +276,7 @@
/// -or-
/// The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.
/// -or-
- /// Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.
+ /// Type <paramref name="TVal"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.
/// </exception>
public void CopyTo(TVal[] array, int arrayIndex)
{
@@ -360,7 +360,7 @@
/// </returns>
///
/// <exception cref="T:System.ArgumentOutOfRangeException">
- /// <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
+ /// <paramref name="key"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
/// </exception>
///
/// <exception cref="T:System.NotSupportedException">
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -54,6 +54,17 @@
return true;
}
+ /// <summary>
+ /// If the specified old value is different from the new value, the specified setter is invoked
+ /// and a <see cref="E:System.ComponentModel.INotifyPropertyChanged.PropertyChanged"/> event
+ /// is raised
+ /// </summary>
+ /// <typeparam name="T"></typeparam>
+ /// <param name="oldValue"></param>
+ /// <param name="newValue"></param>
+ /// <param name="setter"></param>
+ /// <param name="propertyName"></param>
+ /// <returns></returns>
protected virtual bool ObservableSet<T>(T oldValue, T newValue, Action<T> setter, string propertyName)
{
if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -758,8 +758,6 @@
/// <paramref name="arrayIndex"/> is equal to or greater than the length of <paramref name="array"/>.
/// -or-
/// The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.
- /// -or-
- /// Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.
/// </exception>
public void CopyTo(MapSelection.LayerSelection[] array, int arrayIndex)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -127,6 +127,9 @@
internal IResourceService ResourceService { get { return this.CurrentConnection.ResourceService; } }
+ /// <summary>
+ /// Gets the <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> that is attached to this instance
+ /// </summary>
public IServerConnection CurrentConnection { get; private set; }
internal Version SiteVersion { get; private set; }
@@ -150,6 +153,10 @@
/// </summary>
public const double Z_ORDER_TOP = 100.0;
+ /// <summary>
+ /// Initializes this instance
+ /// </summary>
+ /// <param name="conn"></param>
protected internal RuntimeMap(IServerConnection conn)
{
this.StrictSelection = true;
@@ -478,6 +485,11 @@
}
}
+ /// <summary>
+ /// Sets the view center
+ /// </summary>
+ /// <param name="x">The center X coordinate</param>
+ /// <param name="y">The center Y coordinate</param>
public virtual void SetViewCenter(double x, double y)
{
if (_viewCenter == null)
@@ -1340,7 +1352,7 @@
}
/// <summary>
- /// Raises the <see cref="PropertyChanged"/> event
+ /// Raises the <see cref="E:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.PropertyChanged"/> event
/// </summary>
/// <param name="propertyName"></param>
protected override void OnPropertyChanged(string propertyName)
@@ -1494,7 +1506,7 @@
/// </summary>
/// <param name="sel"></param>
/// <param name="format"></param>
- /// <param name="behavior"></param>
+ /// <param name="keepSelection"></param>
/// <returns></returns>
[Obsolete("Use the version of RenderDynamicOverlay that is not marked Obsolete")] //NOXLATE
public System.IO.Stream RenderDynamicOverlay(MapSelection sel, string format, bool keepSelection)
@@ -1551,6 +1563,15 @@
format);
}
+ /// <summary>
+ /// Convenience method for performing selection based on the given geometry
+ /// </summary>
+ /// <param name="wkt"></param>
+ /// <param name="maxFeatures"></param>
+ /// <param name="persist"></param>
+ /// <param name="selectionVariant"></param>
+ /// <param name="extraOptions"></param>
+ /// <returns></returns>
public virtual string QueryMapFeatures(string wkt, int maxFeatures, bool persist, string selectionVariant, QueryMapOptions extraOptions)
{
if (_mapSvc == null)
@@ -1564,6 +1585,17 @@
return ret;
}
+ /// <summary>
+ /// Convenience method for rendering a layer style icon
+ /// </summary>
+ /// <param name="layerDefinitionID"></param>
+ /// <param name="scale"></param>
+ /// <param name="width"></param>
+ /// <param name="height"></param>
+ /// <param name="format"></param>
+ /// <param name="geomType"></param>
+ /// <param name="themeCategory"></param>
+ /// <returns></returns>
public System.Drawing.Image GetLegendImage(string layerDefinitionID, double scale, int width, int height, string format, int geomType, int themeCategory)
{
if (_mapSvc == null)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -60,8 +60,16 @@
public Type Type { get; set; }
}
+ /// <summary>
+ /// Extension methods for <see cref="T:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMapLayer"/>
+ /// </summary>
public static class Extensions
{
+ /// <summary>
+ /// Gets the parent group
+ /// </summary>
+ /// <param name="layer"></param>
+ /// <returns></returns>
public static RuntimeMapGroup GetParentGroup(this RuntimeMapLayer layer)
{
Check.NotNull(layer, "layer"); //NOXLATE
@@ -112,6 +120,10 @@
/// </summary>
public RuntimeMap Parent { get; private set; }
+ /// <summary>
+ /// Initializes this instances from the specified Layer Definition
+ /// </summary>
+ /// <param name="ldf"></param>
protected void Initialize(ILayerDefinition ldf)
{
Check.NotNull(ldf, "ldf"); //NOXLATE
@@ -167,6 +179,10 @@
EnsureOrderedMinMaxScales();
}
+ /// <summary>
+ /// Initializes this instance
+ /// </summary>
+ /// <param name="parent"></param>
protected internal RuntimeMapLayer(RuntimeMap parent)
{
_scaleRanges = new double[] { 0.0, InfinityScale };
@@ -201,6 +217,12 @@
_disableChangeTracking = false;
}
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
+ /// <param name="parent"></param>
+ /// <param name="source"></param>
+ /// <param name="ldf"></param>
protected internal RuntimeMapLayer(RuntimeMap parent, IMapLayer source, ILayerDefinition ldf)
: this(parent, (IBaseMapLayer)source, ldf)
{
@@ -212,6 +234,12 @@
_disableChangeTracking = false;
}
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
+ /// <param name="parent"></param>
+ /// <param name="source"></param>
+ /// <param name="ldf"></param>
protected internal RuntimeMapLayer(RuntimeMap parent, IBaseMapLayer source, ILayerDefinition ldf)
: this(parent, ldf)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -104,6 +104,10 @@
RestartSession(true);
}
+ /// <summary>
+ /// Raised when the associated session id has changed. This would happen if the connection detected an expired session
+ /// and built a new session
+ /// </summary>
public event EventHandler SessionIDChanged;
/// <summary>
@@ -120,6 +124,12 @@
return ret;
}
+ /// <summary>
+ /// Raises the <see cref="E:OSGeo.MapGuide.MaestroAPI.MgServerConnectionBase.SessionIDChanged"/> event if the
+ /// old and new session ids do not match
+ /// </summary>
+ /// <param name="oldSessionId"></param>
+ /// <param name="newSessionId"></param>
protected void CheckAndRaiseSessionChanged(string oldSessionId, string newSessionId)
{
if (!string.IsNullOrEmpty(oldSessionId))
@@ -133,6 +143,11 @@
}
}
+ /// <summary>
+ /// Attempts to create a new session
+ /// </summary>
+ /// <param name="throwException"></param>
+ /// <returns></returns>
protected abstract bool RestartSessionInternal(bool throwException);
#endregion
@@ -171,6 +186,16 @@
#region Rendering
+ /// <summary>
+ /// Identifies those features that meet the specified spatial selection criteria. This operation is used to implement server-side selection. In addition to a selection set, this operation returns attribute information in case only one feature is selected.
+ /// </summary>
+ /// <param name="rtMap">The runtime map to identify features</param>
+ /// <param name="maxFeatures">The maximum number of features to return</param>
+ /// <param name="wkt">The WKT of the filter geometry</param>
+ /// <param name="persist">If true will update the selection set for the given map</param>
+ /// <param name="selectionVariant">The type of spatial operator to use for the spatial query</param>
+ /// <param name="extraOptions">Extra querying options</param>
+ /// <returns></returns>
public abstract string QueryMapFeatures(RuntimeMap rtMap, int maxFeatures, string wkt, bool persist, string selectionVariant, QueryMapOptions extraOptions);
/// <summary>
@@ -202,7 +227,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -218,7 +243,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
@@ -235,7 +260,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -252,7 +277,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
@@ -270,7 +295,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -284,7 +309,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -232,7 +232,6 @@
<Compile Include="Expression\FdoFunctionNamespace.cs" />
<Compile Include="Expression\MgFunctionNamespace.cs" />
<Compile Include="Expression\NsDoc.cs" />
- <Compile Include="ExternalStrings.cs" />
<Compile Include="Feature\ClrFdoTypeMap.cs" />
<Compile Include="Feature\FeatureBase.cs" />
<Compile Include="Feature\FeatureReaderBase.cs" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -287,7 +287,7 @@
/// <summary>
/// Creates a default advanced placement setting
/// </summary>
- /// <param name="limit"></param>
+ /// <param name="scaleLimit"></param>
/// <returns></returns>
IAdvancedPlacement CreateDefaultAdvancedPlacement(double scaleLimit);
@@ -1749,7 +1749,11 @@
/// </summary>
public interface ICompositeTypeStyle : IVectorStyle, IRuleCollection<ICompositeRule>
{
+ /// <summary>
+ /// Gets a display string for data-binding purposes
+ /// </summary>
string DisplayString { get; }
+
/// <summary>
/// Gets the composite rules.
/// </summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -2192,7 +2192,7 @@
{
get
{
- return ExternalStrings.CompositeStyleDisplayString;
+ return Strings.CompositeStyleDisplayString;
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1480,10 +1480,10 @@
/// <returns></returns>
public virtual FeatureSourceDescription DescribeFeatureSource(string resourceID)
{
- bool bFromCache = true;
+ //bool bFromCache = true;
if (!m_featureSchemaCache.ContainsKey(resourceID))
{
- bFromCache = false;
+ //bFromCache = false;
var fsd = this.DescribeFeatureSourceInternal(resourceID);
try
{
@@ -1532,7 +1532,7 @@
string classCacheKey = resourceID + "!" + className; //NOXLATE
ClassDefinition cls = null;
bool bStoreInCache = true;
- bool bFromCache = false;
+ //bool bFromCache = false;
//We don't interrogate the Feature Source Description cache because part of
//caching a Feature Source Description is to cache all the classes within
@@ -1540,7 +1540,7 @@
{
cls = m_classDefinitionCache[classCacheKey];
bStoreInCache = false;
- bFromCache = true;
+ //bFromCache = true;
}
else
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -29,6 +29,7 @@
namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
{
+ /*
public class BinaryFileDiffList : IDiffList
{
private byte[] _byteList;
@@ -69,4 +70,5 @@
#endregion
}
+ */
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -28,6 +28,7 @@
namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
{
+ /*
public class CharDataDiffList : IDiffList
{
private char[] _charList;
@@ -50,4 +51,5 @@
#endregion
}
+ */
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -30,9 +30,22 @@
namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
{
+ /// <summary>
+ /// Defines a list of difference
+ /// </summary>
public interface IDiffList
{
+ /// <summary>
+ /// Gets the number of instances
+ /// </summary>
+ /// <returns></returns>
int Count();
+
+ /// <summary>
+ /// Gets a diff at the specified index
+ /// </summary>
+ /// <param name="index"></param>
+ /// <returns></returns>
IComparable GetByIndex(int index);
}
@@ -178,15 +191,32 @@
}
}
-
+ /// <summary>
+ /// Defines the status of a diff result span
+ /// </summary>
public enum DiffResultSpanStatus
{
+ /// <summary>
+ ///
+ /// </summary>
NoChange,
+ /// <summary>
+ ///
+ /// </summary>
Replace,
+ /// <summary>
+ ///
+ /// </summary>
DeleteSource,
+ /// <summary>
+ ///
+ /// </summary>
AddDestination
}
+ /// <summary>
+ /// Defines a diff result span
+ /// </summary>
public class DiffResultSpan : IComparable
{
private const int BAD_INDEX = -1;
@@ -195,11 +225,33 @@
private int _length;
private DiffResultSpanStatus _status;
+ /// <summary>
+ /// The destination index
+ /// </summary>
public int DestIndex { get { return _destIndex; } }
+
+ /// <summary>
+ /// The source index
+ /// </summary>
public int SourceIndex { get { return _sourceIndex; } }
+
+ /// <summary>
+ /// Gets the length of this span
+ /// </summary>
public int Length { get { return _length; } }
+
+ /// <summary>
+ /// Gets the status of this span
+ /// </summary>
public DiffResultSpanStatus Status { get { return _status; } }
+ /// <summary>
+ /// Initializes this instance
+ /// </summary>
+ /// <param name="status"></param>
+ /// <param name="destIndex"></param>
+ /// <param name="sourceIndex"></param>
+ /// <param name="length"></param>
protected DiffResultSpan(
DiffResultSpanStatus status,
int destIndex,
@@ -212,31 +264,35 @@
_length = length;
}
- public static DiffResultSpan CreateNoChange(int destIndex, int sourceIndex, int length)
+ internal static DiffResultSpan CreateNoChange(int destIndex, int sourceIndex, int length)
{
return new DiffResultSpan(DiffResultSpanStatus.NoChange, destIndex, sourceIndex, length);
}
- public static DiffResultSpan CreateReplace(int destIndex, int sourceIndex, int length)
+ internal static DiffResultSpan CreateReplace(int destIndex, int sourceIndex, int length)
{
return new DiffResultSpan(DiffResultSpanStatus.Replace, destIndex, sourceIndex, length);
}
- public static DiffResultSpan CreateDeleteSource(int sourceIndex, int length)
+ internal static DiffResultSpan CreateDeleteSource(int sourceIndex, int length)
{
return new DiffResultSpan(DiffResultSpanStatus.DeleteSource, BAD_INDEX, sourceIndex, length);
}
- public static DiffResultSpan CreateAddDestination(int destIndex, int length)
+ internal static DiffResultSpan CreateAddDestination(int destIndex, int length)
{
return new DiffResultSpan(DiffResultSpanStatus.AddDestination, destIndex, BAD_INDEX, length);
}
- public void AddLength(int i)
+ internal void AddLength(int i)
{
_length += i;
}
+ /// <summary>
+ /// Returns a string that represents the current object
+ /// </summary>
+ /// <returns></returns>
public override string ToString()
{
return string.Format("{0} (Dest: {1},Source: {2}) {3}", //NOXLATE
@@ -255,13 +311,28 @@
#endregion
}
+ /// <summary>
+ /// Controls the level of perfection required when computing the differences
+ /// </summary>
public enum DiffEngineLevel
{
+ /// <summary>
+ /// Fast, but imperfect
+ /// </summary>
FastImperfect,
+ /// <summary>
+ /// A balanced trade between speed and perfection
+ /// </summary>
Medium,
+ /// <summary>
+ /// Slow, but perfect
+ /// </summary>
SlowPerfect
}
+ /// <summary>
+ /// Computes the differences between two sources
+ /// </summary>
public class DiffEngine
{
private IDiffList _source;
@@ -272,6 +343,9 @@
private DiffStateList _stateList;
+ /// <summary>
+ /// Initializes a new instance
+ /// </summary>
public DiffEngine()
{
_source = null;
@@ -426,12 +500,25 @@
}
}
+ /// <summary>
+ /// Performs the difference computation using the specified level of control
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="destination"></param>
+ /// <param name="level"></param>
+ /// <returns>The total execution time in seconds</returns>
public double ProcessDiff(IDiffList source, IDiffList destination, DiffEngineLevel level)
{
_level = level;
return ProcessDiff(source, destination);
}
+ /// <summary>
+ /// Performs the difference computation
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="destination"></param>
+ /// <returns>The total execution time in seconds</returns>
public double ProcessDiff(IDiffList source, IDiffList destination)
{
DateTime dt = DateTime.Now;
@@ -502,6 +589,10 @@
return retval;
}
+ /// <summary>
+ /// Returns the result of the difference computation
+ /// </summary>
+ /// <returns></returns>
public List<DiffResultSpan> DiffReport()
{
var retval = new List<DiffResultSpan>();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -30,18 +30,30 @@
namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
{
+ /// <summary>
+ /// Represents a line of text in a diff
+ /// </summary>
public class TextLine : IComparable
{
+ /// <summary>
+ /// The line content
+ /// </summary>
public string Line;
- public int _hash;
- public TextLine(string str)
+ internal int _hash;
+
+ internal TextLine(string str)
{
Line = str.Replace("\t", " "); //NOXLATE
_hash = str.GetHashCode();
}
#region IComparable Members
+ /// <summary>
+ /// Compares this instance against the given instance
+ /// </summary>
+ /// <param name="obj"></param>
+ /// <returns></returns>
public int CompareTo(object obj)
{
return _hash.CompareTo(((TextLine)obj)._hash);
@@ -50,11 +62,17 @@
#endregion
}
-
+ /// <summary>
+ /// Represents a list of differences
+ /// </summary>
public class TextFileDiffList : IDiffList
{
private List<TextLine> _lines;
+ /// <summary>
+ /// Creates a new instance
+ /// </summary>
+ /// <param name="fileName"></param>
public TextFileDiffList(string fileName)
{
_lines = new List<TextLine>();
@@ -70,12 +88,19 @@
}
}
#region IDiffList Members
-
+ /// <summary>
+ /// Gets the number of lines
+ /// </summary>
+ /// <returns></returns>
public int Count()
{
return _lines.Count;
}
-
+ /// <summary>
+ /// Gets the line at the specified index
+ /// </summary>
+ /// <param name="index"></param>
+ /// <returns></returns>
public IComparable GetByIndex(int index)
{
return _lines[index];
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -220,8 +220,9 @@
/// <summary>
/// Describes the specified feature source restricted to only the specified schema and the specified class names
/// </summary>
- /// <param name="resourceID"></param>
- /// <param name="schema"></param>
+ /// <param name="resourceID">The feature source id</param>
+ /// <param name="schema">The schema name</param>
+ /// <param name="classNames">The array of class names to include in the resulting schema</param>
/// <remarks>
/// If you only need to list schemas and class names, use the respective <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetSchemas" /> and
/// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -188,11 +188,11 @@
/// <summary>
/// Renders a dynamic overlay image of the map
/// </summary>
- /// <param name="map"></param>
- /// <param name="selection"></param>
- /// <param name="format"></param>
- /// <param name="selectionColor"></param>
- /// <param name="behaviour"></param>
+ /// <param name="map">The runtime map instance</param>
+ /// <param name="selection">The map selection</param>
+ /// <param name="format">The image format</param>
+ /// <param name="selectionColor">The color of the selection</param>
+ /// <param name="behaviour">The rendering behaviour</param>
/// <returns></returns>
/// <exception cref="T:System.NotSupportedException">Thrown if the service is too old to be able to support this API</exception>
System.IO.Stream RenderDynamicOverlay(RuntimeMap map, MapSelection selection, string format, Color selectionColor, int behaviour);
@@ -200,7 +200,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -212,7 +212,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
@@ -226,7 +226,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -239,7 +239,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
@@ -254,7 +254,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map instance.</param>
/// <param name="x">The x.</param>
/// <param name="y">The y.</param>
/// <param name="scale">The scale.</param>
@@ -268,7 +268,7 @@
/// <summary>
/// Renders the runtime map.
/// </summary>
- /// <param name="resourceId">The resource id.</param>
+ /// <param name="map">The runtime map</param>
/// <param name="x1">The x1.</param>
/// <param name="y1">The y1.</param>
/// <param name="x2">The x2.</param>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -222,7 +222,7 @@
int r;
byte[] buf = new byte[1024];
- bool rewound = false;
+ //bool rewound = false;
if (rewind)
{
if (source.CanSeek)
@@ -230,7 +230,7 @@
try
{
source.Position = 0;
- rewound = true;
+ //rewound = true;
}
catch { }
}
@@ -240,7 +240,7 @@
if (roSource != null && roSource.CanRewind)
{
roSource.Rewind();
- rewound = true;
+ //rewound = true;
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -143,11 +143,6 @@
((MgDoubleProperty)p).SetValue(record.GetDouble(name));
}
break;
- case MgPropertyType.Feature:
- {
- throw new NotSupportedException();
- }
- break;
case MgPropertyType.Geometry:
{
var agf = GeomConverter.GetAgf(record.GetGeometry(name));
@@ -169,11 +164,6 @@
((MgInt64Property)p).SetValue(record.GetInt64(name));
}
break;
- case MgPropertyType.Raster:
- {
- throw new NotSupportedException();
- }
- break;
case MgPropertyType.Single:
{
((MgSingleProperty)p).SetValue(record.GetSingle(name));
@@ -184,6 +174,8 @@
((MgStringProperty)p).SetValue(record.GetString(name));
}
break;
+ default:
+ throw new NotSupportedException();
}
}
}
@@ -241,11 +233,6 @@
props.Add(propVal);
}
break;
- case PropertyValueType.Feature:
- {
- throw new NotSupportedException();
- }
- break;
case PropertyValueType.Geometry:
{
var propVal = new MgGeometryProperty(name, null);
@@ -274,11 +261,6 @@
props.Add(propVal);
}
break;
- case PropertyValueType.Raster:
- {
- throw new NotSupportedException();
- }
- break;
case PropertyValueType.Single:
{
var propVal = new MgSingleProperty(name, 0.0f);
@@ -293,6 +275,8 @@
props.Add(propVal);
}
break;
+ default:
+ throw new NotSupportedException();
}
}
else
@@ -337,11 +321,6 @@
props.Add(new MgDoubleProperty(name, record.GetDouble(i)));
}
break;
- case PropertyValueType.Feature:
- {
- throw new NotSupportedException();
- }
- break;
case PropertyValueType.Geometry:
{
MgByteReader agf = GeomConverter.GetAgf(record.GetGeometry(i));
@@ -363,11 +342,6 @@
props.Add(new MgInt64Property(name, record.GetInt64(i)));
}
break;
- case PropertyValueType.Raster:
- {
- throw new NotSupportedException();
- }
- break;
case PropertyValueType.Single:
{
props.Add(new MgSingleProperty(name, record.GetSingle(i)));
@@ -378,6 +352,8 @@
props.Add(new MgStringProperty(name, record.GetString(i)));
}
break;
+ default:
+ throw new NotSupportedException();
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -54,7 +54,6 @@
private OSGeo.MapGuide.MgSiteConnection m_con;
private string m_locale;
private string m_sessionId;
- private Version m_siteVersion = null;
/// <summary>
/// The web config file
@@ -175,7 +174,7 @@
ex.Dispose();
return base.InferMPU(csWkt, units);
}
- catch (Exception ex) //Binding to assembly with pre-refactored CS API?
+ catch (Exception) //Binding to assembly with pre-refactored CS API?
{
return base.InferMPU(csWkt, units);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/OSGeo.MapGuide.MaestroAPI.Native32-2.2.0.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -53,6 +53,7 @@
<DefineConstants>TRACE;MG220</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="NetTopologySuite.Merged, Version=1.8.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
Modified: trunk/Tools/Maestro/RtMapInspector/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/MainForm.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/RtMapInspector/MainForm.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -430,7 +430,7 @@
_conn = login.Connection;
if (Array.IndexOf(_conn.Capabilities.SupportedServices, (int)ServiceType.Mapping) < 0)
{
- MessageBox.Show(Properties.Resources.ErrIncompatibleConnection);
+ MessageBox.Show(Strings.ErrIncompatibleConnection);
Application.Exit();
}
_mappingSvc = (IMappingService)_conn.GetService((int)ServiceType.Mapping);
@@ -458,7 +458,7 @@
if (_rtMap == null)
{
- MessageBox.Show(Properties.Resources.ErrFailedRuntimeMapOpen);
+ MessageBox.Show(Strings.ErrFailedRuntimeMapOpen);
return;
}
Modified: trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -59,23 +59,5 @@
resourceCulture = value;
}
}
-
- /// <summary>
- /// Looks up a localized string similar to Failed to open the Runtime Map.
- /// </summary>
- internal static string ErrFailedRuntimeMapOpen {
- get {
- return ResourceManager.GetString("ErrFailedRuntimeMapOpen", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The selected connection is not compatible.
- /// </summary>
- internal static string ErrIncompatibleConnection {
- get {
- return ResourceManager.GetString("ErrIncompatibleConnection", resourceCulture);
- }
- }
}
}
Modified: trunk/Tools/Maestro/RtMapInspector/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/Resources.resx 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/Resources.resx 2012-09-13 13:37:14 UTC (rev 7009)
@@ -112,15 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="ErrFailedRuntimeMapOpen" xml:space="preserve">
- <value>Failed to open the Runtime Map</value>
- </data>
- <data name="ErrIncompatibleConnection" xml:space="preserve">
- <value>The selected connection is not compatible</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/RtMapInspector/RtMapInspector.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -71,6 +71,11 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Strings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Strings.resx</DependentUpon>
+ </Compile>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
@@ -84,6 +89,10 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
+ <EmbeddedResource Include="Strings.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Added: trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs 2012-09-13 13:37:14 UTC (rev 7009)
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.17929
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace RtMapInspector {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Strings {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Strings() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RtMapInspector.Strings", typeof(Strings).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Failed to open the Runtime Map.
+ /// </summary>
+ internal static string ErrFailedRuntimeMapOpen {
+ get {
+ return ResourceManager.GetString("ErrFailedRuntimeMapOpen", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The selected connection is not compatible.
+ /// </summary>
+ internal static string ErrIncompatibleConnection {
+ get {
+ return ResourceManager.GetString("ErrIncompatibleConnection", resourceCulture);
+ }
+ }
+ }
+}
Added: trunk/Tools/Maestro/RtMapInspector/Strings.resx
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Strings.resx (rev 0)
+++ trunk/Tools/Maestro/RtMapInspector/Strings.resx 2012-09-13 13:37:14 UTC (rev 7009)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="ErrFailedRuntimeMapOpen" xml:space="preserve">
+ <value>Failed to open the Runtime Map</value>
+ </data>
+ <data name="ErrIncompatibleConnection" xml:space="preserve">
+ <value>The selected connection is not compatible</value>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -18,7 +18,8 @@
<AssemblyOriginatorKeyFile>..\ICSharpCode.SharpDevelop.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Modified: trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj
===================================================================
--- trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2012-09-12 17:01:54 UTC (rev 7008)
+++ trunk/Tools/Maestro/Thirdparty/SharpDevelop/ICSharpCode.TextEditor/ICSharpCode.TextEditor.csproj 2012-09-13 13:37:14 UTC (rev 7009)
@@ -24,7 +24,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<DelaySign>False</DelaySign>
<AssemblyOriginatorKeyMode>File</AssemblyOriginatorKeyMode>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Optimize>False</Optimize>
More information about the mapguide-commits
mailing list