[mapguide-commits] r8461 - in trunk/Tools/Maestro: ExtendedModels/LayerDefinition-1.1.0 ExtendedModels/LayerDefinition-1.2.0 ExtendedModels/LayerDefinition-1.3.0 ExtendedModels/LayerDefinition-2.3.0 ExtendedModels/LayerDefinition-2.4.0 ExtendedModels/LoadProcedure-1.1.0 ExtendedModels/LoadProcedure-2.2.0 ExtendedModels/MapDefinition-2.3.0 ExtendedModels/MapDefinition-2.4.0 ExtendedModels/SymbolDefinition-1.1.0 ExtendedModels/SymbolDefinition-2.4.0 ExtendedModels/WatermarkDefinition-2.3.0 ExtendedModels/WebLayout-1.1.0 ExtendedModels/WebLayout-2.6.0 Generated MaestroAPITests OSGeo.MapGuide.ExtendedObjectModels OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Commands OSGeo.MapGuide.MaestroAPI/ObjectModels OSGeo.MapGuide.MaestroAPI.Http
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 25 04:22:27 PST 2014
Author: jng
Date: 2014-12-25 04:22:27 -0800 (Thu, 25 Dec 2014)
New Revision: 8461
Added:
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/BaseSerializable.cs
Modified:
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.1.0/LayerDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.2.0/LayerDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.3.0/LayerDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.3.0/LayerDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/LayerDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/LoadProcedure-1.1.0/LoadProcedureValidator.cs
trunk/Tools/Maestro/ExtendedModels/LoadProcedure-2.2.0/LoadProcedureValidator.cs
trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.3.0/MapDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/MapDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/SymbolDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-2.4.0/SymbolDefinitionValidator.cs
trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayout2Impl.cs
trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayoutValidator.cs
trunk/Tools/Maestro/ExtendedModels/WebLayout-2.6.0/WebLayout3Impl.cs
trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs
trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs
trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs
trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs
trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs
trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs
trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs
trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs
trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs
trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
Log:
#2513: Re-jig the existing object model classes to pave way for separation
- Rename namespaces
- Have resource classes inherit from either BaseSerializable or BaseSerializableMapDefinition to provide base functionality
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.1.0/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.1.0/LayerDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.1.0/LayerDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,31 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
{
public class LayerDefinitionValidator : BaseLayerDefinitionValidator
{
@@ -34,4 +37,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "1.1.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.2.0/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.2.0/LayerDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.2.0/LayerDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,31 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
{
public class LayerDefinitionValidator : BaseLayerDefinitionValidator
{
@@ -34,4 +37,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "1.2.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.3.0/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.3.0/LayerDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-1.3.0/LayerDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,31 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0
{
public class LayerDefinitionValidator : BaseLayerDefinitionValidator
{
@@ -34,4 +37,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "1.3.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.3.0/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.3.0/LayerDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.3.0/LayerDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,31 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0
{
public class LayerDefinitionValidator : BaseLayerDefinitionValidator
{
@@ -34,4 +37,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "2.3.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/LayerDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.4.0/LayerDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,31 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0
{
public class LayerDefinitionValidator : BaseLayerDefinitionValidator
{
@@ -34,4 +37,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "2.4.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LoadProcedure-1.1.0/LoadProcedureValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LoadProcedure-1.1.0/LoadProcedureValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LoadProcedure-1.1.0/LoadProcedureValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,29 +1,32 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0
{
public class LoadProcedureValidator : BaseLoadProcedureValidator
{
@@ -32,4 +35,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure.ToString(), "1.1.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/LoadProcedure-2.2.0/LoadProcedureValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/LoadProcedure-2.2.0/LoadProcedureValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/LoadProcedure-2.2.0/LoadProcedureValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,29 +1,32 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0
{
public class LoadProcedureValidator : BaseLoadProcedureValidator
{
@@ -32,4 +35,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure.ToString(), "2.2.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.3.0/MapDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.3.0/MapDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.3.0/MapDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,29 +1,32 @@
#region Disclaimer / License
+
// Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_3_0
{
public class MapDefinitionValidator : BaseMapDefinitionValidator
{
@@ -32,4 +35,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition.ToString(), "2.3.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/MapDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/MapDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.4.0/MapDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,29 +1,32 @@
#region Disclaimer / License
+
// Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_4_0
{
public class MapDefinitionValidator : BaseMapDefinitionValidator
{
@@ -32,4 +35,4 @@
get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition.ToString(), "2.4.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/SymbolDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/SymbolDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/SymbolDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,30 +1,33 @@
#region Disclaimer / License
+
// Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0
{
public class SymbolDefinitionValidator : BaseSymbolDefinitionValidator
{
@@ -33,4 +36,4 @@
get { return new ResourceTypeDescriptor(ResourceTypes.SymbolDefinition.ToString(), "1.1.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-2.4.0/SymbolDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-2.4.0/SymbolDefinitionValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-2.4.0/SymbolDefinitionValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,30 +1,33 @@
#region Disclaimer / License
+
// Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0
{
public class SymbolDefinitionValidator : BaseSymbolDefinitionValidator
{
@@ -33,4 +36,4 @@
get { return new ResourceTypeDescriptor(ResourceTypes.SymbolDefinition.ToString(), "2.4.0"); }
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,40 +1,45 @@
#region Disclaimer / License
+
// Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Text;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using System.IO;
#if WDF_240
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0
+
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0
{
- using Sdf240 = SymbolDefinition_2_4_0;
+ using Sdf240 = SymbolDefinition.v2_4_0;
+
#else
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0
{
- using Sdf110 = SymbolDefinition_1_1_0;
+ using Sdf110 = SymbolDefinition.v1_1_0;
#endif
public static class WdfEntryPoint
@@ -230,8 +235,8 @@
public Version SupportedMapDefinitionVersion
{
- get
- {
+ get
+ {
#if WDF_240
return new Version(2, 4, 0);
#else
@@ -335,7 +340,7 @@
partial class WatermarkTypePositionOverride { }
- partial class XYPositionType : IXYPosition
+ partial class XYPositionType : IXYPosition
{
[XmlIgnore]
public override OSGeo.MapGuide.ObjectModels.WatermarkDefinition.PositionType Type
@@ -414,4 +419,4 @@
partial class VerticalPositionType : IVerticalPosition { }
partial class HorizontalPositionType : IHorizontalPosition { }
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayout2Impl.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayout2Impl.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayout2Impl.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,33 +1,38 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.WebLayout;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
#if WL260
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0
+
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0
#elif WL240
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0
+
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0
#else
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0
#endif
{
partial class WebLayoutType : IWebLayout2
@@ -44,4 +49,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayoutValidator.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/WebLayout-1.1.0/WebLayoutValidator.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,34 +1,38 @@
#region Disclaimer / License
+
// Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using System;
using System.Collections.Generic;
using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
#if WL260
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0
#elif WL240
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0
+
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0
#else
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0
#endif
{
public class WebLayoutValidator : BaseWebLayoutValidator
@@ -44,4 +48,4 @@
#endif
}
}
-}
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/ExtendedModels/WebLayout-2.6.0/WebLayout3Impl.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WebLayout-2.6.0/WebLayout3Impl.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/ExtendedModels/WebLayout-2.6.0/WebLayout3Impl.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -1,29 +1,34 @@
#region Disclaimer / License
+
// Copyright (C) 2014, 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
+//
+
+#endregion Disclaimer / License
+
using OSGeo.MapGuide.ObjectModels.WebLayout;
#if WL260
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0
+
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0
{
partial class WebLayoutType : IWebLayout3
{
}
}
-#endif
+
+#endif
\ No newline at end of file
Modified: trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><Enab
leInitializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -20,7 +20,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute("ApplicationDefinition", Namespace="", IsNullable=false)]
- public partial class ApplicationDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class ApplicationDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string titleField;
@@ -155,7 +155,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><Enab
leInitializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
Modified: trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFie
lds>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0
{
using System;
using System.Diagnostics;
@@ -26,7 +26,8 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
- public partial class DrawingSource : System.ComponentModel.INotifyPropertyChanged {
+ public partial class DrawingSource : BaseSerializable, System.ComponentModel.INotifyPropertyChanged
+ {
[EditorBrowsable(EditorBrowsableState.Never)]
private string sourceNameField;
@@ -124,7 +125,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.FeatureSource</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0
{
using System;
using System.Diagnostics;
@@ -22,7 +22,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute("FeatureSource", Namespace="", IsNullable=false)]
- public partial class FeatureSourceType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class FeatureSourceType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string providerField;
@@ -222,7 +222,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -78,7 +78,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -215,7 +215,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
{
using System;
using System.Diagnostics;
@@ -16,7 +16,7 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0;
/// <summary>
/// The specification of the data source and stylization for a layer.
@@ -81,7 +81,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -218,7 +218,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
{
using System;
using System.Diagnostics;
@@ -16,7 +16,7 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
/// <summary>
/// The specification of the data source and stylization for a layer.
@@ -81,7 +81,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -218,7 +218,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0 {
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -15,7 +15,7 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
/// <summary>
/// The specification of the data source and stylization for a layer.
@@ -80,7 +80,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -217,7 +217,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0 {
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -15,8 +15,8 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
- using OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
+ using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
/// <summary>
/// The specification of the data source and stylization for a layer.
@@ -81,7 +81,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -218,7 +218,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInit
ializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0 {
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -15,8 +15,8 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0;
- using OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
+ using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
/// <summary>
/// The specification of the data source and stylization for a layer.
@@ -81,7 +81,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -218,7 +218,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LayerDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LayerDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private BaseLayerDefinitionType itemField;
Modified: trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -52,7 +52,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -189,7 +189,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LoadProcedureTypeType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LoadProcedureTypeType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private LoadProcedureType itemField;
Modified: trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0 {
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -78,7 +78,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -215,7 +215,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LoadProcedureTypeType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LoadProcedureTypeType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private LoadProcedureType itemField;
Modified: trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0 {
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -78,7 +78,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -215,7 +215,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class LoadProcedureTypeType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class LoadProcedureTypeType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private LoadProcedureType itemField;
Modified: trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.MapDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0
{
using System;
using System.Diagnostics;
@@ -14,7 +14,6 @@
using System.Xml.Schema;
using System.ComponentModel;
using System.IO;
- using OSGeo.MapGuide.MaestroAPI;
using System.Drawing;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
@@ -55,7 +54,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -192,7 +191,8 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class MapDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class MapDefinitionType : BaseSerializableMapDefinition, System.ComponentModel.INotifyPropertyChanged
+ {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
@@ -277,10 +277,10 @@
[System.Xml.Serialization.XmlElementAttribute("BackgroundColor")]
public string BackgroundColorAsHtml {
get {
- return Utility.SerializeHTMLColor(this.backgroundColorField, true);
+ return base.SerializeHTMLColor(this.backgroundColorField, true);
}
set {
- var c = Utility.ParseHTMLColor(value);
+ var c = base.ParseHTMLColor(value);
if ((this.backgroundColorField != null)) {
if ((backgroundColorField.Equals(c) != true)) {
this.backgroundColorField = c;
Modified: trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.MapDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_3_0
{
using System;
using System.Diagnostics;
@@ -14,10 +14,9 @@
using System.Xml.Schema;
using System.ComponentModel;
using System.IO;
- using OSGeo.MapGuide.MaestroAPI;
using System.Drawing;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
- using OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0;
+ using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
/// <summary>
/// A MapDefinition defines the collection of layers, groupings of layers, and base map
@@ -75,7 +74,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -212,7 +211,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class MapDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class MapDefinitionType : BaseSerializableMapDefinition, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
@@ -300,10 +299,10 @@
[System.Xml.Serialization.XmlElementAttribute("BackgroundColor")]
public string BackgroundColorAsHtml {
get {
- return Utility.SerializeHTMLColor(this.backgroundColorField, true);
+ return base.SerializeHTMLColor(this.backgroundColorField, true);
}
set {
- var c = Utility.ParseHTMLColor(value);
+ var c = base.ParseHTMLColor(value);
if ((this.backgroundColorField != null)) {
if ((backgroundColorField.Equals(c) != true)) {
this.backgroundColorField = c;
Modified: trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.MapDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_4_0
{
using System;
using System.Diagnostics;
@@ -14,10 +14,9 @@
using System.Xml.Schema;
using System.ComponentModel;
using System.IO;
- using OSGeo.MapGuide.MaestroAPI;
using System.Drawing;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
- using OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0;
+ using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
/// <summary>
/// A MapDefinition defines the collection of layers, groupings of layers, and base map
@@ -75,7 +74,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -212,7 +211,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class MapDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class MapDefinitionType : BaseSerializableMapDefinition, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
@@ -300,10 +299,10 @@
[System.Xml.Serialization.XmlElementAttribute("BackgroundColor")]
public string BackgroundColorAsHtml {
get {
- return Utility.SerializeHTMLColor(this.backgroundColorField, true);
+ return base.SerializeHTMLColor(this.backgroundColorField, true);
}
set {
- var c = Utility.ParseHTMLColor(value);
+ var c = base.ParseHTMLColor(value);
if ((this.backgroundColorField != null)) {
if ((backgroundColorField.Equals(c) != true)) {
this.backgroundColorField = c;
Modified: trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.PrintLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitiali
zeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -21,7 +21,7 @@
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)]
- public partial class PrintLayout : System.ComponentModel.INotifyPropertyChanged {
+ public partial class PrintLayout : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private PrintLayoutPageProperties pagePropertiesField;
@@ -135,7 +135,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableIni
tializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -246,7 +246,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -4842,7 +4842,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class SymbolDefinitionBase : System.ComponentModel.INotifyPropertyChanged {
+ public partial class SymbolDefinitionBase : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableIni
tializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0 {
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -246,7 +246,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -4928,7 +4928,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class SymbolDefinitionBase : System.ComponentModel.INotifyPropertyChanged {
+ public partial class SymbolDefinitionBase : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableIni
tializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0 {
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -246,7 +246,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -4982,7 +4982,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class SymbolDefinitionBase : System.ComponentModel.INotifyPropertyChanged {
+ public partial class SymbolDefinitionBase : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string nameField;
Modified: trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolLibrary</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
lizeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -20,7 +20,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute("SymbolLibrary", Namespace="", IsNullable=false)]
- public partial class SymbolLibraryType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class SymbolLibraryType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string descriptionField;
@@ -91,7 +91,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>WatermarkDefinition-2.3.0.cs</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLazyLoading>False</EnableLazyLoading><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><VirtualProp>False</VirtualProp><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><EnableEncoding>False</
EnableEncoding><AutomaticProperties>False</AutomaticProperties><GenerateShouldSerialize>False</GenerateShouldSerialize><DisableDebug>False</DisableDebug><PropNameSpecified>Default</PropNameSpecified><Encoder>UTF8</Encoder><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0 {
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -15,9 +15,9 @@
using System.IO;
using System.Text;
using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
- using OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0;
+ using OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
/// <summary>
/// The specification of a watermark.
@@ -81,7 +81,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -217,7 +217,7 @@
[System.SerializableAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class WatermarkDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class WatermarkDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private WatermarkDefinitionTypeContent contentField;
Modified: trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>WatermarkDefinition-2.3.0.cs</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLazyLoading>False</EnableLazyLoading><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><VirtualProp>False</VirtualProp><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><EnableEncoding>False</
EnableEncoding><AutomaticProperties>False</AutomaticProperties><GenerateShouldSerialize>False</GenerateShouldSerialize><DisableDebug>False</DisableDebug><PropNameSpecified>Default</PropNameSpecified><Encoder>UTF8</Encoder><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0 {
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -16,7 +16,7 @@
using System.Text;
using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
using OSGeo.MapGuide.ObjectModels.Common;
- using OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
/// <summary>
/// The specification of a watermark.
@@ -80,7 +80,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
@@ -216,7 +216,7 @@
[System.SerializableAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=true)]
- public partial class WatermarkDefinitionType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class WatermarkDefinitionType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private WatermarkDefinitionTypeContent contentField;
Modified: trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitialize
Fields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0 {
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -20,7 +20,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute("WebLayout", Namespace="", IsNullable=false)]
- public partial class WebLayoutType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class WebLayoutType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string titleField;
@@ -238,7 +238,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -6,11 +6,11 @@
// </auto-generated>
// ------------------------------------------------------------------------------
#if WL260
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0 {
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0 {
#elif WL240
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0 {
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0 {
#else
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0 {
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0 {
#endif
using System;
using System.Diagnostics;
@@ -26,7 +26,7 @@
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlRootAttribute("WebLayout", Namespace="", IsNullable=false)]
- public partial class WebLayoutType : System.ComponentModel.INotifyPropertyChanged {
+ public partial class WebLayoutType : BaseSerializable, System.ComponentModel.INotifyPropertyChanged {
[EditorBrowsable(EditorBrowsableState.Never)]
private string titleField;
@@ -390,7 +390,7 @@
/// </summary>
/// <returns>string XML value</returns>
public virtual string Serialize() {
- return OSGeo.MapGuide.MaestroAPI.Utility.NormalizedSerialize(Serializer, this);
+ return base.NormalizedSerialize(Serializer, this);
}
/// <summary>
Modified: trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/MaestroAPITests/MaestroAPITests.csproj 2014-12-25 12:22:27 UTC (rev 8461)
@@ -651,6 +651,9 @@
<Name>OSGeo.MapGuide.MaestroAPI</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Modified: trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -68,7 +68,7 @@
var app2 = app.Clone();
Assert.AreNotSame(app, app2);
- var fs = new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.FeatureSourceType();
+ var fs = new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.FeatureSourceType();
var fs2 = fs.Clone();
Assert.AreNotSame(fs, fs2);
@@ -84,7 +84,7 @@
var wl2 = wl.Clone();
Assert.AreNotSame(wl, wl2);
- var sl = new OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0.SymbolLibraryType();
+ var sl = new OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0.SymbolLibraryType();
var sl2 = sl.Clone();
Assert.AreNotSame(sl, sl2);
Modified: trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -473,9 +473,9 @@
//SDF3 conversion, generalization and 2 missing files
Assert.AreEqual(4, set.GetAllIssues().Length);
- lp = new OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcedure()
+ lp = new OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcedure()
{
- Item = new OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.DwgLoadProcedureType()
+ Item = new OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.DwgLoadProcedureType()
};
lp.ResourceID = id;
set = new ValidationResultSet();
@@ -485,9 +485,9 @@
//Not supported
Assert.AreEqual(1, set.GetAllIssues().Length);
- lp = new OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcedure()
+ lp = new OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcedure()
{
- Item = new OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.RasterLoadProcedureType()
+ Item = new OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.RasterLoadProcedureType()
};
lp.ResourceID = id;
set = new ValidationResultSet();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -27,22 +27,22 @@
using OSGeo.MapGuide.ObjectModels.LoadProcedure;
using System;
using System.Runtime.CompilerServices;
-using Ldf110 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0;
-using Ldf120 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0;
-using Ldf130 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0;
-using Ldf230 = OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0;
-using Ldf240 = OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0;
-using Lp110 = OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0;
-using Lp220 = OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0;
-using Mdf230 = OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0;
-using Mdf240 = OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0;
-using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
-using Sym240 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0;
-using Wdf230 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0;
-using Wdf240 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0;
-using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0;
-using WL240 = OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0;
-using WL260 = OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0;
+using Ldf110 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0;
+using Ldf120 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0;
+using Ldf130 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0;
+using Ldf230 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0;
+using Ldf240 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0;
+using Lp110 = OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0;
+using Lp220 = OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0;
+using Mdf230 = OSGeo.MapGuide.ObjectModels.MapDefinition.v2_3_0;
+using Mdf240 = OSGeo.MapGuide.ObjectModels.MapDefinition.v2_4_0;
+using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
+using Sym240 = OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
+using Wdf230 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
+using Wdf240 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
+using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0;
+using WL240 = OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0;
+using WL260 = OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0;
namespace OSGeo.MapGuide.ExtendedObjectModels
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -366,7 +366,7 @@
else if (spatialContexts.SpatialContext.Count == 0) //Case 2: No Spatial contexts. Declare one using SupplementalContextInfo
{
//Register the default CS from the load procedure
- fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType()
+ fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.SpatialContextType()
{
Name = "Default", //NOXLATE
CoordinateSystem = shpl.CoordinateSystem
@@ -383,7 +383,7 @@
if (string.IsNullOrEmpty(sc.CoordinateSystemWkt))
{
//Register the default CS from the load procedure
- fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType()
+ fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.SpatialContextType()
{
Name = sc.Name,
CoordinateSystem = shpl.CoordinateSystem
@@ -645,7 +645,7 @@
if (spatialContexts.SpatialContext.Count == 0)
{
//Register the default CS from the load procedure
- fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType()
+ fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.SpatialContextType()
{
Name = "Default", //NOXLATE
CoordinateSystem = proc.CoordinateSystem
@@ -662,7 +662,7 @@
if (string.IsNullOrEmpty(sc.CoordinateSystemWkt))
{
//Register the default CS from the load procedure
- fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType()
+ fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.SpatialContextType()
{
Name = sc.Name,
CoordinateSystem = proc.CoordinateSystem
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2014-12-25 12:22:27 UTC (rev 8461)
@@ -260,6 +260,7 @@
<Compile Include="Mapping\NsDoc.cs" />
<Compile Include="CsHelper.cs" />
<Compile Include="NsDoc.cs" />
+ <Compile Include="ObjectModels\BaseSerializable.cs" />
<Compile Include="ObjectModels\CommonTypes.cs" />
<Compile Include="ObjectModels\FdoCapabilities.cs" />
<Compile Include="ObjectModels\IFdoSpatialContext.cs" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -31,7 +31,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0
{
partial class CustomContentType : IExtension
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -25,7 +25,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0
{
using OSGeo.MapGuide.MaestroAPI;
using System.Xml.Serialization;
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/BaseSerializable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/BaseSerializable.cs (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/BaseSerializable.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -0,0 +1,53 @@
+#region Disclaimer / License
+
+// Copyright (C) 2014, 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 Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace OSGeo.MapGuide.ObjectModels
+{
+ public class BaseSerializable
+ {
+ protected virtual string NormalizedSerialize(XmlSerializer serializer, object obj)
+ {
+ return Utility.NormalizedSerialize(serializer, obj);
+ }
+ }
+
+ public class BaseSerializableMapDefinition : BaseSerializable
+ {
+ protected string SerializeHTMLColor(Color color, bool bIncludeAlpha)
+ {
+ return Utility.SerializeHTMLColor(color, bIncludeAlpha);
+ }
+
+ protected Color ParseHTMLColor(string strColor)
+ {
+ return Utility.ParseHTMLColor(strColor);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -30,7 +30,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0
{
partial class DrawingSource : IDrawingSource
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -30,7 +30,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0
{
partial class FeatureSourceType : IFeatureSource
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -565,7 +565,7 @@
public static void AddSpatialContextOverride(this IFeatureSource fs, string name, string coordSys)
{
Check.NotNull(fs, "fs"); //NOXLATE
- fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType() { Name = name, CoordinateSystem = coordSys });
+ fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.SpatialContextType() { Name = name, CoordinateSystem = coordSys });
}
/// <summary>
@@ -588,7 +588,7 @@
public static void AddRelateProperty(this IAttributeRelation rel, string primary, string secondary)
{
Check.NotNull(rel, "rel"); //NOXLATE
- rel.AddRelateProperty(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.RelatePropertyType() { FeatureClassProperty = primary, AttributeClassProperty = secondary });
+ rel.AddRelateProperty(new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.RelatePropertyType() { FeatureClassProperty = primary, AttributeClassProperty = secondary });
}
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -27,18 +27,18 @@
#pragma warning disable 1591, 0114, 0108
#if LDF_110
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
#elif LDF_120
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
#elif LDF_130
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0
#elif LDF_230
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0
#elif LDF_240
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0
#else
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0
#endif
{
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -31,18 +31,19 @@
#pragma warning disable 1591, 0114, 0108
#if LDF_110
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
#elif LDF_120
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
#elif LDF_130
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0
#elif LDF_230
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0
+
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0
#elif LDF_240
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0
#else
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0
#endif
{
/// <summary>
@@ -129,9 +130,9 @@
var vl = new VectorLayerDefinitionType()
{
#if LDF_240
- Watermarks = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0.WatermarkType>()
+ Watermarks = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0.WatermarkType>()
#elif LDF_230
- Watermarks = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0.WatermarkType>()
+ Watermarks = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0.WatermarkType>()
#endif
};
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -6,12 +6,12 @@
#pragma warning disable 1591, 0114, 0108
#if LP110
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0
#elif LP220
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0
#else
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0
#endif
{
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -30,12 +30,12 @@
#pragma warning disable 1591, 0114, 0108
#if LP110
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0
#elif LP220
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0
#else
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0
#endif
{
partial class LoadProcedure : ILoadProcedure
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -36,13 +36,13 @@
#pragma warning disable 1591, 0114, 0108
#if MDF_240
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_4_0
#elif MDF_230
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_3_0
#else
-namespace OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0
#endif
{
partial class MapDefinitionType
@@ -92,9 +92,9 @@
MapLayer = new System.ComponentModel.BindingList<MapLayerType>(),
MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>(),
#if MDF_240
- Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0.WatermarkType>()
+ Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0.WatermarkType>()
#elif MDF_230
- Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0.WatermarkType>()
+ Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0.WatermarkType>()
#endif
};
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -23,7 +23,7 @@
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Services;
using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0;
using OSGeo.MapGuide.ObjectModels.Common;
using OSGeo.MapGuide.ObjectModels.DrawingSource;
using OSGeo.MapGuide.ObjectModels.FeatureSource;
@@ -114,33 +114,33 @@
_layerFactories.Add(
new Version(1, 0, 0),
- new LayerCreatorFunc(OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0.LdfEntryPoint.CreateDefault));
+ new LayerCreatorFunc(OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0.LdfEntryPoint.CreateDefault));
_loadProcFactories.Add(
LoadType.Sdf,
- new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcEntryPoint.CreateDefaultSdf));
+ new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcEntryPoint.CreateDefaultSdf));
_loadProcFactories.Add(
LoadType.Shp,
- new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcEntryPoint.CreateDefaultShp));
+ new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcEntryPoint.CreateDefaultShp));
_loadProcFactories.Add(
LoadType.Dwf,
- new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcEntryPoint.CreateDefaultDwf));
+ new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcEntryPoint.CreateDefaultDwf));
_wlFactories.Add(
new Version(1, 0, 0),
- new WebLayoutCreatorFunc(OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0.WebLayoutEntryPoint.CreateDefault));
+ new WebLayoutCreatorFunc(OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0.WebLayoutEntryPoint.CreateDefault));
_compoundSymbolFactories.Add(
new Version(1, 0, 0),
- new CompoundSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition.CreateDefault));
+ new CompoundSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.CompoundSymbolDefinition.CreateDefault));
_simpleSymbolFactories.Add(
new Version(1, 0, 0),
- new SimpleSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition.CreateDefault));
+ new SimpleSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.SimpleSymbolDefinition.CreateDefault));
_mapDefinitionFactories.Add(
new Version(1, 0, 0),
- new MapDefinitionCreatorFunc(OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0.MdfEntryPoint.CreateDefault));
+ new MapDefinitionCreatorFunc(OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0.MdfEntryPoint.CreateDefault));
}
/// <summary>
@@ -307,12 +307,12 @@
{
Check.NotNull(owner, "owner"); //NOXLATE
- return new OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0.DrawingSource()
+ return new OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0.DrawingSource()
{
CurrentConnection = owner,
SourceName = string.Empty,
CoordinateSpace = string.Empty,
- Sheet = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0.DrawingSourceSheet>()
+ Sheet = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0.DrawingSourceSheet>()
};
}
@@ -326,11 +326,11 @@
{
Check.NotNull(owner, "owner"); //NOXLATE
- return new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.FeatureSourceType()
+ return new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.FeatureSourceType()
{
CurrentConnection = owner,
Provider = provider,
- Parameter = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.NameValuePairType>()
+ Parameter = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.NameValuePairType>()
};
}
@@ -1178,12 +1178,12 @@
{
Check.NotNull(owner, "owner"); //NOXLATE
- return new OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayout()
+ return new OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayout()
{
CurrentConnection = owner,
- CustomLogos = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayoutLogo>(),
- CustomText = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayoutText>(),
- LayoutProperties = new OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayoutLayoutProperties()
+ CustomLogos = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayoutLogo>(),
+ CustomText = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayoutText>(),
+ LayoutProperties = new OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayoutLayoutProperties()
{
ShowCustomLogos = false,
ShowCustomLogosSpecified = true,
@@ -1202,9 +1202,9 @@
ShowURL = false,
ShowURLSpecified = true
},
- PageProperties = new OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayoutPageProperties()
+ PageProperties = new OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayoutPageProperties()
{
- BackgroundColor = new OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayoutPagePropertiesBackgroundColor()
+ BackgroundColor = new OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayoutPagePropertiesBackgroundColor()
{
}
},
@@ -1332,10 +1332,10 @@
/// <returns></returns>
public static IFeatureSourceExtension CreateFeatureSourceExtension()
{
- return new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.FeatureSourceTypeExtension()
+ return new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.FeatureSourceTypeExtension()
{
- CalculatedProperty = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.CalculatedPropertyType>(),
- AttributeRelate = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.AttributeRelateType>()
+ CalculatedProperty = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.CalculatedPropertyType>(),
+ AttributeRelate = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.AttributeRelateType>()
};
}
@@ -1345,7 +1345,7 @@
/// <returns></returns>
public static ICalculatedProperty CreateCalculatedProperty()
{
- return new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.CalculatedPropertyType();
+ return new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.CalculatedPropertyType();
}
/// <summary>
@@ -1354,9 +1354,9 @@
/// <returns></returns>Properties.Resources.
public static IAttributeRelation CreateAttributeRelation()
{
- IAttributeRelation rel = new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.AttributeRelateType()
+ IAttributeRelation rel = new OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.AttributeRelateType()
{
- RelateProperty = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.RelatePropertyType>(),
+ RelateProperty = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.RelatePropertyType>(),
};
rel.RelateType = RelateTypeEnum.LeftOuter;
rel.ForceOneToOne = false;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -29,7 +29,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0
{
partial class PrintLayout : IPrintLayout
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -28,12 +28,12 @@
using System.Xml;
#if SYM_DEF_240
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0
#elif SYM_DEF_110
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0
#else
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0
#endif
{
public static class SymbolDefEntryPoint
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -33,12 +33,12 @@
#pragma warning disable 1591, 0114, 0108
#if SYM_DEF_240
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0
#elif SYM_DEF_110
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0
#else
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0
#endif
{
abstract partial class SymbolDefinitionBase : ISymbolDefinitionBase
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -29,7 +29,7 @@
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0
{
partial class SymbolLibraryType : ISymbolLibrary
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -31,20 +31,21 @@
#pragma warning disable 1591, 0114, 0108
#if LDF_110
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
+
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
#elif LDF_120
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
#elif LDF_130
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0
#elif LDF_230
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0
#elif LDF_240
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0
#else
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0
#endif
{
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
@@ -2131,11 +2132,11 @@
return new SymbolInstance()
{
#if LDF_110
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition)symDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.SimpleSymbolDefinition)symDef,
#elif LDF_120 || LDF_130 || LDF_230
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.SimpleSymbolDefinition)symDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.SimpleSymbolDefinition)symDef,
#else
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.SimpleSymbolDefinition)symDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.SimpleSymbolDefinition)symDef,
#endif
ParameterOverrides = new ParameterOverrides()
{
@@ -2149,11 +2150,11 @@
return new SymbolInstance()
{
#if LDF_110
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition)compDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.CompoundSymbolDefinition)compDef,
#elif LDF_120 || LDF_130 || LDF_230
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.CompoundSymbolDefinition)compDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.CompoundSymbolDefinition)compDef,
#else
- Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.CompoundSymbolDefinition)compDef,
+ Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.CompoundSymbolDefinition)compDef,
#endif
ParameterOverrides = new ParameterOverrides()
{
@@ -2182,14 +2183,14 @@
{
var libId = this.Item as string;
#if LDF_110
- var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition;
- var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition;
+ var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.SimpleSymbolDefinition;
+ var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.CompoundSymbolDefinition;
#elif LDF_120 || LDF_130 || LDF_230
- var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.SimpleSymbolDefinition;
- var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.CompoundSymbolDefinition;
+ var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.SimpleSymbolDefinition;
+ var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.CompoundSymbolDefinition;
#else
- var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.SimpleSymbolDefinition;
- var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.CompoundSymbolDefinition;
+ var simpSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.SimpleSymbolDefinition;
+ var compSym = this.Item as OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.CompoundSymbolDefinition;
#endif
if (libId != null)
return new SymbolInstanceLibrary() { ResourceId = libId };
@@ -2211,19 +2212,19 @@
{
#if LDF_110
if (ir.SymbolDefinition.Type == SymbolDefinitionType.Simple)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.SimpleSymbolDefinition)ir.SymbolDefinition;
else if (ir.SymbolDefinition.Type == SymbolDefinitionType.Compound)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.CompoundSymbolDefinition)ir.SymbolDefinition;
#elif LDF_120 || LDF_130 || LDF_230
if (ir.SymbolDefinition.Type == SymbolDefinitionType.Simple)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.SimpleSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.SimpleSymbolDefinition)ir.SymbolDefinition;
else if (ir.SymbolDefinition.Type == SymbolDefinitionType.Compound)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0.CompoundSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0.CompoundSymbolDefinition)ir.SymbolDefinition;
#else
if (ir.SymbolDefinition.Type == SymbolDefinitionType.Simple)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.SimpleSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.SimpleSymbolDefinition)ir.SymbolDefinition;
else if (ir.SymbolDefinition.Type == SymbolDefinitionType.Compound)
- this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0.CompoundSymbolDefinition)ir.SymbolDefinition;
+ this.Item = (OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0.CompoundSymbolDefinition)ir.SymbolDefinition;
#endif
}
this.Item = null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -32,14 +32,14 @@
#pragma warning disable 1591, 0114, 0108
#if WL260
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0
#elif WL240
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0
#elif WL110
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0
#else
-namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0
#endif
{
public static class WebLayoutEntryPoint
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -79,7 +79,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0.ApplicationDefinitionType.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0.ApplicationDefinitionType.Deserialize(xml); }
});
//DrawingSource 1.0.0
@@ -88,7 +88,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0.DrawingSource.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0.DrawingSource.Deserialize(xml); }
});
//FeatureSource 1.0.0
@@ -97,7 +97,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.FeatureSourceType.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0.FeatureSourceType.Deserialize(xml); }
});
//LayerDefinition 1.0.0
@@ -106,7 +106,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0.LayerDefinition.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0.LayerDefinition.Deserialize(xml); }
});
//LoadProcedure 1.0.0
@@ -115,7 +115,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcedure.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0.LoadProcedure.Deserialize(xml); }
});
//MapDefinition 1.0.0
@@ -123,8 +123,8 @@
ResourceTypeDescriptor.MapDefinition,
new ResourceSerializer()
{
- Serialize = (res) => { return OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0.MdfEntryPoint.Serialize(res); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0.MdfEntryPoint.Deserialize(xml); }
+ Serialize = (res) => { return OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0.MdfEntryPoint.Serialize(res); },
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0.MdfEntryPoint.Deserialize(xml); }
});
//PrintLayout 1.0.0
@@ -133,7 +133,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0.PrintLayout.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0.PrintLayout.Deserialize(xml); }
});
//SymbolDefinition 1.0.0
@@ -149,12 +149,12 @@
doc.LoadXml(xml);
if (doc.DocumentElement.Name == "SimpleSymbolDefinition") //NOXLATE
{
- return OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition.Deserialize(xml);
+ return OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.SimpleSymbolDefinition.Deserialize(xml);
}
else
{
if (doc.DocumentElement.Name == "CompoundSymbolDefinition") //NOXLATE
- return OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition.Deserialize(xml);
+ return OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0.CompoundSymbolDefinition.Deserialize(xml);
else //WTF?
throw new SerializationException(Strings.ErrorCouldNotDetermineSymbolType);
}
@@ -167,7 +167,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0.SymbolLibraryType.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0.SymbolLibraryType.Deserialize(xml); }
});
//WebLayout 1.0.0
@@ -176,7 +176,7 @@
new ResourceSerializer()
{
Serialize = (res) => { return res.SerializeToStream(); },
- Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0.WebLayoutType.Deserialize(xml); }
+ Deserialize = (xml) => { return OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0.WebLayoutType.Deserialize(xml); }
});
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs 2014-12-25 12:14:34 UTC (rev 8460)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs 2014-12-25 12:22:27 UTC (rev 8461)
@@ -32,7 +32,7 @@
using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
using OSGeo.MapGuide.MaestroAPI.Services;
using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0;
using OSGeo.MapGuide.ObjectModels.Capabilities;
using OSGeo.MapGuide.ObjectModels.Common;
using OSGeo.MapGuide.ObjectModels.RuntimeMap;
More information about the mapguide-commits
mailing list