[mapguide-commits] r8715 - in trunk/Tools/Maestro: Maestro Maestro.AddIn.Rest/Properties Maestro.AddIn.Rest/UI Maestro.Shared.UI OSGeo.MapGuide.MaestroAPI/Capability OSGeo.MapGuide.MaestroAPI.Native OSGeo.MapGuide.ObjectModels/Properties Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 23 08:48:44 PDT 2015
Author: jng
Date: 2015-07-23 08:48:44 -0700 (Thu, 23 Jul 2015)
New Revision: 8715
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs
trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestConfigurationEditor.cs
trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs
trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
trunk/Tools/Maestro/Maestro/Program.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
Log:
#2565:
- Add some code analysis exceptions to GlobalAssemblyInfo.cs
- Fix some issues reported by the RefactoringEssentials analyzers
Modified: trunk/Tools/Maestro/Maestro/Program.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Program.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Maestro/Program.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -201,7 +201,7 @@
}
}
}
-
+
internal sealed class MaestroServiceManager : ServiceManager
{
private static ILoggingService loggingService = new TextWriterLoggingService(BroadcastTextWriter.Instance);
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -7,10 +7,7 @@
// associated with an assembly.
[assembly: AssemblyTitle("Maestro.AddIn.Rest")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Maestro.AddIn.Rest")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -21,16 +18,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e00b3cd6-9d5a-46a2-97da-c0bea22b644a")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestConfigurationEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestConfigurationEditor.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestConfigurationEditor.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2015, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2015, 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 Maestro.AddIn.Rest.Model;
using Maestro.Editors.Common;
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -92,9 +92,9 @@
public static void Run(string message, BusyWaitDelegate action, Action<object, Exception> onComplete, bool bPreserveThreadCulture)
{
if (action == null)
- throw new ArgumentNullException("action"); //NOXLATE
+ throw new ArgumentNullException(nameof(action)); //NOXLATE
if (onComplete == null)
- throw new ArgumentNullException("onComplete"); //NOXLATE
+ throw new ArgumentNullException(nameof(onComplete)); //NOXLATE
var frm = new BusyWaitDialog(action, bPreserveThreadCulture ? Thread.CurrentThread.CurrentCulture : null);
frm.lblBusy.Text = message;
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -173,6 +173,7 @@
/// <summary>
/// Defines the possible regions of the user interface a <see cref="IViewContent"/> can reside in
/// </summary>
+ [Flags]
public enum ViewRegion
{
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -37,8 +37,7 @@
/// <summary>
/// Resource types supported on *all* versions of MapGuide
/// </summary>
- private static string[] _defaultResTypes = new string[]
- {
+ private static readonly string[] _defaultResTypes = {
//ResourceTypes.RuntimeMap.ToString(),
//ResourceTypes.Selection.ToString(),
//ResourceTypes.Folder.ToString(),
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -334,7 +334,7 @@
{
return AggregateQueryFeatureSourceCore(resourceID, schema, filter, columns, null);
}
-
+
public override IReader AggregateQueryFeatureSource(string resourceID, string schema, string filter, System.Collections.Specialized.NameValueCollection aggregateFunctions)
{
return AggregateQueryFeatureSourceCore(resourceID, schema, filter, null, aggregateFunctions);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -33,4 +33,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("3.0.0.0")]
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0145:Removes 'private' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0129:Removes 'internal' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Language", "CSE0003:Use expression-bodied members", Justification = "The author prefers debuggability over succintness")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0007:The default underlying type of enums is int, so defining it explicitly is redundant.", Justification = "The author prefers to be explicit about underlying enum types")]
\ No newline at end of file
Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs 2015-07-23 15:47:47 UTC (rev 8714)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs 2015-07-23 15:48:44 UTC (rev 8715)
@@ -37,4 +37,9 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("6.0.0.0")]
+
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0145:Removes 'private' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0129:Removes 'internal' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Language", "CSE0003:Use expression-bodied members", Justification = "The author prefers debuggability over succintness")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0007:The default underlying type of enums is int, so defining it explicitly is redundant.", Justification = "The author prefers to be explicit about underlying enum types")]
\ No newline at end of file
More information about the mapguide-commits
mailing list