Change of namespace names according new structure

New namespaces: - AntiDupl - AntiDupl.NET.Core - AntiDupl.NET.WinForms - AntiDupl.NET.WPF
ermig1979 · Feb 25, 2023 · fa16b22 · fa16b22
1 parent 46bd45f
commit fa16b22
Show file tree

Hide file tree

Showing 238 changed files with 527 additions and 526 deletions.
diff --git a/src/AntiDupl.NET.Core/External.cmd b/src/AntiDupl.NET.Core/External.cmd
@@ -48,7 +48,7 @@ echo *>>%EXTERNAL_FILE%
 echo * Do not change this file because the file is auto generated by script External.cmd.>>%EXTERNAL_FILE%
 echo */>>%EXTERNAL_FILE%
 echo.>>%EXTERNAL_FILE%
-echo namespace AntiDupl.NET>>%EXTERNAL_FILE%
+echo namespace AntiDupl.NET.Core>>%EXTERNAL_FILE%
 echo {>>%EXTERNAL_FILE%
 echo     static public class External>>%EXTERNAL_FILE%
 echo     {>>%EXTERNAL_FILE%

diff --git a/src/AntiDupl.NET.Core/Version.cs b/src/AntiDupl.NET.Core/Version.cs
@@ -28,9 +28,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-using AntiDupl.NET.Core;
-
-namespace AntiDupl.NET
+namespace AntiDupl.NET.Core
 {
     public class Version
     {

diff --git a/src/AntiDupl.NET.WPF/AntiDuplWPF.csproj → src/AntiDupl.NET.WPF/AntiDupl.NET.WPF.csproj b/src/AntiDupl.NET.WPF/AntiDuplWPF.csproj → src/AntiDupl.NET.WPF/AntiDupl.NET.WPF.csproj
@@ -26,7 +26,7 @@
 	<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>AntiDuplWPF.App</StartupObject>
+    <StartupObject>AntiDupl.NET.WPF.App</StartupObject>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">

diff --git a/src/AntiDupl.NET.WPF/App.xaml b/src/AntiDupl.NET.WPF/App.xaml
@@ -1,13 +1,12 @@
-<Application x:Class="AntiDuplWPF.App"
+<Application x:Class="AntiDupl.NET.WPF.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Style\Default.xaml" />
-                <!--<ResourceDictionary Source="pack://application:,,,/AntiDuplWPF;component/Style/Default.xaml"/>-->
-                <ResourceDictionary Source="/AntiDuplWPF;component/Control/SearchControlTheme.xaml" />
-                <ResourceDictionary Source="/AntiDuplWPF;component/Resources/lang.xaml" />
+                <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Control/SearchControlTheme.xaml" />
+                <ResourceDictionary Source="/AntiDupl.NET.WPF;component/Resources/lang.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/src/AntiDupl.NET.WPF/App.xaml.cs b/src/AntiDupl.NET.WPF/App.xaml.cs
@@ -1,17 +1,17 @@
 using System;
 using System.ComponentModel;
 using System.Windows;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.Properties;
-using AntiDuplWPF.Service;
-using AntiDuplWPF.View;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.Properties;
+using AntiDupl.NET.WPF.Service;
+using AntiDupl.NET.WPF.View;
+using AntiDupl.NET.WPF.ViewModel;
 using TinyIoC;
 
 using AntiDupl.NET.Core;
 
-namespace AntiDuplWPF
+namespace AntiDupl.NET.WPF
 {
     public partial class App
     {
@@ -33,8 +33,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
             ILanguageService languageService = new LanguageService(confModel);
             TinyIoCContainer.Current.Register<ILanguageService>(languageService);
 
-            AntiDuplWPF.Resources.Resources.UserPath = AntiDuplWPF.Resources.Resources.GetDefaultUserPath();
-            CoreLib core = new CoreLib(AntiDuplWPF.Resources.Resources.UserPath);
+            AntiDupl.NET.WPF.Resources.Resources.UserPath = AntiDupl.NET.WPF.Resources.Resources.GetDefaultUserPath();
+            CoreLib core = new CoreLib(AntiDupl.NET.WPF.Resources.Resources.UserPath);
             TinyIoC.TinyIoCContainer.Current.Register<CoreLib>(core);
 
             ImageLoader imageLoader = new ImageLoader(core);

diff --git a/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/AllowableCharactersTextBoxBehavior.cs
@@ -9,7 +9,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class AllowableCharactersTextBoxBehavior : Behavior<TextBox>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/DataGridContextMenuItemSourceBindingOnOpenBehavior.cs
@@ -12,11 +12,11 @@
 using System.Windows.Documents;
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ObjectModel;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ObjectModel;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class DataGridContextMenuItemSourceBindingOnOpenBehavior : Behavior<DataGrid>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/DataGridScrollIntoViewBehavior.cs
@@ -8,7 +8,7 @@
 using System.Windows.Controls;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class DataGridScrollIntoViewBehavior : Behavior<DataGrid>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/FrameworkElementDropBehavior.cs
@@ -5,9 +5,9 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.DragDrop;
+using AntiDupl.NET.WPF.DragDrop;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class FrameworkElementDropBehavior : Behavior<FrameworkElement>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/GrayoutImageBehavior.cs
@@ -8,7 +8,7 @@
 using System.Windows.Media.Imaging;
 using Image = System.Windows.Controls.Image;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     // http://stackoverflow.com/questions/11305577/grey-out-image-on-button-when-element-is-disabled-simple-and-beautiful-way
     public class GrayoutImageBehavior

diff --git a/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/ImagePropertyBehavior.cs
@@ -6,11 +6,11 @@
 using System.Windows;
 using Microsoft.Xaml.Behaviors;
 using System.Windows.Controls;
-using AntiDuplWPF.Helper;
+using AntiDupl.NET.WPF.Helper;
 using TinyIoC;
-using AntiDuplWPF.Model;
+using AntiDupl.NET.WPF.Model;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class ImagePropertyBehavior : Behavior<Image>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/MenuItemButtonGroupBehavior.cs
@@ -6,11 +6,11 @@
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.Xaml.Behaviors;
-using AntiDuplWPF.Model;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.Model;
+using AntiDupl.NET.WPF.ObjectModel;
 using TinyIoC;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     public class MenuItemButtonGroupBehavior : Behavior<MenuItem>
     {

diff --git a/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs b/src/AntiDupl.NET.WPF/Behavior/MouseEnterBehaviour.cs
@@ -7,7 +7,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
 	public class MouseEnterBehaviour : Behavior<FrameworkElement>
 	{

diff --git a/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs b/src/AntiDupl.NET.WPF/Behavior/WindowCloseOnEscBehavior.cs
@@ -7,7 +7,7 @@
 using System.Windows.Input;
 using Microsoft.Xaml.Behaviors;
 
-namespace AntiDuplWPF.Behavior
+namespace AntiDupl.NET.WPF.Behavior
 {
     class WindowCloseOnEscBehavior : Behavior<Window>
     {

diff --git a/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs b/src/AntiDupl.NET.WPF/Command/CalculateHistogramPeaksCommand.cs
@@ -8,13 +8,13 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class CalculateHistogramPeaksCommand :  ICommand
     {

diff --git a/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs b/src/AntiDupl.NET.WPF/Command/ConvertToDuplPairCommand.cs
@@ -8,10 +8,10 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class ConvertToDuplPairCommand : ICommand
     {

diff --git a/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs b/src/AntiDupl.NET.WPF/Command/ConvertToGroupCommand.cs
@@ -8,10 +8,10 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Helper;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Helper;
+using AntiDupl.NET.WPF.ViewModel;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     class ConvertToGroupCommand : ICommand
     {

diff --git a/src/AntiDupl.NET.WPF/Command/RelayCommand.cs b/src/AntiDupl.NET.WPF/Command/RelayCommand.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
     /// <summary>
     /// Taken from http://msdn.microsoft.com/en-us/magazine/dd419663.aspx#id0090030

diff --git a/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs b/src/AntiDupl.NET.WPF/Command/SearchDllCommand.cs
@@ -7,9 +7,9 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Threading;
-using AntiDuplWPF.Core;
-using AntiDuplWPF.View;
-using AntiDuplWPF.ViewModel;
+using AntiDupl.NET.WPF.Core;
+using AntiDupl.NET.WPF.View;
+using AntiDupl.NET.WPF.ViewModel;
 
 using AntiDupl.NET.Core;
 using AntiDupl.NET.Core.Original;
@@ -18,7 +18,7 @@
 using System.ComponentModel.Composition.Primitives;
 using MS.WindowsAPICodePack.Internal;
 
-namespace AntiDuplWPF.Command
+namespace AntiDupl.NET.WPF.Command
 {
    public class SearchDllCommand : ICommand
     {

diff --git a/src/AntiDupl.NET.WPF/Const.cs b/src/AntiDupl.NET.WPF/Const.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AntiDuplWPF
+namespace AntiDupl.NET.WPF
 {
     public class Const
     {

diff --git a/src/AntiDupl.NET.WPF/Control/BrushExtender.cs b/src/AntiDupl.NET.WPF/Control/BrushExtender.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public static class BrushExtender
     {

diff --git a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="AntiDuplWPF.Control.CgsImageViewer"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.CgsImageViewer"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:control="clr-namespace:AntiDuplWPF.Control"
+             xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
              mc:Ignorable="d" 
              MinWidth="320" 
              MinHeight="250"
@@ -70,16 +70,16 @@
                             </Style>
                         </StackPanel.Resources>
                         <Button x:Name="btnSelectZoom" Margin="50,0,0,0" Click="btnSelectZoom_Click" ToolTip="Change Zoom Level">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/spyglass24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/spyglass24x24.png" />
                         </Button>
                         <Button x:Name="btnFitSize" Margin="10,0,0,0" Click="btnFitSize_Click" ToolTip="Fit Image to Display">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/fit_size24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/fit_size24x24.png" />
                         </Button>
                         <Button x:Name="btnRotateLeft" Margin="45,0,0,0" Click="btnRotateLeft_Click" ToolTip="Rotate Image Left">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/rotate_left24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/rotate_left24x24.png" />
                         </Button>
                         <Button x:Name="btnRotateRight" Margin="10,0,0,0" Click="btnRotateRight_Click" ToolTip="Rotate Image Right">
-                            <Image Width="24" Source="/AntiDuplWPF;component/Image/rotate_right24x24.png" />
+                            <Image Width="24" Source="/AntiDupl.NET.WPF;component/Image/rotate_right24x24.png" />
                         </Button>
                     </StackPanel>
                 </Border>

diff --git a/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs b/src/AntiDupl.NET.WPF/Control/CgsImageViewer.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для CgsImageViewer.xaml

diff --git a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="AntiDuplWPF.Control.ComplexProgressBar"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.ComplexProgressBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

diff --git a/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs b/src/AntiDupl.NET.WPF/Control/ComplexProgressBar.xaml.cs
@@ -13,7 +13,7 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для ComplexProgressBar.xaml

diff --git a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml
@@ -1,11 +1,11 @@
-<UserControl x:Class="AntiDuplWPF.Control.ImageInfoControl"
+<UserControl x:Class="AntiDupl.NET.WPF.Control.ImageInfoControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:i="clr-namespace:Microsoft.Xaml.Behaviors;assembly=Microsoft.Xaml.Behaviors;"
-             xmlns:convertor="clr-namespace:AntiDuplWPF.Convertor"
-             xmlns:control="clr-namespace:AntiDuplWPF.Control"
+             xmlns:convertor="clr-namespace:AntiDupl.NET.WPF.Convertor"
+             xmlns:control="clr-namespace:AntiDupl.NET.WPF.Control"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
     <UserControl.Resources>

diff --git a/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs b/src/AntiDupl.NET.WPF/Control/ImageInfoControl.xaml.cs
@@ -12,9 +12,9 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using AntiDuplWPF.ObjectModel;
+using AntiDupl.NET.WPF.ObjectModel;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     /// <summary>
     /// Логика взаимодействия для ImageInfoControl.xaml

diff --git a/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs b/src/AntiDupl.NET.WPF/Control/NumericUpDown.cs
@@ -12,7 +12,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class NumericUpDown : System.Windows.Controls.Control
     {

diff --git a/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs b/src/AntiDupl.NET.WPF/Control/PanAndZoomViewer.cs
@@ -5,7 +5,7 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace AntiDuplWPF.Control
+namespace AntiDupl.NET.WPF.Control
 {
     public class PanAndZoomViewer : ContentControl
     {