Move much common Code to a Common Lib!

dotnetprojects · Jul 1, 2012 · 730a797 · 730a797
1 parent ecd29f2
commit 730a797
Show file tree

Hide file tree

Showing 60 changed files with 1,809 additions and 1,929 deletions.
diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj b/DotNetDatenbankProtokollerV2/ConfigurationTool/JFK-ProtokollerConfigurationTool.csproj
@@ -91,11 +91,7 @@
     <Compile Include="Windows\EditConnections.xaml.cs">
       <DependentUpon>EditConnections.xaml</DependentUpon>
     </Compile>
-    <Compile Include="WPF\ListIntToVisibilityConverter.cs" />
-    <Compile Include="WPF\IntToHiddenConverter.cs" />
     <Compile Include="WPF\HyperlinkUtility.cs" />
-    <Compile Include="WPF\IntToVisibilityConverter.cs" />
-    <Compile Include="WPF\StringToPLCValueBoolConverter.cs" />
     <Page Include="Windows\EditCommonSettings.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -177,6 +173,10 @@
     <Resource Include="Images\1.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\JFKCommonLibrary\JFKCommonLibrary.csproj">
+      <Project>{B158CAB4-C341-4B87-8978-FE80D73F12C5}</Project>
+      <Name>JFKCommonLibrary</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj">
       <Project>{E3ED87E8-B550-46AC-9196-9688D30EFD29}</Project>
       <Name>DotNetSiemensPLCToolBoxLibrary</Name>

diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/EditProtocolDatasets.xaml b/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/EditProtocolDatasets.xaml
@@ -7,23 +7,22 @@
              xmlns:DotNetSimaticDatabaseProtokollerLibrary="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary;assembly=JFK-ProtokollerLibrary"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:System="clr-namespace:System;assembly=mscorlib"
-             xmlns:WPF="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.Common.WPF;assembly=JFK-ProtokollerLibrary"
              xmlns:WPF1="clr-namespace:DotNetSimaticDatabaseProtokollerConfigurationTool.WPF"
-             Name="myControl"
+             xmlns:Converters="clr-namespace:JFKCommonLibrary.WPF.Converters;assembly=JFKCommonLibrary" Name="myControl"
              d:DesignHeight="483"
              d:DesignWidth="984"
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <WPF:NullToFalseConverter x:Key="myNullToFalseConverter" />
-        <WPF1:StringToPLCValueBoolConverter x:Key="myStringToPLCValueBoolConverter" />
+        <Converters:NullToFalseConverter x:Key="myNullToFalseConverter" />
+        <Converters:StringToPLCValueBoolConverter x:Key="myStringToPLCValueBoolConverter" />
 
-        <WPF1:ListIntToVisibilityConverter x:Key="VisConv0Visible" VisibleValue="0,4" />
-        <WPF1:IntToVisibilityConverter x:Key="VisConv1Visible" VisibleValue="1" />
-        <WPF1:IntToVisibilityConverter x:Key="VisConv2Visible" VisibleValue="2" />
-        <WPF1:IntToVisibilityConverter x:Key="VisConv3Visible" VisibleValue="3" />
+        <Converters:ListIntToVisibilityConverter x:Key="VisConv0Visible" VisibleValue="0,4" />
+        <Converters:IntToVisibilityConverter x:Key="VisConv1Visible" VisibleValue="1" />
+        <Converters:IntToVisibilityConverter x:Key="VisConv2Visible" VisibleValue="2" />
+        <Converters:IntToVisibilityConverter x:Key="VisConv3Visible" VisibleValue="3" />
 
-        <WPF1:IntToHiddenConverter x:Key="VisConv2Hidden" HiddenValue="2" />
+        <Converters:IntToHiddenConverter x:Key="VisConv2Hidden" HiddenValue="2" />
 
         <ObjectDataProvider x:Key="dtrigger"
                             MethodName="GetValues"

diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowInformation.xaml b/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowInformation.xaml
@@ -4,10 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:System="clr-namespace:System;assembly=mscorlib" 
-             xmlns:WPF="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.Common.WPF;assembly=JFK-ProtokollerLibrary" 
              xmlns:Datasets="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.SettingsClasses.Datasets;assembly=JFK-ProtokollerLibrary" 
              xmlns:DotNetSimaticDatabaseProtokollerLibrary="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary;assembly=JFK-ProtokollerLibrary" 
