Fixed some Code Analysis warnings.

Hardware/ATI/ADL.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 namespace OpenHardwareMonitor.Hardware.ATI {

Hardware/ATI/ATIGPU.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 
 namespace OpenHardwareMonitor.Hardware.ATI {

Hardware/CPU/AMD0FCPU.cs

@@ -36,9 +36,7 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 
 namespace OpenHardwareMonitor.Hardware.CPU {
   internal sealed class AMD0FCPU : Hardware, IHardware {

Hardware/CPU/CPUGroup.cs

@@ -38,7 +38,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Diagnostics;
 using System.Text;
 
 namespace OpenHardwareMonitor.Hardware.CPU {

Hardware/CPU/CPUID.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace OpenHardwareMonitor.Hardware.CPU {

Hardware/CPU/CPULoad.cs

@@ -36,9 +36,7 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace OpenHardwareMonitor.Hardware.CPU {
   internal class CPULoad {

Hardware/CPU/IntelCPU.cs

@@ -39,10 +39,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Threading;
 using System.Text;
+using System.Threading;
 
 namespace OpenHardwareMonitor.Hardware.CPU {
   internal sealed class IntelCPU : Hardware, IHardware {

Hardware/Computer.cs

@@ -37,14 +37,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Globalization;
-using System.Text;
+using System.IO;
-using System.Threading;
-using System.Security;
 using System.Security.Permissions;
 
-
 namespace OpenHardwareMonitor.Hardware {
 
   public class Computer : IComputer {

Hardware/Hardware.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using OpenHardwareMonitor.Collections;
 
 namespace OpenHardwareMonitor.Hardware {

Hardware/Heatmaster/Heatmaster.cs

@@ -36,7 +36,7 @@
 */
 
 using System;
-using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.IO.Ports;
 using System.Text;
@@ -44,7 +44,7 @@ using System.Text.RegularExpressions;
 using System.Threading;
 
 namespace OpenHardwareMonitor.Hardware.Heatmaster {
-  internal class Heatmaster : Hardware {
+  internal class Heatmaster : Hardware, IDisposable {
 
     private string portName;
     private SerialPort serialPort;
@@ -85,8 +85,9 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
       serialPort.WriteLine("[0:" + device + "]R" + field);
       for (int i = 0; i < 5; i++) {
         string s = ReadLine(200);
-        Match match = Regex.Match(s, @"-\[0:" + device.ToString() + @"\]R" +
+        Match match = Regex.Match(s, @"-\[0:" + 
-          Regex.Escape(field.ToString()) + ":(.*)");
+          device.ToString(CultureInfo.InvariantCulture) + @"\]R" +
+          Regex.Escape(field.ToString(CultureInfo.InvariantCulture)) + ":(.*)");
         if (match.Success) 
           return match.Groups[1].Value;
       }
@@ -114,8 +115,10 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
       serialPort.WriteLine("[0:" + device + "]W" + field + ":" + value);
       for (int i = 0; i < 5; i++) {
         string s = ReadLine(200);
-        Match match = Regex.Match(s, @"-\[0:" + device.ToString() + @"\]W" + 
+        Match match = Regex.Match(s, @"-\[0:" + 
-          Regex.Escape(field.ToString()) + ":" + value);
+          device.ToString(CultureInfo.InvariantCulture) + @"\]W" + 
+          Regex.Escape(field.ToString(CultureInfo.InvariantCulture)) +
+          ":" + value);
         if (match.Success)
           return true;
       }
@@ -123,7 +126,8 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
     }
 
     private bool WriteInteger(int device, char field, int value) {
-      return WriteField(device, field, value.ToString());
+      return WriteField(device, field, 
+        value.ToString(CultureInfo.InvariantCulture));
     }
 
     private bool WriteString(int device, char field, string value) {
@@ -233,7 +237,7 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
             string[] strings = s.Split(':');
             int[] ints = new int[strings.Length];
             for (int i = 0; i < ints.Length; i++)
-              ints[i] = int.Parse(strings[i]);
+              ints[i] = int.Parse(strings[i], CultureInfo.InvariantCulture);
             switch (device) {
               case 32:
                 if (ints.Length == 3 && ints[0] <= fans.Length) {
@@ -282,11 +286,11 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
       r.Append("Port: ");
       r.AppendLine(portName);
       r.Append("Hardware Revision: ");
-      r.AppendLine(hardwareRevision.ToString());
+      r.AppendLine(hardwareRevision.ToString(CultureInfo.InvariantCulture));
       r.Append("Firmware Revision: ");
-      r.AppendLine(firmwareRevision.ToString());
+      r.AppendLine(firmwareRevision.ToString(CultureInfo.InvariantCulture));
       r.Append("Firmware CRC: ");
-      r.AppendLine(firmwareCRC.ToString());
+      r.AppendLine(firmwareCRC.ToString(CultureInfo.InvariantCulture));
       r.AppendLine();
 
       return r.ToString();
@@ -294,6 +298,15 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
 
     public void Close() {
       serialPort.Close();
+      serialPort.Dispose();
+      serialPort = null;
+    }
+
+    public void Dispose() {
+      if (serialPort != null) {
+        serialPort.Dispose();
+        serialPort = null;
+      }
     }
   }
 }

Hardware/Heatmaster/HeatmasterGroup.cs

@@ -37,6 +37,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO.Ports;
 using System.Security;
 using System.Text;
@@ -99,77 +100,77 @@ namespace OpenHardwareMonitor.Hardware.Heatmaster {
 
       string[] portNames = GetRegistryPortNames();      
       for (int i = portNames.Length - 1; i >= 0; i--) {
-        try {
+        bool isValid = false;
+        try {        
+          using (SerialPort serialPort =
+            new SerialPort(portNames[i], 38400, Parity.None, 8, StopBits.One)) {
+            serialPort.NewLine = ((char)0x0D).ToString();            
+            report.Append("Port Name: "); report.AppendLine(portNames[i]);
 
-          SerialPort serialPort =
+            try {
-            new SerialPort(portNames[i], 38400, Parity.None, 8, StopBits.One);
+              serialPort.Open();
-          serialPort.NewLine = ((char)0x0D).ToString();
+            } catch (UnauthorizedAccessException) {
-
+              report.AppendLine("Exception: Access Denied");
-          bool isValid = false;
-          report.Append("Port Name: "); report.AppendLine(portNames[i]);
-
-          try {
-            serialPort.Open();
-          } catch (UnauthorizedAccessException) {
-            report.AppendLine("Exception: Access Denied");
-          }
-
-          if (serialPort.IsOpen) {
-            serialPort.DiscardInBuffer();
-            serialPort.DiscardOutBuffer(); 
-            serialPort.Write(new byte[] { 0xAA }, 0, 1);
-
-            int j = 0;
-            while (serialPort.BytesToRead == 0 && j < 10) {
-              Thread.Sleep(20);
-              j++;
             }
-            if (serialPort.BytesToRead > 0) {
+
-              bool flag = false;
+            if (serialPort.IsOpen) {
-              while (serialPort.BytesToRead > 0 && !flag) {
+              serialPort.DiscardInBuffer();
-                flag |= (serialPort.ReadByte() == 0xAA);
+              serialPort.DiscardOutBuffer();
+              serialPort.Write(new byte[] { 0xAA }, 0, 1);
+
+              int j = 0;
+              while (serialPort.BytesToRead == 0 && j < 10) {
+                Thread.Sleep(20);
+                j++;
               }
-              if (flag) {
+              if (serialPort.BytesToRead > 0) {
-                serialPort.WriteLine("[0:0]RH");
+                bool flag = false;
-                try {
+                while (serialPort.BytesToRead > 0 && !flag) {
-                  int k = 0;
+                  flag |= (serialPort.ReadByte() == 0xAA);
-                  int revision = 0;
+                }
-                  while (k < 5) {
+                if (flag) {
-                    string line = ReadLine(serialPort, 100);
+                  serialPort.WriteLine("[0:0]RH");
-                    if (line.StartsWith("-[0:0]RH:")) {
+                  try {
-                      int.TryParse(line.Substring(9), out revision);
+                    int k = 0;
-                      break;
+                    int revision = 0;
+                    while (k < 5) {
+                      string line = ReadLine(serialPort, 100);
+                      if (line.StartsWith("-[0:0]RH:",
+                        StringComparison.Ordinal)) {
+                        revision = int.Parse(line.Substring(9), 
+                          CultureInfo.InvariantCulture);
+                        break;
+                      }
+                      k++;
                     }
-                    k++;
+                    isValid = (revision == 770);
+                    if (!isValid) {
+                      report.Append("Status: Wrong Hardware Revision " +
+                        revision.ToString(CultureInfo.InvariantCulture));
+                    }
+                  } catch (TimeoutException) {
+                    report.AppendLine("Status: Timeout Reading Revision");
                   }
-                  isValid = (revision == 770); 
+                } else {
-                  if (!isValid) {
+                  report.AppendLine("Status: Wrong Startflag");
-                    report.Append("Status: Wrong Hardware Revision " + 
-                      revision.ToString());
-                  }                 
-                } catch (TimeoutException) {
-                  report.AppendLine("Status: Timeout Reading Revision");
                 }
               } else {
-                report.AppendLine("Status: Wrong Startflag");
+                report.AppendLine("Status: No Response");
               }
+              serialPort.DiscardInBuffer();
             } else {
-              report.AppendLine("Status: No Response");
+              report.AppendLine("Status: Port not Open");
-            }
+            }            
-            serialPort.DiscardInBuffer();
-            serialPort.Close();
-            serialPort.Dispose();
-          } else {
-            report.AppendLine("Status: Port not Open");
-          }                          
-          if (isValid) {
-            report.AppendLine("Status: OK");
-            hardware.Add(new Heatmaster(portNames[i], settings));
-            return;
           }
         } catch (Exception e) {
           report.AppendLine(e.ToString());
-        } 
+        }
+
+        if (isValid) {
+          report.AppendLine("Status: OK");
+          hardware.Add(new Heatmaster(portNames[i], settings));
+          return;
+        }
         report.AppendLine();
       }
     }

Hardware/HexStringArray.cs

@@ -37,7 +37,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenHardwareMonitor.Hardware {
   internal class HexStringArray {

Hardware/IComputer.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware {
 
   public delegate void HardwareEventHandler(IHardware hardware);

Hardware/IElement.cs

@@ -35,10 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenHardwareMonitor.Hardware {
   
   public interface IElement {

Hardware/IGroup.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware {
 
   internal interface IGroup {

Hardware/IHardware.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware {
 
   public delegate void SensorEventHandler(ISensor sensor);

Hardware/IParameter.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware {
 
   public interface IParameter : IElement {

Hardware/ISettings.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware {
   public interface ISettings {
 

Hardware/IVisitor.cs

@@ -35,10 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace OpenHardwareMonitor.Hardware {
 
   public interface IVisitor {

Hardware/Identifier.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace OpenHardwareMonitor.Hardware {
@@ -45,7 +44,7 @@ namespace OpenHardwareMonitor.Hardware {
 
     private static char SEPARATOR = '/';
 
-    private static void CheckIdentifiers(string[] identifiers) {
+    private static void CheckIdentifiers(string[] identifiers) {      
       foreach (string s in identifiers)
         if (s.Contains(" ") || s.Contains(SEPARATOR.ToString()))
           throw new ArgumentException("Invalid identifier");
@@ -97,7 +96,34 @@ namespace OpenHardwareMonitor.Hardware {
       if (other == null)
         return 1;
       else 
-        return this.identifier.CompareTo(other.identifier);
+        return string.Compare(this.identifier, other.identifier, 
+          StringComparison.Ordinal);
     }
+
+    public static bool operator ==(Identifier id1, Identifier id2) {
+      if (id1 == null)
+        return id2 == null;
+      else
+        return id1.Equals(id2);
+    }
+
+    public static bool operator !=(Identifier id1, Identifier id2) {
+      return !(id1 == id2);
+    }
+
+    public static bool operator <(Identifier id1, Identifier id2) {
+      if (id1 == null)
+        return id2 != null;
+      else 
+        return (id1.CompareTo(id2) < 0);
+    }
+
+    public static bool operator >(Identifier id1, Identifier id2) {
+      if (id1 == null)
+        return false;
+      else 
+        return (id1.CompareTo(id2) > 0);
+    }  
+
   }
 }

Hardware/LPC/Chip.cs

@@ -1,7 +1,39 @@
-
+/*
-using System;
+  
-using System.Collections.Generic;
+  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-using System.Text;
+
+  The contents of this file are subject to the Mozilla Public License Version
+  1.1 (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+ 
+  http://www.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+  for the specific language governing rights and limitations under the License.
+
+  The Original Code is the Open Hardware Monitor code.
+
+  The Initial Developer of the Original Code is 
+  Michael Möller <m.moeller@gmx.ch>.
+  Portions created by the Initial Developer are Copyright (C) 2009-2010
+  the Initial Developer. All Rights Reserved.
+
+  Contributor(s):
+
+  Alternatively, the contents of this file may be used under the terms of
+  either the GNU General Public License Version 2 or later (the "GPL"), or
+  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  in which case the provisions of the GPL or the LGPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of either the GPL or the LGPL, and not to allow others to
+  use your version of this file under the terms of the MPL, indicate your
+  decision by deleting the provisions above and replace them with the notice
+  and other provisions required by the GPL or the LGPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the MPL, the GPL or the LGPL.
+ 
+*/
 
 namespace OpenHardwareMonitor.Hardware.LPC {
 
@@ -59,7 +91,6 @@ namespace OpenHardwareMonitor.Hardware.LPC {
         default: return "Unknown";
       }
     }
-
   }
 
 }

Hardware/LPC/ISuperIO.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware.LPC {
   internal interface ISuperIO {
 

Hardware/LPC/IT87XX.cs

@@ -35,8 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 

Hardware/LPC/LMSensors.cs

@@ -35,7 +35,6 @@
  
 */
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;

Hardware/LPC/W836XX.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 

Hardware/Mainboard/Mainboard.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Text;
 using OpenHardwareMonitor.Hardware.LPC;
 

Hardware/Mainboard/MainboardGroup.cs

@@ -35,9 +35,6 @@
  
 */
 
-using System;
-using System.Collections.Generic;
-
 namespace OpenHardwareMonitor.Hardware.Mainboard {
   internal class MainboardGroup : IGroup {
 

Hardware/Mainboard/SuperIOHardware.cs

@@ -35,7 +35,6 @@
  
 */
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using OpenHardwareMonitor.Hardware.LPC;

Hardware/Nvidia/NVAPI.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 

Hardware/Nvidia/NvidiaGPU.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 

Hardware/Nvidia/NvidiaGroup.cs

@@ -35,7 +35,6 @@
  
 */
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;

Hardware/Parameter.cs

@@ -37,7 +37,6 @@
 
 using System;
 using System.Globalization;
-using System.Collections.Generic;
 
 namespace OpenHardwareMonitor.Hardware {
 

Hardware/SensorVisitor.cs

@@ -37,7 +37,6 @@
 
 using System;
 using System.Collections.Generic;
-using OpenHardwareMonitor.Hardware;
 
 namespace OpenHardwareMonitor.Hardware {
 

Hardware/TBalancer/FTD2XX.cs

@@ -36,7 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 namespace OpenHardwareMonitor.Hardware.TBalancer {

Hardware/TBalancer/TBalancer.cs

@@ -37,7 +37,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Globalization;
 using System.Text;
 

Hardware/TBalancer/TBalancerGroup.cs

@@ -38,8 +38,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.IO.Ports;
 using System.Text;
 using System.Threading;
 

Hardware/WinRing0.cs

@@ -36,8 +36,6 @@
 */
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;