Cleanup

pontusm · Aug 12, 2011 · 0f8b787 · 0f8b787
1 parent 0ef992b
commit 0f8b787
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 55 deletions.
diff --git a/Deployer/DatabaseDetailsForm.cs b/Deployer/DatabaseDetailsForm.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Data;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using System.Windows.Forms;
 using DeployerEngine.Database;
 

diff --git a/Deployer/Deployer.csproj b/Deployer/Deployer.csproj
@@ -119,24 +119,12 @@
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Design">
-      <Name>System.Design</Name>
-    </Reference>
-    <Reference Include="System.DirectoryServices">
-      <Name>System.DirectoryServices</Name>
-    </Reference>
     <Reference Include="System.Drawing">
       <Name>System.Drawing</Name>
     </Reference>
-    <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
-    <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms">
       <Name>System.Windows.Forms</Name>
     </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
     <ProjectReference Include="..\DeployerEngine\DeployerEngine.csproj">
       <Name>DeployerEngine</Name>
       <Project>{99BF4268-5703-42B3-BE7A-148C722F277F}</Project>
@@ -147,6 +135,7 @@
       <Project>{A3045A2C-B793-4F71-9F1D-4B2A218A9F2F}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
     </ProjectReference>
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.ico" />

diff --git a/Deployer/MainForm.cs b/Deployer/MainForm.cs
@@ -513,7 +513,7 @@ private enum FolderTreeNodeFlags {
 					// No matching filter?
 					if (file == null) {
 						_menuInclude.DropDownItems.Add(string.Format("Only \"{0}\"", item.Text), null,
-						                               new EventHandler(_menuIncludeSingle_Click));
+													   new EventHandler(_menuIncludeSingle_Click));
 					}
 				}
 			}
@@ -599,9 +599,9 @@ private enum FolderTreeNodeFlags {
 				if (file != null) {
 					DialogResult result =
 						MessageBox.Show(this,
-						                string.Format("Are you sure you want to remove this filter?\r\n\r\nExpression: {0} ({1})",
-						                              file.MatchingFilter.Expression, file.MatchingFilter.ExpressionType), "Remove filter",
-						                MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
+										string.Format("Are you sure you want to remove this filter?\r\n\r\nExpression: {0} ({1})",
+													  file.MatchingFilter.Expression, file.MatchingFilter.ExpressionType), "Remove filter",
+										MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
 					if (result == DialogResult.Cancel)
 						break; // Cancel operation
 
@@ -876,7 +876,7 @@ private enum FolderTreeNodeFlags {
 				if (_currentProject != null && _currentProject.IsDirty()) {
 					DialogResult result =
 						MessageBox.Show(this, "Project has been modified. Do you wish to save it before closing?", "Project modified",
-						                MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+										MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
 					switch (result) {
 						case DialogResult.Yes:
 							if (!SaveProject())
@@ -915,8 +915,8 @@ private enum FolderTreeNodeFlags {
 
 				ResetProjectState();
 
-                RefreshUI(false);
-                SetStatusText("New project created.");
+				RefreshUI(false);
+				SetStatusText("New project created.");
 				UpdateMainFormTitle();
 			}
 			catch (Exception ex) {
@@ -1187,7 +1187,7 @@ private enum FolderTreeNodeFlags {
 				AddToLog("Files(s) added to queue.");
 			else
 				MessageBox.Show(this, "The file or files you selected have no deployment rules set up. You need to configure matching filters in order to deploy the files.",
-				                "No files found", MessageBoxButtons.OK, MessageBoxIcon.Information);
+								"No files found", MessageBoxButtons.OK, MessageBoxIcon.Information);
 			UpdateUI();
 		}
 
@@ -1332,7 +1332,7 @@ private enum FolderTreeNodeFlags {
 								string errtxt = string.Format("Unable to edit file '{0}'. Error: {1}", file.Name, ex.Message);
 								AddToLog(errtxt);
 								DialogResult res = MessageBox.Show(this, errtxt, "Unable to edit file",
-								                                   MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+																   MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
 								if (res == DialogResult.Cancel)
 									return;							// Skip any other files as well
 
@@ -1500,10 +1500,10 @@ private enum FolderTreeNodeFlags {
 				if (remotetimestamp.LastDeployment > localtimestamp.LastDeployment) {
 					DialogResult res =
 						MessageBox.Show(this,
-						                string.Format(
-						                	"Project has been deployed by {0} ({1}) since you last deployed. Are you sure you want to continue?",
-						                	remotetimestamp.DeployedBy, remotetimestamp.LastDeployment), "Deployment warning",
-						                MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+										string.Format(
+											"Project has been deployed by {0} ({1}) since you last deployed. Are you sure you want to continue?",
+											remotetimestamp.DeployedBy, remotetimestamp.LastDeployment), "Deployment warning",
+										MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
 					if (res == DialogResult.No)
 						return false;
 				}

diff --git a/DeployerEngine/DeployerEngine.csproj b/DeployerEngine/DeployerEngine.csproj
@@ -114,7 +114,6 @@
     <Reference Include="System.Drawing">
       <Name>System.Drawing</Name>
     </Reference>
-    <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Services">
       <Name>System.Web.Services</Name>
     </Reference>

diff --git a/DeployerPluginInterfaces/DeployerPluginInterfaces.csproj b/DeployerPluginInterfaces/DeployerPluginInterfaces.csproj
@@ -105,15 +105,9 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
     <Reference Include="System.Windows.Forms">
       <Name>System.Windows.Forms</Name>
     </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">

diff --git a/DeployerPluginInterfaces/IDeployerPlugin.cs b/DeployerPluginInterfaces/IDeployerPlugin.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Windows.Forms;
-using System.Xml;
 
 namespace DeployerPluginInterfaces
 {

diff --git a/DeployerPlugins/DeployerPlugins.csproj b/DeployerPlugins/DeployerPlugins.csproj
@@ -111,16 +111,9 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
     <Reference Include="System.Drawing">
       <Name>System.Drawing</Name>
     </Reference>
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Web.Services">
-      <Name>System.Web.Services</Name>
-    </Reference>
     <Reference Include="System.Windows.Forms">
       <Name>System.Windows.Forms</Name>
     </Reference>

diff --git a/DeployerPlugins/File/FileReadOnlyForm.cs b/DeployerPlugins/File/FileReadOnlyForm.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace DeployerPlugins {

diff --git a/DeployerPlugins/ServiceController/ServiceStatusWindow.cs b/DeployerPlugins/ServiceController/ServiceStatusWindow.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace DeployerPlugins
 {