-             xmlns:WPF1="clr-namespace:DotNetSimaticDatabaseProtokollerConfigurationTool.WPF" mc:Ignorable="d" 
+             mc:Ignorable="d" 
              d:DesignHeight="164" d:DesignWidth="362">
 
     <Grid>

diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowService.xaml b/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowService.xaml
@@ -4,9 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d" 
              d:DesignHeight="348" d:DesignWidth="800" xmlns:my="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary;assembly=JFK-ProtokollerLibrary"
-             xmlns:WPF="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.Common.WPF;assembly=JFK-ProtokollerLibrary" Unloaded="UserControl_Unloaded" Loaded="UserControl_Loaded">
+             xmlns:Converters="clr-namespace:JFKCommonLibrary.WPF.Converters;assembly=JFKCommonLibrary"
+             Unloaded="UserControl_Unloaded" Loaded="UserControl_Loaded">
     <UserControl.Resources>
-        <WPF:NullToFalseConverter x:Key="myNullToFalseConverter" />
+        <Converters:NullToFalseConverter x:Key="myNullToFalseConverter" />
 
     </UserControl.Resources>
     <Grid>

diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowTest.xaml b/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/SubwindowTest.xaml
@@ -4,14 +4,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:my="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary;assembly=JFK-ProtokollerLibrary"
-             xmlns:WPF="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.Common.WPF;assembly=JFK-ProtokollerLibrary"
-
-             d:DesignHeight="348"
+             xmlns:Converters="clr-namespace:JFKCommonLibrary.WPF.Converters;assembly=JFKCommonLibrary" d:DesignHeight="348"
              d:DesignWidth="800"
              Unloaded="UserControl_Unloaded"
              mc:Ignorable="d">
     <UserControl.Resources>
-        <WPF:NullToFalseConverter x:Key="myNullToFalseConverter" />
+        <Converters:NullToFalseConverter x:Key="myNullToFalseConverter" />
 
     </UserControl.Resources>
     <Grid>

diff --git a/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/ViewStorrages.xaml b/DotNetDatenbankProtokollerV2/ConfigurationTool/Windows/ViewStorrages.xaml
@@ -6,14 +6,12 @@
              xmlns:DotNetSimaticDatabaseProtokollerLibrary="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary;assembly=JFK-ProtokollerLibrary"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:System="clr-namespace:System;assembly=mscorlib"
-             xmlns:WPF="clr-namespace:DotNetSimaticDatabaseProtokollerLibrary.Common.WPF;assembly=JFK-ProtokollerLibrary"
-             xmlns:WPF1="clr-namespace:DotNetSimaticDatabaseProtokollerConfigurationTool.WPF"
-             d:DesignHeight="426"
+             xmlns:Converters="clr-namespace:JFKCommonLibrary.WPF.Converters;assembly=JFKCommonLibrary" d:DesignHeight="426"
              d:DesignWidth="765"
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <WPF:NullToFalseConverter x:Key="myNullToFalseConverter" />
+        <Converters:NullToFalseConverter x:Key="myNullToFalseConverter" />
 
     </UserControl.Resources>
 

diff --git a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/JFK-ProtokollerLibrary.csproj
@@ -58,10 +58,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\AdditionalDlls\Npgsql.dll</HintPath>
     </Reference>
-    <Reference Include="Polenter.SharpSerializer, Version=2.18.0.0, Culture=neutral, PublicKeyToken=8f4f20011571ee5f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\AdditionalDlls\Polenter.SharpSerializer.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Quartz">
@@ -92,9 +88,6 @@
     <Compile Include="aspx\AspxRequestInfo.cs" />
     <Compile Include="aspx\AspxVirtualRoot.cs" />
     <Compile Include="Common\NetworkShare.cs" />
-    <Compile Include="Common\SerializeToString.cs" />
-    <Compile Include="Common\WPF\NullToFalseConverter.cs" />
-    <Compile Include="Common\XMLReferenceSerializer.cs" />
     <Compile Include="Databases\Excel2007\Excel2007Storage.cs" />
     <Compile Include="Databases\CSVFile\CSVStorage.cs" />
     <Compile Include="Databases\Excel\ExcelStorage.cs" />
