[mapguide-commits] r5838 - in trunk/Tools/Maestro:
Maestro.Editors/Common
Maestro.Editors/LayerDefinition/Vector/Thematics
Maestro.Editors/MapDefinition OSGeo.MapGuide.MaestroAPI
OSGeo.MapGuide.MaestroAPI/CoordinateSystem
OSGeo.MapGuide.MaestroAPI/Feature
OSGeo.MapGuide.MaestroAPI/SchemaOverrides
OSGeo.MapGuide.MaestroAPI/Serialization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 24 06:49:22 EDT 2011
Author: jng
Date: 2011-05-24 03:49:22 -0700 (Tue, 24 May 2011)
New Revision: 5838
Modified:
trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
Log:
Small cleanup as recommended by FxCop
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -167,11 +167,5 @@
set { m_name = value; }
}
}
-
- internal void Bind(object dataSource, string dataMember)
- {
- //We're binding to the name of the image
- this.DataBindings.Add("Text", dataSource, dataMember);
- }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -36,10 +36,12 @@
/// Gets the name of the ColorBrewer set
/// </summary>
public string Name { get { return m_name; } }
+ /*
/// <summary>
/// Gets the assigned type for the ColorBrewer set
/// </summary>
public string Type { get { return m_type; } }
+ */
/// <summary>
/// Gets the ordered list of colors to use
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -151,7 +151,7 @@
}
public event EventHandler<TreeModelEventArgs> NodesRemoved;
-
+
protected void OnStructureChanged(TreePathEventArgs e)
{
var handler = this.StructureChanged;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -37,7 +37,7 @@
/// </summary>
/// <param name="parent">The parent.</param>
/// <param name="name">The name.</param>
- public CoordinateSystemCategory(ICoordinateSystemCatalog parent, string name)
+ protected CoordinateSystemCategory(ICoordinateSystemCatalog parent, string name)
{
m_name = name;
_parent = parent;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -33,7 +33,7 @@
protected Dictionary<string, PropertyValue> _values;
protected Dictionary<int, string> _ordinalMap;
- public RecordBase()
+ protected RecordBase()
{
_values = new Dictionary<string, PropertyValue>();
_ordinalMap = new Dictionary<int, string>();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -32,7 +32,7 @@
protected List<FeatureSchema> _schemas;
- public ConfigurationDocument()
+ protected ConfigurationDocument()
{
_spatialContexts = new List<IFdoSpatialContext>();
_schemas = new List<FeatureSchema>();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -47,7 +47,8 @@
m_stream = stream;
m_siteVersion = siteversion;
}
-
+
+ /*
private MgStreamHeader ReadStreamHeader()
{
MgStreamHeader h = new MgStreamHeader();
@@ -56,7 +57,7 @@
h.StreamVersion = BitConverter.ToUInt32(ReadStream(MgBinarySerializer.UInt32Len), 0);
h.StreamDataHdr = (MgStreamHeaderValues)BitConverter.ToUInt32(ReadStream(MgBinarySerializer.UInt32Len), 0);
return h;
- }
+ }*/
private MgArgumentPacket ReadArgumentPacket()
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -183,11 +183,12 @@
m_stream.Write(BitConverter.GetBytes(value), 0, UInt64Len);
}
+ /*
private void Write(float value)
{
Write(new MgArgumentPacket(MgPacketHeader.ArgumentSimple, MgArgumentType.Float, null, (ulong)FloatLen));
m_stream.Write(BitConverter.GetBytes(value), 0, FloatLen);
- }
+ }*/
/// <summary>
/// Writes the specified value.
@@ -296,6 +297,7 @@
m_stream.Write(BitConverter.GetBytes((UInt32)value.Length), 0, UInt32Len);
}
+ /*
/// <summary>
/// Writes the specified value.
/// </summary>
@@ -351,7 +353,7 @@
m_stream.Write(BitConverter.GetBytes((UInt32)value.ControlID), 0, UInt32Len);
WriteStreamEnd();
}
-
+ */
/// <summary>
/// Writes the raw.
/// </summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2011-05-24 02:15:40 UTC (rev 5837)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2011-05-24 10:49:22 UTC (rev 5838)
@@ -515,15 +515,6 @@
}
- private static void CopyNodeRecursive(System.Xml.XmlNode n1, System.Xml.XmlNode n2)
- {
- foreach (System.Xml.XmlAttribute attr in n1.Attributes)
- n2.Attributes.Append(n2.OwnerDocument.CreateAttribute(attr.Name)).Value = attr.Value;
-
- foreach (System.Xml.XmlNode n in n1.ChildNodes)
- CopyNodeRecursive(n, n2.AppendChild(n2.OwnerDocument.CreateElement(n.Name)));
- }
-
/// <summary>
/// Formats a number of bytes to a human readable format, ea.: 2.56 Kb
/// </summary>
More information about the mapguide-commits
mailing list