Fix up unit tests and some code cleanup

Author: bclothier

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Media.Imaging;
-using NLog;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
 using Rubberduck.Parsing.Annotations;

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -544,8 +544,7 @@ public double FontSize
         public AddUserDocumentCommand AddUserDocumentCommand { get; set; }
         public AddTestModuleCommand AddTestModuleCommand { get; set; }
         public AddTestModuleWithStubsCommand AddTestModuleWithStubsCommand { get; set; }
-		//public CommandBase AddPredeclaredClassModuleCommand { get; set; }
-        public AddTemplateCommand AddTemplateCommand { get; set; }
+		public AddTemplateCommand AddTemplateCommand { get; set; }
         public CommandBase OpenDesignerCommand { get; set; }
         public CommandBase OpenProjectPropertiesCommand { get; set; }
         public SetAsStartupProjectCommand SetAsStartupProjectCommand { get; set; }

Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs

@@ -25,16 +25,16 @@ public bool CanAddComponent(CodeExplorerItemViewModel parameter, IEnumerable<Pro
             {
                 var project = GetDeclaration(parameter)?.Project;
 
-                if (project == null && _vbe.ProjectsCount == 1)
+                if (project != null || _vbe.ProjectsCount != 1)
                 {
-                    using (var vbProjects = _vbe.VBProjects)
-                    using (project = vbProjects[1])
-                    {                        
-                        return project != null && allowableProjectTypes.Contains(project.Type);                        
-                    }
+                    return project != null && allowableProjectTypes.Contains(project.Type);
                 }
 
-                return project != null && allowableProjectTypes.Contains(project.Type);
+                using (var vbProjects = _vbe.VBProjects)
+                using (project = vbProjects[1])
+                {                        
+                    return project != null && allowableProjectTypes.Contains(project.Type);                        
+                }
 
             }
             catch (COMException)
@@ -75,8 +75,8 @@ public void AddComponent(CodeExplorerItemViewModel node, string moduleText)
                 return; //The project is not available.
             }
 
-            string optionCompare = string.Empty;
-            using (IHostApplication hostApp = _vbe.HostApplication())
+            string optionCompare;
+            using (var hostApp = _vbe.HostApplication())
             {
                 optionCompare = hostApp?.ApplicationName == "Access" ? "Option Compare Database" :
                     string.Empty;
@@ -87,13 +87,12 @@ public void AddComponent(CodeExplorerItemViewModel node, string moduleText)
                 : ComponentsCollectionFromActiveProject())
             {
                 var folderAnnotation = $"'@Folder(\"{GetFolder(node)}\")";
-                string fileName = createTempTextFile(moduleText);
+                var fileName = CreateTempTextFile(moduleText);
 
                 using (var newComponent = components.Import(fileName))
                 {
                     using (var codeModule = newComponent.CodeModule)
                     {
-                        var delarationLines = string.Concat(folderAnnotation,  optionCompare);
                         if (optionCompare.Length > 0)
                         {
                             codeModule.InsertLines(1, optionCompare);
@@ -109,14 +108,14 @@ public void AddComponent(CodeExplorerItemViewModel node, string moduleText)
             }
         }
 
-        private string createTempTextFile(string moduleText)
+        private static string CreateTempTextFile(string moduleText)
         {
-            string tempFolder = ApplicationConstants.RUBBERDUCK_TEMP_PATH;
+            var tempFolder = ApplicationConstants.RUBBERDUCK_TEMP_PATH;
             if (!Directory.Exists(tempFolder))
             {
                 Directory.CreateDirectory(tempFolder);
             }
-            string filePath = Path.Combine(tempFolder, Path.GetRandomFileName());
+            var filePath = Path.Combine(tempFolder, Path.GetRandomFileName());
             File.WriteAllText(filePath, moduleText);
             return filePath;
         }

Rubberduck.Core/UI/CodeExplorer/Commands/AddPredeclaredClassModuleCommand.cs

@@ -376,7 +376,4 @@
   <data name="CodeExplorer_SetAsStartupProject" xml:space="preserve">
     <value>Set as start up</value>
   </data>
-  <data name="CodeExplorer_AddPredeclaredClassModuleText" xml:space="preserve">
-    <value>Predeclared Class module (.cls)</value>
-  </data>
 </root>