[mapguide-commits] r8472 - in trunk/Tools/Maestro/SDK/Samples: . DrawMap DwfInspector HelloAddIn MapViewer QueryFeatureSource SchemaViewer StandaloneWebLayoutEditor
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Dec 27 09:24:11 PST 2014
Author: jng
Date: 2014-12-27 09:24:11 -0800 (Sat, 27 Dec 2014)
New Revision: 8472
Modified:
trunk/Tools/Maestro/SDK/Samples/
trunk/Tools/Maestro/SDK/Samples/DrawMap/DrawMap.csproj
trunk/Tools/Maestro/SDK/Samples/DrawMap/Form1.cs
trunk/Tools/Maestro/SDK/Samples/DwfInspector/DwfInspector.csproj
trunk/Tools/Maestro/SDK/Samples/DwfInspector/Form1.cs
trunk/Tools/Maestro/SDK/Samples/HelloAddIn/HelloAddIn.csproj
trunk/Tools/Maestro/SDK/Samples/HelloAddIn/SidePanel.cs
trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs
trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj
trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/Form1.cs
trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/QueryFeatureSource.csproj
trunk/Tools/Maestro/SDK/Samples/SchemaViewer/Form1.cs
trunk/Tools/Maestro/SDK/Samples/SchemaViewer/SchemaViewer.csproj
trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/Form1.cs
trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/StandaloneWebLayoutEditor.csproj
Log:
Fix SDK code samples in light of #2513
Property changes on: trunk/Tools/Maestro/SDK/Samples
___________________________________________________________________
Modified: svn:ignore
- Samples.suo
Samples.sln.docstates.suo
+ Samples.suo
Samples.sln.docstates.suo
*.suo
Modified: trunk/Tools/Maestro/SDK/Samples/DrawMap/DrawMap.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/DrawMap/DrawMap.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/DrawMap/DrawMap.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -60,14 +60,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Modified: trunk/Tools/Maestro/SDK/Samples/DrawMap/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/DrawMap/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/DrawMap/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -28,7 +28,7 @@
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Services;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.ObjectModels;
namespace DrawMap
{
@@ -43,11 +43,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
Modified: trunk/Tools/Maestro/SDK/Samples/DwfInspector/DwfInspector.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/DwfInspector/DwfInspector.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/DwfInspector/DwfInspector.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -60,14 +60,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Modified: trunk/Tools/Maestro/SDK/Samples/DwfInspector/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/DwfInspector/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/DwfInspector/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -30,7 +30,6 @@
using OSGeo.MapGuide.MaestroAPI.Services;
using OSGeo.MapGuide.ObjectModels.DrawingSource;
using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ExtendedObjectModels;
namespace DwfInspector
{
@@ -46,11 +45,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
@@ -131,7 +125,7 @@
// The DWF file we upload must be the same name as the SourceName property
// in the DrawingSource and the resource data name that we are uploading as
- IDrawingSource ds = ObjectFactory.CreateDrawingSource(_conn);
+ IDrawingSource ds = ObjectFactory.CreateDrawingSource();
ds.SourceName = Path.GetFileName(txtDwfPath.Text);
string resId = "Session:" + _conn.SessionID + "//InspectedDwf.DrawingSource";
Modified: trunk/Tools/Maestro/SDK/Samples/HelloAddIn/HelloAddIn.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/HelloAddIn/HelloAddIn.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/HelloAddIn/HelloAddIn.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -56,6 +56,9 @@
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Modified: trunk/Tools/Maestro/SDK/Samples/HelloAddIn/SidePanel.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/HelloAddIn/SidePanel.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/HelloAddIn/SidePanel.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -16,6 +16,7 @@
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Exceptions;
using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels;
namespace HelloAddIn
{
@@ -122,7 +123,7 @@
}
worker.ReportProgress(0);
- var context = new ResourceValidationContext(conn.ResourceService, conn.FeatureService);
+ var context = new ResourceValidationContext(conn);
var set = new ValidationResultSet();
int i = 0;
Modified: trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -8,9 +8,9 @@
using System.Windows.Forms;
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ExtendedObjectModels;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
using Maestro.Editors.Generic;
+using OSGeo.MapGuide.ObjectModels;
namespace MapViewer
{
@@ -25,11 +25,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
Modified: trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/MapViewer/MapViewer.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -44,12 +44,12 @@
<Reference Include="Maestro.MapViewer">
<HintPath>..\..\bin\Maestro.MapViewer.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels">
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI">
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Modified: trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -28,7 +28,7 @@
using Maestro.Editors.Generic;
using OSGeo.MapGuide.MaestroAPI.Feature;
using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.ObjectModels;
namespace QueryFeatureSource
{
@@ -43,11 +43,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
Modified: trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/QueryFeatureSource.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/QueryFeatureSource.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/QueryFeatureSource/QueryFeatureSource.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -60,14 +60,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Modified: trunk/Tools/Maestro/SDK/Samples/SchemaViewer/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/SchemaViewer/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/SchemaViewer/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -27,7 +27,7 @@
using Maestro.Editors.Generic;
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.ObjectModels;
namespace SchemaViewer
{
@@ -42,11 +42,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
Modified: trunk/Tools/Maestro/SDK/Samples/SchemaViewer/SchemaViewer.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/SchemaViewer/SchemaViewer.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/SchemaViewer/SchemaViewer.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -60,14 +60,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Modified: trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/Form1.cs
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/Form1.cs 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/Form1.cs 2014-12-27 17:24:11 UTC (rev 8472)
@@ -28,7 +28,7 @@
using Maestro.Editors.Generic;
using Maestro.Editors;
using Maestro.Editors.WebLayout;
-using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.ObjectModels;
namespace StandaloneWebLayoutEditor
{
@@ -48,11 +48,6 @@
protected override void OnLoad(EventArgs e)
{
- //This call is a one-time only call that will instantly register all known resource
- //version types and validators. This way you never have to manually reference a
- //ObjectModels assembly of the desired resource type you want to work with
- ModelSetup.Initialize();
-
//Anytime we work with the Maestro API, we require an IServerConnection
//reference. The Maestro.Login.LoginDialog provides a UI to obtain such a
//reference.
Modified: trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/StandaloneWebLayoutEditor.csproj
===================================================================
--- trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/StandaloneWebLayoutEditor.csproj 2014-12-27 17:16:54 UTC (rev 8471)
+++ trunk/Tools/Maestro/SDK/Samples/StandaloneWebLayoutEditor/StandaloneWebLayoutEditor.csproj 2014-12-27 17:24:11 UTC (rev 8472)
@@ -60,14 +60,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\Maestro.Login.dll</HintPath>
</Reference>
- <Reference Include="OSGeo.MapGuide.ExtendedObjectModels, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\bin\OSGeo.MapGuide.ExtendedObjectModels.dll</HintPath>
- </Reference>
<Reference Include="OSGeo.MapGuide.MaestroAPI, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=f526c48929fda856, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\bin\OSGeo.MapGuide.MaestroAPI.dll</HintPath>
</Reference>
+ <Reference Include="OSGeo.MapGuide.ObjectModels">
+ <HintPath>..\..\bin\OSGeo.MapGuide.ObjectModels.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
More information about the mapguide-commits
mailing list