Running code cleanup

tom-englert · tom-englert · commit 6711249cb6e2 · 2018-05-19T19:16:19.000+02:00
diff --git a/ResXManager.Infrastructure/ICredentialItem.cs b/ResXManager.Infrastructure/ICredentialItem.cs
@@ -1,13 +1,9 @@
 ﻿namespace tomenglertde.ResXManager.Infrastructure
 {
-    using System;
     using System.ComponentModel;
-    using System.Diagnostics.Contracts;
 
     using JetBrains.Annotations;
 
-    using PropertyChanged;
-
     public interface ICredentialItem : INotifyPropertyChanged
     {
         [NotNull]
diff --git a/ResXManager.Infrastructure/ITracer.cs b/ResXManager.Infrastructure/ITracer.cs
@@ -13,7 +13,6 @@
 
     using TomsToolbox.Desktop.Composition;
 
-    [ContractClass(typeof(TracerContract))]
     public interface ITracer
     {
         void TraceError([Localizable(false)][NotNull] string value);
@@ -23,28 +22,6 @@ public interface ITracer
         void WriteLine([Localizable(false)][NotNull] string value);
     }
 
-    [ContractClassFor(typeof(ITracer))]
-    internal abstract class TracerContract : ITracer
-    {
-        void ITracer.TraceError(string value)
-        {
-            Contract.Requires(value != null);
-            throw new System.NotImplementedException();
-        }
-
-        void ITracer.TraceWarning(string value)
-        {
-            Contract.Requires(value != null);
-            throw new System.NotImplementedException();
-        }
-
-        void ITracer.WriteLine(string value)
-        {
-            Contract.Requires(value != null);
-            throw new System.NotImplementedException();
-        }
-    }
-
     public static class TracerExtensions
     {
         public static void TraceError([NotNull] this ITracer tracer, [Localizable(false)][NotNull] string format, [NotNull][ItemNotNull] params object[] args)
diff --git a/ResXManager.Model/CodeReferenceTracker.cs b/ResXManager.Model/CodeReferenceTracker.cs
@@ -373,14 +373,14 @@ internal CodeReference([NotNull] ProjectFile projectFile, int lineNumber, [NotNu
             LineSegments = lineSegments;
         }
 
-        public int LineNumber { get; private set; }
+        public int LineNumber { get; }
 
         [CanBeNull]
-        public ProjectFile ProjectFile { get; private set; }
+        public ProjectFile ProjectFile { get; }
 
         [ItemNotNull]
         [CanBeNull]
-        public IList<string> LineSegments { get; private set; }
+        public IList<string> LineSegments { get; }
     }
 
     internal static class CodeReferenceExtensionMethods
diff --git a/ResXManager.Model/ExcelExtensions.cs b/ResXManager.Model/ExcelExtensions.cs
@@ -7,7 +7,7 @@
     using System.Diagnostics.Contracts;
     using System.Globalization;
     using System.Linq;
-    using System.Text;
+
     using DocumentFormat.OpenXml;
     using DocumentFormat.OpenXml.Packaging;
     using DocumentFormat.OpenXml.Spreadsheet;
diff --git a/ResXManager.VSIX/FodyWeavers.xml b/ResXManager.VSIX/FodyWeavers.xml
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-  <AutoProperties/>
-  <Throttle/>
-  <PropertyChanged/>
-  <LoadAssembliesOnStartup IncludeAssemblies="System.Windows.Interactivity|Microsoft.Expression.Interactions|DataGridExtensions"/>
+  <AutoProperties />
+  <Throttle />
+  <PropertyChanged />
+  <LoadAssembliesOnStartup IncludeAssemblies="System.Windows.Interactivity|Microsoft.Expression.Interactions|DataGridExtensions" />
 </Weavers>
diff --git a/ResXManager.VSIX/ItemKind.cs b/ResXManager.VSIX/ItemKind.cs
@@ -1,7 +1,7 @@
-using JetBrains.Annotations;
-
 namespace tomenglertde.ResXManager.VSIX
 {
+    using JetBrains.Annotations;
+
     using Microsoft.VisualStudio;
 
     internal static class ItemKind
diff --git a/ResXManager.VSIX/MyToolWindow.cs b/ResXManager.VSIX/MyToolWindow.cs
@@ -15,7 +15,6 @@
     using System.Windows.Controls;
     using System.Windows.Controls.Primitives;
     using System.Windows.Documents;
-    using System.Windows.Threading;
 
     using JetBrains.Annotations;
 
diff --git a/ResXManager.VSIX/OutputWindowTracer.cs b/ResXManager.VSIX/OutputWindowTracer.cs
@@ -1,7 +1,6 @@
 ﻿namespace tomenglertde.ResXManager.VSIX
 {
     using System;
-    using System.ComponentModel.Composition;
     using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Contracts;
diff --git a/ResXManager.VSIX/Visuals/ShowErrorsConfigurationView.xaml b/ResXManager.VSIX/Visuals/ShowErrorsConfigurationView.xaml
@@ -16,8 +16,8 @@
       <TextBlock Text="{x:Static properties:Resources.ShowErrorsConfiguration_ShowAs}" DockPanel.Dock="Left" VerticalAlignment="Center" />
       <Decorator Width="8" DockPanel.Dock="Left" />
       <ComboBox ItemsSource="{Binding Source={x:Type shell:TaskErrorCategory}, Converter={x:Static toms:EnumToValuesConverter.Default}}"
-                SelectedItem="{Binding Configuration.TaskErrorCategory}" 
-                Width="200" HorizontalAlignment="Left"/>
+                SelectedItem="{Binding Configuration.TaskErrorCategory}"
+                Width="200" HorizontalAlignment="Left" />
     </DockPanel>
   </StackPanel>
 </UserControl>
diff --git a/ResXManager.VSIX/Visuals/ShowErrorsConfigurationViewModel.cs b/ResXManager.VSIX/Visuals/ShowErrorsConfigurationViewModel.cs
@@ -1,6 +1,5 @@
 ﻿namespace tomenglertde.ResXManager.VSIX.Visuals
 {
-    using System.ComponentModel;
     using System.ComponentModel.Composition;
 
     using JetBrains.Annotations;
diff --git a/ResXManager.VSIX/Visuals/VsixShellView.xaml.cs b/ResXManager.VSIX/Visuals/VsixShellView.xaml.cs
@@ -1,15 +1,11 @@
 ﻿namespace tomenglertde.ResXManager.VSIX.Visuals
 {
     using System;
-    using System.Collections.Generic;
     using System.ComponentModel.Composition;
     using System.ComponentModel.Composition.Hosting;
     using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Contracts;
-    using System.Globalization;
-    using System.IO;
-    using System.Linq;
     using System.Windows;
     using System.Windows.Media;
 
diff --git a/ResXManager.View/Appearance.cs b/ResXManager.View/Appearance.cs
@@ -1,9 +1,9 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View
+﻿namespace tomenglertde.ResXManager.View
 {
     using System.Windows;
 
+    using JetBrains.Annotations;
+
     public static class Appearance
     {
         [CanBeNull]
diff --git a/ResXManager.View/ColumnHeaders/ColumnHeader.cs b/ResXManager.View/ColumnHeaders/ColumnHeader.cs
@@ -1,9 +1,9 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View.ColumnHeaders
+﻿namespace tomenglertde.ResXManager.View.ColumnHeaders
 {
     using System.Windows.Controls;
 
+    using JetBrains.Annotations;
+
     public class ColumnHeader : ContentControl, IColumnHeader
     {
         public ColumnHeader([CanBeNull] object content, ColumnType columnType)
diff --git a/ResXManager.View/Converters/CultureToXmlLanguageConverter.cs b/ResXManager.View/Converters/CultureToXmlLanguageConverter.cs
@@ -1,12 +1,12 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View.Converters
+﻿namespace tomenglertde.ResXManager.View.Converters
 {
     using System;
     using System.Globalization;
     using System.Windows.Data;
     using System.Windows.Markup;
 
+    using JetBrains.Annotations;
+
     public class CultureToXmlLanguageConverter : IValueConverter
     {
         [NotNull]
diff --git a/ResXManager.View/Converters/IsCellSelectionInvariantConverter.cs b/ResXManager.View/Converters/IsCellSelectionInvariantConverter.cs
@@ -1,6 +1,4 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View.Converters
+﻿namespace tomenglertde.ResXManager.View.Converters
 {
     using System;
     using System.Collections.Generic;
@@ -9,6 +7,8 @@ namespace tomenglertde.ResXManager.View.Converters
     using System.Windows.Controls;
     using System.Windows.Data;
 
+    using JetBrains.Annotations;
+
     using tomenglertde.ResXManager.View.Tools;
 
     public sealed class IsCellSelectionInvariantConverter : IValueConverter
diff --git a/ResXManager.View/Converters/LanguageColumnFilterConverter.cs b/ResXManager.View/Converters/LanguageColumnFilterConverter.cs
@@ -1,12 +1,12 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View.Converters
+﻿namespace tomenglertde.ResXManager.View.Converters
 {
     using System;
     using System.Globalization;
     using System.Windows.Controls;
     using System.Windows.Data;
 
+    using JetBrains.Annotations;
+
     using tomenglertde.ResXManager.View.ColumnHeaders;
 
     public class LanguageColumnFilterConverter : IValueConverter
diff --git a/ResXManager.View/Themes/ResourceKeys.cs b/ResXManager.View/Themes/ResourceKeys.cs
@@ -1,9 +1,9 @@
-﻿using JetBrains.Annotations;
-
-namespace tomenglertde.ResXManager.View.Themes
+﻿namespace tomenglertde.ResXManager.View.Themes
 {
     using System.Windows;
 
+    using JetBrains.Annotations;
+
     public static class ResourceKeys
     {
         /// <summary>
diff --git a/ResXManager.View/Tools/CultureOverrideEventArgs.cs b/ResXManager.View/Tools/CultureOverrideEventArgs.cs
@@ -1,8 +1,6 @@
 ﻿namespace tomenglertde.ResXManager.View.Tools
 {
     using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Contracts;
     using System.Globalization;
 
diff --git a/ResXManager.View/Visuals/ResourceView.xaml b/ResXManager.View/Visuals/ResourceView.xaml
@@ -80,8 +80,8 @@
   </UserControl.Resources>
 
   <UserControl.InputBindings>
-    <KeyBinding Key="N" Modifiers="Control" Command="{toms:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}"/>
-    <KeyBinding Key="Insert" Modifiers="Shift" Command="{toms:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}"/>
+    <KeyBinding Key="N" Modifiers="Control" Command="{toms:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}" />
+    <KeyBinding Key="Insert" Modifiers="Shift" Command="{toms:Import tools:AddNewKeyCommand}" CommandParameter="{Binding ElementName=LayoutRoot}" />
   </UserControl.InputBindings>
 
   <Grid FocusManager.FocusedElement="{Binding ElementName=DataGrid}">
diff --git a/ResXManager.View/Visuals/ResourceView.xaml.cs b/ResXManager.View/Visuals/ResourceView.xaml.cs
@@ -19,7 +19,6 @@
     using tomenglertde.ResXManager.Model;
     using tomenglertde.ResXManager.View.Tools;
 
-    using TomsToolbox.Desktop.Composition;
     using TomsToolbox.Wpf;
     using TomsToolbox.Wpf.Composition;
     using TomsToolbox.Wpf.Converters;
diff --git a/ResXManager.View/Visuals/ShellViewModel.cs b/ResXManager.View/Visuals/ShellViewModel.cs
@@ -2,8 +2,6 @@
 {
     using System.Collections.Specialized;
     using System.ComponentModel.Composition;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Contracts;
     using System.Windows.Threading;
 

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,9 @@`
`1`	`1`	`namespace tomenglertde.ResXManager.Infrastructure`
`2`	`2`	`{`
`3`		`- using System;`
`4`	`3`	`using System.ComponentModel;`
`5`		`- using System.Diagnostics.Contracts;`
`6`	`4`
`7`	`5`	`using JetBrains.Annotations;`
`8`	`6`
`9`		`- using PropertyChanged;`
`10`		`-`
`11`	`7`	`public interface ICredentialItem : INotifyPropertyChanged`
`12`	`8`	`{`
`13`	`9`	`[NotNull]`
Original file line number	Diff line number	Diff line change
`@@ -373,14 +373,14 @@ internal CodeReference([NotNull] ProjectFile projectFile, int lineNumber, [NotNu`
`373`	`373`	`LineSegments = lineSegments;`
`374`	`374`	`}`
`375`	`375`
`376`		`- public int LineNumber { get; private set; }`
	`376`	`+ public int LineNumber { get; }`
`377`	`377`
`378`	`378`	`[CanBeNull]`
`379`		`- public ProjectFile ProjectFile { get; private set; }`
	`379`	`+ public ProjectFile ProjectFile { get; }`
`380`	`380`
`381`	`381`	`[ItemNotNull]`
`382`	`382`	`[CanBeNull]`
`383`		`- public IList<string> LineSegments { get; private set; }`
	`383`	`+ public IList<string> LineSegments { get; }`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`internal static class CodeReferenceExtensionMethods`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using JetBrains.Annotations;`
`2`		`-`
`3`	`1`	`namespace tomenglertde.ResXManager.VSIX`
`4`	`2`	`{`
	`3`	`+ using JetBrains.Annotations;`
	`4`	`+`
`5`	`5`	`using Microsoft.VisualStudio;`
`6`	`6`
`7`	`7`	`internal static class ItemKind`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`namespace tomenglertde.ResXManager.VSIX`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`		`- using System.ComponentModel.Composition;`
`5`	`4`	`using System.Diagnostics;`
`6`	`5`	`using System.Diagnostics.CodeAnalysis;`
`7`	`6`	`using System.Diagnostics.Contracts;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace tomenglertde.ResXManager.VSIX.Visuals`
`2`	`2`	`{`
`3`		`- using System.ComponentModel;`
`4`	`3`	`using System.ComponentModel.Composition;`
`5`	`4`
`6`	`5`	`using JetBrains.Annotations;`