Feature/sonar issues (#30)

k3ldar · Sep 6, 2023 · 9a3e857 · 9a3e857
1 parent df15e05
commit 9a3e857
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 170 deletions.
diff --git a/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs b/src/GCAAnalyser/Analyzers/BaseAnalyzer.cs
@@ -4,14 +4,14 @@ namespace GSendAnalyzer.Analyzers
 {
     public class BaseAnalyzer
     {
-        protected bool HasCommandsOnSameLine(IGCodeCommand command, char ignoreCommands)
+        protected static bool HasCommandsOnSameLine(IGCodeCommand command, char ignoreCommands)
         {
             var commandsOnLine = CommandsOnSameLine(command);
 
             return commandsOnLine.Exists(c => c.Command != ignoreCommands);
         }
 
-        protected List<IGCodeCommand> CommandsOnSameLine(IGCodeCommand command)
+        protected static List<IGCodeCommand> CommandsOnSameLine(IGCodeCommand command)
         {
             if (command == null)
                 throw new ArgumentNullException(nameof(command));

diff --git a/src/GCSDesktop/Forms/FrmMachine.cs b/src/GCSDesktop/Forms/FrmMachine.cs
@@ -30,8 +30,6 @@
 
 using static GSendShared.Constants;
 
-//using static System.Windows.Forms.VisualStyles.VisualStyleElement.TrayNotify;
-
 namespace GSendDesktop.Forms
 {
     public partial class FrmMachine : BaseForm, IUiUpdate, IShortcutImplementation
@@ -200,8 +198,6 @@ private void ClientWebSocket_ProcessMessage(string message)
             if (String.IsNullOrWhiteSpace(message))
                 return;
 
-            //Trace.WriteLine($"Client: {message}");
-
             ClientBaseMessage clientMessage = null;
             try
             {
@@ -212,9 +208,6 @@ private void ClientWebSocket_ProcessMessage(string message)
                 return;
             }
 
-            //Trace.WriteLine(String.Format("Machine {0} Socket Message: {1}", _machine.Name, clientMessage.success));
-            //Trace.WriteLine(message);
-
             if (clientMessage == null)
                 return;
 
@@ -223,8 +216,6 @@ private void ClientWebSocket_ProcessMessage(string message)
                 ProcessFailedMessage(clientMessage);
             }
 
-            string serverCpu = String.Format(GSend.Language.Resources.ServerCpuStateConnected, clientMessage.ServerCpuStatus.ToString("N2"));
-
             switch (clientMessage.request)
             {
                 case "Stop":
@@ -307,7 +298,7 @@ private void ClientWebSocket_ProcessMessage(string message)
 
                 case "ResponseReceived":
                 case "MessageReceived":
-                    if (clientMessage.message.ToString().StartsWith("<") || _isJogging)
+                    if (clientMessage.message.ToString().StartsWith('<') || _isJogging)
                     {
                         _lastMessageWasHiddenCommand = true;
                     }
@@ -360,7 +351,7 @@ private void ClientWebSocket_ProcessMessage(string message)
                     break;
 
                 case Constants.MessageLineStatusUpdated:
-                    LineStatusUpdateModel lineStatusUpdateModel = (LineStatusUpdateModel)JsonSerializer.Deserialize<LineStatusUpdateModel>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
+                    LineStatusUpdateModel lineStatusUpdateModel = JsonSerializer.Deserialize<LineStatusUpdateModel>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
 
                     if (lineStatusUpdateModel != null && _gcodeLines != null)
                     {
@@ -384,7 +375,7 @@ private void ClientWebSocket_ProcessMessage(string message)
                     break;
 
                 case Constants.MessageInformationUpdate:
-                    InformationMessageModel informationMessageModel = (InformationMessageModel)JsonSerializer.Deserialize<InformationMessageModel>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
+                    InformationMessageModel informationMessageModel = JsonSerializer.Deserialize<InformationMessageModel>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
 
                     if (informationMessageModel != null)
                     {
@@ -397,7 +388,7 @@ private void ClientWebSocket_ProcessMessage(string message)
                     break;
 
                 case Constants.MessageConfigurationUpdated:
-                    ConfigurationUpdatedMessage updateMessage = (ConfigurationUpdatedMessage)JsonSerializer.Deserialize<ConfigurationUpdatedMessage>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
+                    ConfigurationUpdatedMessage updateMessage = JsonSerializer.Deserialize<ConfigurationUpdatedMessage>(clientMessage.message.ToString(), Constants.DefaultJsonSerializerOptions);
 
                     if (_machine.Name != updateMessage.Name)
                     {
@@ -465,7 +456,6 @@ protected override void UpdateEnabledState()
             mnuMachineLoadGCode.Enabled = _machineStatusModel?.IsRunning == false;
             mnuMachineClearGCode.Enabled = _machineStatusModel?.IsRunning == false && _gCodeAnalyses != null;
 
-            //tabPageServiceSchedule.Enabled = _machineConnected && _machineStatusModel?.IsRunning == false;
             tabPageSpindle.Enabled = _machineConnected && _machineStatusModel?.IsRunning == false;
         }
 

diff --git a/src/GCSDesktop/Forms/StartJobWizard.cs b/src/GCSDesktop/Forms/StartJobWizard.cs
@@ -48,9 +48,6 @@ public StartJobWizard(MachineStateModel machineStatusModel, IGCodeAnalyses gCode
             _gCodeAnalyses = gCodeAnalyses ?? throw new ArgumentNullException(nameof(gCodeAnalyses));
             _gSendApiWrapper = machineApiWrapper ?? throw new ArgumentNullException(nameof(machineApiWrapper));
 
-            if (machineApiWrapper == null)
-                throw new ArgumentNullException(nameof(machineApiWrapper));
-
             string jobName = DesktopSettings.ReadValue<string>(nameof(StartJobWizard), Constants.StartWizardSelectedJob, String.Empty);
 
             if (!String.IsNullOrEmpty(gCodeAnalyses.JobName))

diff --git a/src/GSend.sln b/src/GSend.sln
@@ -32,8 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GSendEditor", "GSendEditor\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GSendControls", "GSendControls\GSendControls.csproj", "{DE225549-B4AA-4A8B-BDEC-496C6B9628D0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GSendLicenseGenerator", "GSendLicenseGenerator\GSendLicenseGenerator.csproj", "{72B5B9AF-4DF3-406B-87E1-8F3FEFDBB5C4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wwwroot", "wwwroot", "{862EFEB6-17A5-4BD5-80BD-0E4F16AC2192}"
 	ProjectSection(SolutionItems) = preProject
 		..\wwwroot\Index.html = ..\wwwroot\Index.html
@@ -105,10 +103,6 @@ Global
 		{DE225549-B4AA-4A8B-BDEC-496C6B9628D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE225549-B4AA-4A8B-BDEC-496C6B9628D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE225549-B4AA-4A8B-BDEC-496C6B9628D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72B5B9AF-4DF3-406B-87E1-8F3FEFDBB5C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72B5B9AF-4DF3-406B-87E1-8F3FEFDBB5C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72B5B9AF-4DF3-406B-87E1-8F3FEFDBB5C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72B5B9AF-4DF3-406B-87E1-8F3FEFDBB5C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B1A0717-A7CC-47E9-8DEC-F19DC1C40932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B1A0717-A7CC-47E9-8DEC-F19DC1C40932}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B1A0717-A7CC-47E9-8DEC-F19DC1C40932}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/GSendLicenseGenerator/GSendLicenseGenerator.csproj b/src/GSendLicenseGenerator/GSendLicenseGenerator.csproj
diff --git a/src/GSendLicenseGenerator/Program.cs b/src/GSendLicenseGenerator/Program.cs
diff --git a/src/GSendLicenseGenerator/Properties/launchSettings.json b/src/GSendLicenseGenerator/Properties/launchSettings.json