@@ -141,6 +134,7 @@
     <Compile Include="SettingsClasses\Storage\StorageConfig.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Common\WPF\" />
     <Folder Include="Databases\OleDB\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/DotNetDatenbankProtokollerV2/ProtokollerLibrary/ProtokollerConfiguration.cs b/DotNetDatenbankProtokollerV2/ProtokollerLibrary/ProtokollerConfiguration.cs
@@ -9,8 +9,8 @@
 using DotNetSimaticDatabaseProtokollerLibrary.SettingsClasses.Connections;
 using DotNetSimaticDatabaseProtokollerLibrary.SettingsClasses.Datasets;
 using DotNetSimaticDatabaseProtokollerLibrary.SettingsClasses.Storage;
+using JFKCommonLibrary.Serialization;
 using Microsoft.Win32;
-using Polenter.Serialization;
 
 namespace DotNetSimaticDatabaseProtokollerLibrary
 {

diff --git a/ExampleWPFVisualization/Converters/BoolToValueConverter.cs b/ExampleWPFVisualization/Converters/BoolToValueConverter.cs
diff --git a/ExampleWPFVisualization/ExampleWPFVisualization.csproj b/ExampleWPFVisualization/ExampleWPFVisualization.csproj
@@ -63,10 +63,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Converters\BoolToValueConverter.cs" />
-    <Compile Include="Behaviours\InputBindingsManager.cs" />
-    <Compile Include="Converters\IntRangeConverter.cs" />
-    <Compile Include="Converters\IntToBrushConverter.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -97,6 +93,10 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\JFKCommonLibrary\JFKCommonLibrary.csproj">
+      <Project>{B158CAB4-C341-4B87-8978-FE80D73F12C5}</Project>
+      <Name>JFKCommonLibrary</Name>
+    </ProjectReference>
     <ProjectReference Include="..\LibNoDaveConnectionLibrary\DotNetSiemensPLCToolBoxLibrary.csproj">
       <Project>{E3ED87E8-B550-46AC-9196-9688D30EFD29}</Project>
       <Name>DotNetSiemensPLCToolBoxLibrary</Name>

diff --git a/ExampleWPFVisualization/MainWindow.xaml b/ExampleWPFVisualization/MainWindow.xaml
@@ -1,11 +1,10 @@
 <Window x:Class="ExampleWPFVisualization.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:Behaviours="clr-namespace:ExampleWPFVisualization.Behaviours"
         xmlns:Communication="clr-namespace:DotNetSiemensPLCToolBoxLibrary.Communication;assembly=DotNetSiemensPLCToolBoxLibrary"
-        xmlns:Converters="clr-namespace:ExampleWPFVisualization.Converters"
         xmlns:ExampleWPFVisualization="clr-namespace:ExampleWPFVisualization"
-        Title="MainWindow"
+        xmlns:Converters="clr-namespace:JFKCommonLibrary.WPF.Converters;assembly=JFKCommonLibrary"
+        xmlns:Behaviours="clr-namespace:JFKCommonLibrary.WPF.Behaviors;assembly=JFKCommonLibrary" Title="MainWindow"
         Width="1040"
         Height="592">
     <Window.Resources>

diff --git a/ExampleWPFVisualization/MainWindow.xaml.cs b/ExampleWPFVisualization/MainWindow.xaml.cs
@@ -15,7 +15,6 @@
 using System.Windows.Shapes;
 using DotNetSiemensPLCToolBoxLibrary.Communication;
 using DotNetSiemensPLCToolBoxLibrary.DataTypes;
-using ExampleWPFVisualization.Converters;
 
 namespace ExampleWPFVisualization
 {

diff --git a/JFKCommonLibrary/ExtensionMethods/ByteArrayExtensions.cs b/JFKCommonLibrary/ExtensionMethods/ByteArrayExtensions.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections;
 
-namespace Kopplungstester.Common
+namespace JFKCommonLibrary.ExtensionMethods
 {
     public static class ByteArrayExtensions
     {