Merge branch 'master' of http://172.24.11.74:90/scm/git/DDClipboardSearcher

app/DD_Clipboard_Searcher/ClassInit.vb

@@ -248,7 +248,7 @@ Public Class ClassInit
         Try
             Dim oSql = String.Format("SELECT DISTINCT GUID, NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE ACTIVE = 1 AND USER_ID = {0} OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {0}))", USER_ID)
             DT_USER_PROFILES = Database.GetDatatable(oSql)
-            If DT_USER_PROFILES.Rows.Count = 0 Then
+            If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then
                 MsgBox("No profiles configured for this user so far!", MsgBoxStyle.Exclamation)
             Else
                 oSql = $"SELECT T.* FROM TBCW_PROFILE_PROCESS T, VWPM_PROFILE_USER T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}"

app/DD_Clipboard_Searcher/ClassProfileFilter.vb

@@ -89,32 +89,24 @@ Public Class ClassProfileFilter
         Return _Profiles
     End Function
 
-    Friend Function RemoveDuplicateProfiles() As Object
+    Private Function FindNode(ByVal Node As TreeNode, SearchTerm As String)
-        Return _Profiles.
+        Dim oNode As TreeNode
-            GroupBy(Function(p) p.Guid).
+        For Each oNode In Node.Nodes
-            Select(Function(p) p.FirstOrDefault())
+            If oNode.Text = SearchTerm Then
-    End Function
+                Return oNode
-    Private Function NodeFind(ByVal n As TreeNode, searchTerm As String)
-        Dim aNode As TreeNode
-        For Each aNode In n.Nodes
-            If aNode.Text = searchTerm Then
-                Return aNode
             End If
         Next
-        Return n
+        Return Node
     End Function
-    Private Function GetLowestNode(ByVal n As TreeNode)
+
-        Dim aNode As TreeNode
+    Private Function GetLowestNode(ByVal Node As TreeNode) As TreeNode
-        If n.GetNodeCount(False) = 1 Then
+        If Node.GetNodeCount(False) = 1 Then
-            For Each aNode In n.Nodes
+            Return GetLowestNode(Node.Nodes.Item(0))
-                Return GetLowestNode(aNode)
-            Next
         Else
-            Return n
+            Return Node
         End If
-
-
     End Function
+
     Public Function FilterProfilesByClipboardRegex(Profiles As List(Of ProfileData), ClipboardContents As String) As List(Of ProfileData)
         Dim oFilteredProfiles As New List(Of ProfileData)
         For Each oProfile In Profiles

app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj

@@ -73,8 +73,9 @@
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database">
+    <Reference Include="DigitalData.Modules.Database, Version=1.0.0.5, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Database.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Filesystem, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

app/DD_Clipboard_Searcher/MyDataset.Designer.vb

@@ -57,6 +57,10 @@ Partial Public Class MyDataset
     
     Private relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF As Global.System.Data.DataRelation
     
+    Private relationFK_WINDOW_ID As Global.System.Data.DataRelation
+    
+    Private relationFK_PROCESS_ID As Global.System.Data.DataRelation
+    
     Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -512,6 +516,8 @@ Partial Public Class MyDataset
         End If
         Me.relationFK_TBCW_PROF_DATA_SEARCH_PROF_IF = Me.Relations("FK_TBCW_PROF_DATA_SEARCH_PROF_IF")
         Me.relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF = Me.Relations("FK_TBCW_PROF_DOC_SEARCH_PROF_IF")
+        Me.relationFK_WINDOW_ID = Me.Relations("FK_WINDOW_ID")
+        Me.relationFK_PROCESS_ID = Me.Relations("FK_PROCESS_ID")
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -554,6 +560,10 @@ Partial Public Class MyDataset
         Me.Relations.Add(Me.relationFK_TBCW_PROF_DATA_SEARCH_PROF_IF)
         Me.relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF = New Global.System.Data.DataRelation("FK_TBCW_PROF_DOC_SEARCH_PROF_IF", New Global.System.Data.DataColumn() {Me.tableTBCW_PROFILES.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBCW_PROF_DOC_SEARCH.PROFILE_IDColumn}, false)
         Me.Relations.Add(Me.relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF)
+        Me.relationFK_WINDOW_ID = New Global.System.Data.DataRelation("FK_WINDOW_ID", New Global.System.Data.DataColumn() {Me.tableTBCW_PROF_REL_WINDOW.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBCW_PROF_REL_CONTROL.WINDOW_IDColumn}, false)
+        Me.Relations.Add(Me.relationFK_WINDOW_ID)
+        Me.relationFK_PROCESS_ID = New Global.System.Data.DataRelation("FK_PROCESS_ID", New Global.System.Data.DataColumn() {Me.tableTBCW_PROFILE_PROCESS.GUIDColumn}, New Global.System.Data.DataColumn() {Me.tableTBCW_PROF_REL_WINDOW.PROCESS_IDColumn}, false)
+        Me.Relations.Add(Me.relationFK_PROCESS_ID)
     End Sub
     
     <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -3709,9 +3719,12 @@ Partial Public Class MyDataset
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
-        Public Overloads Function AddTBCW_PROF_REL_WINDOWRow(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal PROCESS_ID As Integer) As TBCW_PROF_REL_WINDOWRow
+        Public Overloads Function AddTBCW_PROF_REL_WINDOWRow(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID As TBCW_PROFILE_PROCESSRow) As TBCW_PROF_REL_WINDOWRow
             Dim rowTBCW_PROF_REL_WINDOWRow As TBCW_PROF_REL_WINDOWRow = CType(Me.NewRow,TBCW_PROF_REL_WINDOWRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID}
+            Dim columnValuesArray() As Object = New Object() {Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Nothing}
+            If (Not (parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID) Is Nothing) Then
+                columnValuesArray(8) = parentTBCW_PROFILE_PROCESSRowByFK_PROCESS_ID(0)
+            End If
             rowTBCW_PROF_REL_WINDOWRow.ItemArray = columnValuesArray
             Me.Rows.Add(rowTBCW_PROF_REL_WINDOWRow)
             Return rowTBCW_PROF_REL_WINDOWRow
@@ -4539,9 +4552,12 @@ Partial Public Class MyDataset
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
-        Public Overloads Function AddTBCW_PROF_REL_CONTROLRow(ByVal WINDOW_ID As Integer, ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal AUTOMATION_ID As String, ByVal FRAMEWORK_ID As String) As TBCW_PROF_REL_CONTROLRow
+        Public Overloads Function AddTBCW_PROF_REL_CONTROLRow(ByVal parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID As TBCW_PROF_REL_WINDOWRow, ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal AUTOMATION_ID As String, ByVal FRAMEWORK_ID As String) As TBCW_PROF_REL_CONTROLRow
             Dim rowTBCW_PROF_REL_CONTROLRow As TBCW_PROF_REL_CONTROLRow = CType(Me.NewRow,TBCW_PROF_REL_CONTROLRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, WINDOW_ID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, AUTOMATION_ID, FRAMEWORK_ID}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, AUTOMATION_ID, FRAMEWORK_ID}
+            If (Not (parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID) Is Nothing) Then
+                columnValuesArray(1) = parentTBCW_PROF_REL_WINDOWRowByFK_WINDOW_ID(0)
+            End If
             rowTBCW_PROF_REL_CONTROLRow.ItemArray = columnValuesArray
             Me.Rows.Add(rowTBCW_PROF_REL_CONTROLRow)
             Return rowTBCW_PROF_REL_CONTROLRow
@@ -6078,6 +6094,16 @@ Partial Public Class MyDataset
         Public Sub SetADDED_WHENNull()
             Me(Me.tableTBCW_PROFILE_PROCESS.ADDED_WHENColumn) = Global.System.Convert.DBNull
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        Public Function GetTBCW_PROF_REL_WINDOWRows() As TBCW_PROF_REL_WINDOWRow()
+            If (Me.Table.ChildRelations("FK_PROCESS_ID") Is Nothing) Then
+                Return New TBCW_PROF_REL_WINDOWRow(-1) {}
+            Else
+                Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_PROCESS_ID")),TBCW_PROF_REL_WINDOWRow())
+            End If
+        End Function
     End Class
     
     '''<summary>
@@ -6777,6 +6803,17 @@ Partial Public Class MyDataset
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        Public Property TBCW_PROFILE_PROCESSRow() As TBCW_PROFILE_PROCESSRow
+            Get
+                Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_PROCESS_ID")),TBCW_PROFILE_PROCESSRow)
+            End Get
+            Set
+                Me.SetParentRow(value, Me.Table.ParentRelations("FK_PROCESS_ID"))
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Public Function IsADDED_WHENNull() As Boolean
@@ -6812,6 +6849,16 @@ Partial Public Class MyDataset
         Public Sub SetCHANGED_WHENNull()
             Me(Me.tableTBCW_PROF_REL_WINDOW.CHANGED_WHENColumn) = Global.System.Convert.DBNull
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        Public Function GetTBCW_PROF_REL_CONTROLRows() As TBCW_PROF_REL_CONTROLRow()
+            If (Me.Table.ChildRelations("FK_WINDOW_ID") Is Nothing) Then
+                Return New TBCW_PROF_REL_CONTROLRow(-1) {}
+            Else
+                Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_WINDOW_ID")),TBCW_PROF_REL_CONTROLRow())
+            End If
+        End Function
     End Class
     
     '''<summary>
@@ -7281,6 +7328,17 @@ Partial Public Class MyDataset
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
+        Public Property TBCW_PROF_REL_WINDOWRow() As TBCW_PROF_REL_WINDOWRow
+            Get
+                Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_WINDOW_ID")),TBCW_PROF_REL_WINDOWRow)
+            End Get
+            Set
+                Me.SetParentRow(value, Me.Table.ParentRelations("FK_WINDOW_ID"))
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Public Function IsADDED_WHENNull() As Boolean
@@ -10830,29 +10888,37 @@ Namespace MyDatasetTableAdapters
             Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (DESCRIPTION, REGEX, S"& _ 
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBCW_PROF_REL_WINDOW] ([DESCRIPTION], [REGEX], [SEQUENCE], [ADDED_WH"& _ 
-                "EQUENCE, ADDED_WHO, PROCESS_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@DESCRIPTION,@REGEX,@SEQUENCE,@A"& _ 
+                "O], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [PROCESS_ID]) VALUES (@DESCRIPT"& _ 
-                "DDED_WHO,@PROCESS_ID);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, "& _ 
+                "ION, @REGEX, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @P"& _ 
-                "REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ 
+                "ROCESS_ID);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, C"& _ 
-                "EN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY())"
+                "HANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCO"& _ 
+                "PE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
             Me._adapter.UpdateCommand.CommandText = "UPDATE       TBCW_PROF_REL_WINDOW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                DESCRIPTION = @DESCRIPTION,"& _ 
-                " REGEX = @REGEX, SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, PROCESS_ID = "& _ 
+                " REGEX = @REGEX, SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADD"& _ 
-                "@PROCESS_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);     "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID"& _ 
+                "ED_WHEN, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CHANGED_WHEN = @"& _ 
-                ", PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_"& _ 
+                "CHANGED_WHEN, PROCESS_ID = @PROCESS_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
-                "WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)"
+                "SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C"& _ 
+                "HANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROCESS_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROCESS_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
@@ -10931,6 +10997,133 @@ Namespace MyDatasetTableAdapters
         Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer
             Return Me.Adapter.Update(dataRows)
         End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)>  _
+        Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer
+            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State
+            If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.DeleteCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.DeleteCommand.Connection.Close
+                End If
+            End Try
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
+        Public Overloads Overridable Function Insert(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal PROCESS_ID As Integer) As Integer
+            If (DESCRIPTION Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("DESCRIPTION")
+            Else
+                Me.Adapter.InsertCommand.Parameters(0).Value = CType(DESCRIPTION,String)
+            End If
+            If (REGEX Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("REGEX")
+            Else
+                Me.Adapter.InsertCommand.Parameters(1).Value = CType(REGEX,String)
+            End If
+            Me.Adapter.InsertCommand.Parameters(2).Value = CType(SEQUENCE,Byte)
+            If (ADDED_WHO Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("ADDED_WHO")
+            Else
+                Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String)
+            End If
+            If (ADDED_WHEN.HasValue = true) Then
+                Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date)
+            Else
+                Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value
+            End If
+            If (CHANGED_WHO Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(5).Value = CType(CHANGED_WHO,String)
+            End If
+            If (CHANGED_WHEN.HasValue = true) Then
+                Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date)
+            Else
+                Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
+            End If
+            Me.Adapter.InsertCommand.Parameters(7).Value = CType(PROCESS_ID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
+            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.InsertCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.InsertCommand.Connection.Close
+                End If
+            End Try
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
+        Public Overloads Overridable Function Update(ByVal DESCRIPTION As String, ByVal REGEX As String, ByVal SEQUENCE As Byte, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal PROCESS_ID As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
+            If (DESCRIPTION Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("DESCRIPTION")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DESCRIPTION,String)
+            End If
+            If (REGEX Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("REGEX")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(1).Value = CType(REGEX,String)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(2).Value = CType(SEQUENCE,Byte)
+            If (ADDED_WHO Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("ADDED_WHO")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ADDED_WHO,String)
+            End If
+            If (ADDED_WHEN.HasValue = true) Then
+                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHEN.Value,Date)
+            Else
+                Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value
+            End If
+            If (CHANGED_WHO Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO,String)
+            End If
+            If (CHANGED_WHEN.HasValue = true) Then
+                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHEN.Value,Date)
+            Else
+                Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value
+            End If
+            Me.Adapter.UpdateCommand.Parameters(7).Value = CType(PROCESS_ID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
+            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.UpdateCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.UpdateCommand.Connection.Close
+                End If
+            End Try
+        End Function
     End Class
     
     '''<summary>
@@ -11692,9 +11885,9 @@ Namespace MyDatasetTableAdapters
             Me._adapter.InsertCommand.CommandText = "INSERT INTO TBCW_PROF_REL_CONTROL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (WINDOW_ID, DESCRIPTI"& _ 
                 "ON, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@WI"& _ 
                 "NDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO); "& _ 
-                " "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID,"& _ 
+                "   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_I"& _ 
-                " FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"& _ 
+                "D, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH"& _ 
-                " FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY())"
+                "EN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDOW_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDOW_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -11708,9 +11901,9 @@ Namespace MyDatasetTableAdapters
             Me._adapter.UpdateCommand.CommandText = "UPDATE       TBCW_PROF_REL_CONTROL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                WINDOW_ID = @WINDOW_ID, DE"& _ 
                 "SCRIPTION = @DESCRIPTION, AUTOMATION_ID = @AUTOMATION_ID, FRAMEWORK_ID = @FRAMEW"& _ 
                 "ORK_ID, REGEX = @REGEX, SEQUENCE = @SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUI"& _ 
-                "D);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATIO"& _ 
+                "D);    "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATI"& _ 
-                "N_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _ 
+                "ON_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGE"& _ 
-                "_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID)"
+                "D_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WINDOW_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "WINDOW_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DESCRIPTION", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DESCRIPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -12187,6 +12380,15 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Function UpdateUpdatedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer
             Dim result As Integer = 0
+            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
+                Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
+                updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
+                If ((Not (updatedRows) Is Nothing)  _
+                            AndAlso (0 < updatedRows.Length)) Then
+                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(updatedRows))
+                    allChangedRows.AddRange(updatedRows)
+                End If
+            End If
             If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then
                 Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
                 updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
@@ -12196,6 +12398,15 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(updatedRows)
                 End If
             End If
+            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
+                Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
+                updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
+                If ((Not (updatedRows) Is Nothing)  _
+                            AndAlso (0 < updatedRows.Length)) Then
+                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(updatedRows))
+                    allChangedRows.AddRange(updatedRows)
+                End If
+            End If
             If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then
                 Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
                 updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
@@ -12205,15 +12416,6 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(updatedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
-                Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
-                updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
-                If ((Not (updatedRows) Is Nothing)  _
-                            AndAlso (0 < updatedRows.Length)) Then
-                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(updatedRows))
-                    allChangedRows.AddRange(updatedRows)
-                End If
-            End If
             If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then
                 Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DATA_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
                 updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
@@ -12241,15 +12443,6 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(updatedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
-                Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
-                updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
-                If ((Not (updatedRows) Is Nothing)  _
-                            AndAlso (0 < updatedRows.Length)) Then
-                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(updatedRows))
-                    allChangedRows.AddRange(updatedRows)
-                End If
-            End If
             If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then
                 Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent)
                 updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows)
@@ -12278,6 +12471,14 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Function UpdateInsertedRows(ByVal dataSet As MyDataset, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer
             Dim result As Integer = 0
+            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
+                Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
+                If ((Not (addedRows) Is Nothing)  _
+                            AndAlso (0 < addedRows.Length)) Then
+                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(addedRows))
+                    allAddedRows.AddRange(addedRows)
+                End If
+            End If
             If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then
                 Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
                 If ((Not (addedRows) Is Nothing)  _
@@ -12286,6 +12487,14 @@ Namespace MyDatasetTableAdapters
                     allAddedRows.AddRange(addedRows)
                 End If
             End If
+            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
+                Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
+                If ((Not (addedRows) Is Nothing)  _
+                            AndAlso (0 < addedRows.Length)) Then
+                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(addedRows))
+                    allAddedRows.AddRange(addedRows)
+                End If
+            End If
             If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then
                 Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
                 If ((Not (addedRows) Is Nothing)  _
@@ -12294,14 +12503,6 @@ Namespace MyDatasetTableAdapters
                     allAddedRows.AddRange(addedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
-                Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
-                If ((Not (addedRows) Is Nothing)  _
-                            AndAlso (0 < addedRows.Length)) Then
-                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(addedRows))
-                    allAddedRows.AddRange(addedRows)
-                End If
-            End If
             If (Not (Me._tBCW_PROF_DATA_SEARCHTableAdapter) Is Nothing) Then
                 Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_DATA_SEARCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
                 If ((Not (addedRows) Is Nothing)  _
@@ -12326,14 +12527,6 @@ Namespace MyDatasetTableAdapters
                     allAddedRows.AddRange(addedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
-                Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
-                If ((Not (addedRows) Is Nothing)  _
-                            AndAlso (0 < addedRows.Length)) Then
-                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(addedRows))
-                    allAddedRows.AddRange(addedRows)
-                End If
-            End If
             If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then
                 Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added)
                 If ((Not (addedRows) Is Nothing)  _
@@ -12376,14 +12569,6 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(deletedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
-                Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
-                If ((Not (deletedRows) Is Nothing)  _
-                            AndAlso (0 < deletedRows.Length)) Then
-                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(deletedRows))
-                    allChangedRows.AddRange(deletedRows)
-                End If
-            End If
             If (Not (Me._tBCW_GROUP_PROFILETableAdapter) Is Nothing) Then
                 Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_GROUP_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
                 If ((Not (deletedRows) Is Nothing)  _
@@ -12408,14 +12593,6 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(deletedRows)
                 End If
             End If
-            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
-                Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
-                If ((Not (deletedRows) Is Nothing)  _
-                            AndAlso (0 < deletedRows.Length)) Then
-                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(deletedRows))
-                    allChangedRows.AddRange(deletedRows)
-                End If
-            End If
             If (Not (Me._tBCW_USER_PROFILETableAdapter) Is Nothing) Then
                 Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_USER_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
                 If ((Not (deletedRows) Is Nothing)  _
@@ -12424,6 +12601,14 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(deletedRows)
                 End If
             End If
+            If (Not (Me._tBCW_PROF_REL_WINDOWTableAdapter) Is Nothing) Then
+                Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROF_REL_WINDOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
+                If ((Not (deletedRows) Is Nothing)  _
+                            AndAlso (0 < deletedRows.Length)) Then
+                    result = (result + Me._tBCW_PROF_REL_WINDOWTableAdapter.Update(deletedRows))
+                    allChangedRows.AddRange(deletedRows)
+                End If
+            End If
             If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then
                 Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
                 If ((Not (deletedRows) Is Nothing)  _
@@ -12432,6 +12617,14 @@ Namespace MyDatasetTableAdapters
                     allChangedRows.AddRange(deletedRows)
                 End If
             End If
+            If (Not (Me._tBCW_PROFILE_PROCESSTableAdapter) Is Nothing) Then
+                Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILE_PROCESS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted)
+                If ((Not (deletedRows) Is Nothing)  _
+                            AndAlso (0 < deletedRows.Length)) Then
+                    result = (result + Me._tBCW_PROFILE_PROCESSTableAdapter.Update(deletedRows))
+                    allChangedRows.AddRange(deletedRows)
+                End If
+            End If
             Return result
         End Function
         

app/DD_Clipboard_Searcher/MyDataset.xsd

@@ -512,33 +512,34 @@ WHERE        (GUID = @GUID)</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBCW_PROF_REL_WINDOWTableAdapter" GeneratorDataComponentClassName="TBCW_PROF_REL_WINDOWTableAdapter" Name="TBCW_PROF_REL_WINDOW" UserDataComponentName="TBCW_PROF_REL_WINDOWTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM TBCW_PROF_REL_WINDOW
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO TBCW_PROF_REL_WINDOW
+                    <CommandText>INSERT INTO [TBCW_PROF_REL_WINDOW] ([DESCRIPTION], [REGEX], [SEQUENCE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [PROCESS_ID]) VALUES (@DESCRIPTION, @REGEX, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @PROCESS_ID);
-                         (DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, PROCESS_ID)
+SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY())</CommandText>
-VALUES        (@DESCRIPTION,@REGEX,@SEQUENCE,@ADDED_WHO,@PROCESS_ID);    
-SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="DESCRIPTION" ColumnName="DESCRIPTION" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="tinyint" DbType="Byte" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="TinyInt" Scale="0" Size="1" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Byte" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="TinyInt" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_ID" ColumnName="PROCESS_ID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROCESS_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROCESS_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PROCESS_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PROCESS_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>SELECT        GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID
 FROM            TBCW_PROF_REL_WINDOW
 WHERE        (PROCESS_ID = @PROCESS_ID)</CommandText>
@@ -550,14 +551,18 @@ WHERE        (PROCESS_ID = @PROCESS_ID)</CommandText>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE       TBCW_PROF_REL_WINDOW
-SET                DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, PROCESS_ID = @PROCESS_ID
+SET                DESCRIPTION = @DESCRIPTION, REGEX = @REGEX, SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, 
-WHERE        (GUID = @Original_GUID);     
+                         CHANGED_WHEN = @CHANGED_WHEN, PROCESS_ID = @PROCESS_ID
-SELECT GUID, PROFILE_ID, PROCESS_NAME, DESCRIPTION, REGEX, SEQUENCE, REGEX_CLIPBOARD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)</CommandText>
+WHERE        (GUID = @Original_GUID); 
+SELECT GUID, DESCRIPTION, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, PROCESS_ID FROM TBCW_PROF_REL_WINDOW WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="DESCRIPTION" ColumnName="DESCRIPTION" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@DESCRIPTION" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="DESCRIPTION" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="tinyint" DbType="Byte" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="TinyInt" Scale="0" Size="1" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_ID" ColumnName="PROCESS_ID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROCESS_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROCESS_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_WINDOW" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -685,11 +690,11 @@ SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, B
             <MainSource>
               <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBCW_PROF_REL_CONTROL" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM TBCW_PROF_REL_CONTROL
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_CONTROL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -697,7 +702,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO TBCW_PROF_REL_CONTROL
                          (WINDOW_ID, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO)
-VALUES        (@WINDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO);  
+VALUES        (@WINDOW_ID,@DESCRIPTION,@AUTOMATION_ID,@FRAMEWORK_ID,@REGEX,@SEQUENCE,@ADDED_WHO);    
 SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="WINDOW_ID" ColumnName="WINDOW_ID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_CONTROL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@WINDOW_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="WINDOW_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -725,7 +730,7 @@ ORDER BY SEQUENCE</CommandText>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE       TBCW_PROF_REL_CONTROL
 SET                WINDOW_ID = @WINDOW_ID, DESCRIPTION = @DESCRIPTION, AUTOMATION_ID = @AUTOMATION_ID, FRAMEWORK_ID = @FRAMEWORK_ID, REGEX = @REGEX, SEQUENCE = @SEQUENCE
-WHERE        (GUID = @Original_GUID);   
+WHERE        (GUID = @Original_GUID);    
 SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FRAMEWORK_ID, REGEX, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBCW_PROF_REL_CONTROL WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="WINDOW_ID" ColumnName="WINDOW_ID" DataSourceName="DD_ECM_TEST.dbo.TBCW_PROF_REL_CONTROL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@WINDOW_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="WINDOW_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1249,6 +1254,8 @@ SELECT GUID, PROFILE_ID, WINDOW_ID, PROCESS_NAME, DESCRIPTION, AUTOMATION_ID, FR
     <xs:appinfo>
       <msdata:Relationship name="FK_TBCW_PROF_DATA_SEARCH_PROF_IF" msdata:parent="TBCW_PROFILES" msdata:child="TBCW_PROF_DATA_SEARCH" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBCW_PROF_DATA_SEARCH" msprop:Generator_ChildPropName="GetTBCW_PROF_DATA_SEARCHRows" msprop:Generator_UserRelationName="FK_TBCW_PROF_DATA_SEARCH_PROF_IF" msprop:Generator_ParentPropName="TBCW_PROFILESRow" msprop:Generator_RelationVarName="relationFK_TBCW_PROF_DATA_SEARCH_PROF_IF" msprop:Generator_UserParentTable="TBCW_PROFILES" />
       <msdata:Relationship name="FK_TBCW_PROF_DOC_SEARCH_PROF_IF" msdata:parent="TBCW_PROFILES" msdata:child="TBCW_PROF_DOC_SEARCH" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBCW_PROF_DOC_SEARCH" msprop:Generator_ChildPropName="GetTBCW_PROF_DOC_SEARCHRows" msprop:Generator_UserRelationName="FK_TBCW_PROF_DOC_SEARCH_PROF_IF" msprop:Generator_ParentPropName="TBCW_PROFILESRow" msprop:Generator_RelationVarName="relationFK_TBCW_PROF_DOC_SEARCH_PROF_IF" msprop:Generator_UserParentTable="TBCW_PROFILES" />
+      <msdata:Relationship name="FK_WINDOW_ID" msdata:parent="TBCW_PROF_REL_WINDOW" msdata:child="TBCW_PROF_REL_CONTROL" msdata:parentkey="GUID" msdata:childkey="WINDOW_ID" msprop:Generator_UserChildTable="TBCW_PROF_REL_CONTROL" msprop:Generator_ChildPropName="GetTBCW_PROF_REL_CONTROLRows" msprop:Generator_UserRelationName="FK_WINDOW_ID" msprop:Generator_RelationVarName="relationFK_WINDOW_ID" msprop:Generator_UserParentTable="TBCW_PROF_REL_WINDOW" msprop:Generator_ParentPropName="TBCW_PROF_REL_WINDOWRow" />
+      <msdata:Relationship name="FK_PROCESS_ID" msdata:parent="TBCW_PROFILE_PROCESS" msdata:child="TBCW_PROF_REL_WINDOW" msdata:parentkey="GUID" msdata:childkey="PROCESS_ID" msprop:Generator_UserChildTable="TBCW_PROF_REL_WINDOW" msprop:Generator_ChildPropName="GetTBCW_PROF_REL_WINDOWRows" msprop:Generator_UserRelationName="FK_PROCESS_ID" msprop:Generator_RelationVarName="relationFK_PROCESS_ID" msprop:Generator_UserParentTable="TBCW_PROFILE_PROCESS" msprop:Generator_ParentPropName="TBCW_PROFILE_PROCESSRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

app/DD_Clipboard_Searcher/MyDataset.xss

@@ -4,25 +4,25 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="7" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="189" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TBCW_PROFILES" ZOrder="16" X="14" Y="-44" Height="286" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBCW_PROFILES" ZOrder="18" X="14" Y="-44" Height="286" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBCW_USER_PROFILE" ZOrder="5" X="680" Y="299" Height="172" Width="271" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBCW_USER_PROFILE" ZOrder="7" X="680" Y="299" Height="172" Width="271" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:VWUSER_PROFILE" ZOrder="15" X="1049" Y="11" Height="250" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="142" />
+    <Shape ID="DesignTable:VWUSER_PROFILE" ZOrder="17" X="1049" Y="11" Height="250" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="142" />
-    <Shape ID="DesignTable:TBCW_PROFILE_PROCESS" ZOrder="13" X="20" Y="585" Height="172" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBCW_PROFILE_PROCESS" ZOrder="15" X="20" Y="585" Height="172" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:TBCW_PROF_DATA_SEARCH" ZOrder="12" X="630" Y="-32" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBCW_PROF_DATA_SEARCH" ZOrder="14" X="630" Y="-32" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBCW_PROF_DOC_SEARCH" ZOrder="10" X="321" Y="20" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBCW_PROF_DOC_SEARCH" ZOrder="12" X="321" Y="20" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBCW_GROUP_PROFILE" ZOrder="3" X="336" Y="635" Height="172" Width="281" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBCW_GROUP_PROFILE" ZOrder="5" X="336" Y="635" Height="172" Width="281" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:VWCW_GROUP_PROFILE" ZOrder="7" X="1252" Y="5" Height="248" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:VWCW_GROUP_PROFILE" ZOrder="9" X="1252" Y="5" Height="248" Width="218" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBCW_PROF_REL_WINDOW" ZOrder="2" X="10" Y="259" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBCW_PROF_REL_WINDOW" ZOrder="4" X="10" Y="259" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="24" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="4" X="675" Y="483" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="6" X="675" Y="483" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBCW_PROF_REL_CONTROL" ZOrder="1" X="328" Y="330" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBCW_PROF_REL_CONTROL" ZOrder="3" X="330" Y="327" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBWH_User" ZOrder="14" X="1221" Y="436" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
+    <Shape ID="DesignTable:TBWH_User" ZOrder="16" X="1221" Y="436" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
-    <Shape ID="DesignTable:TBWH_GROUP" ZOrder="8" X="1240" Y="329" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:TBWH_GROUP" ZOrder="10" X="1240" Y="329" Height="67" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
-    <Shape ID="DesignTable:TBWH_PROFILE_TYPE" ZOrder="6" X="1204" Y="609" Height="67" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:TBWH_PROFILE_TYPE" ZOrder="8" X="1204" Y="609" Height="67" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_TBCW_PROF_DATA_SEARCH_PROF_IF" ZOrder="11" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBCW_PROF_DATA_SEARCH_PROF_IF" ZOrder="13" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>254</X>
@@ -34,7 +34,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBCW_PROF_DOC_SEARCH_PROF_IF" ZOrder="9" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBCW_PROF_DOC_SEARCH_PROF_IF" ZOrder="11" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>254</X>
@@ -46,5 +46,29 @@
         </Point>
       </RoutePoints>
     </Connector>
+    <Connector ID="DesignRelation:FK_WINDOW_ID" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>310</X>
+          <Y>453</Y>
+        </Point>
+        <Point>
+          <X>330</X>
+          <Y>453</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_PROCESS_ID" ZOrder="1" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>165</X>
+          <Y>585</Y>
+        </Point>
+        <Point>
+          <X>165</X>
+          <Y>507</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
   </Connectors>
 </DiagramLayout>

app/DD_Clipboard_Searcher/ctrlApplicationAssignment.Designer.vb

@@ -132,8 +132,6 @@ Partial Class ctrlApplicationAssignment
         Me.colGUID.Caption = "GUID"
         Me.colGUID.FieldName = "GUID"
         Me.colGUID.Name = "colGUID"
-        Me.colGUID.Visible = True
-        Me.colGUID.VisibleIndex = 0
         '
         'colDESCRIPTION
         '
@@ -141,7 +139,8 @@ Partial Class ctrlApplicationAssignment
         Me.colDESCRIPTION.FieldName = "DESCRIPTION"
         Me.colDESCRIPTION.Name = "colDESCRIPTION"
         Me.colDESCRIPTION.Visible = True
-        Me.colDESCRIPTION.VisibleIndex = 1
+        Me.colDESCRIPTION.VisibleIndex = 0
+        Me.colDESCRIPTION.Width = 409
         '
         'colREGEX
         '
@@ -150,7 +149,8 @@ Partial Class ctrlApplicationAssignment
         Me.colREGEX.FieldName = "REGEX"
         Me.colREGEX.Name = "colREGEX"
         Me.colREGEX.Visible = True
-        Me.colREGEX.VisibleIndex = 2
+        Me.colREGEX.VisibleIndex = 1
+        Me.colREGEX.Width = 410
         '
         'RepositoryItemRegexEdit
         '

app/DD_Clipboard_Searcher/ctrlApplicationAssignment.vb

@@ -55,7 +55,9 @@ Public Class ctrlApplicationAssignment
                     If Database.ExecuteNonQuery(oSQL) = False Then
                         Return False
                     Else
-                        oSQL = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO,PROCESS_ID) VALUES ('{0}', '^{1}$','{3}',{4})", oWindowTitle, oWindowTitle, Environment.UserName, CURRENT_PROCESSID)
+                        Dim oNewProcessId = Database.GetScalarValue("SELECT MAX(GUID) FROM TBCW_PROFILE_PROCESS")
+
+                        oSQL = String.Format("INSERT INTO TBCW_PROF_REL_WINDOW (DESCRIPTION, REGEX, ADDED_WHO, PROCESS_ID) VALUES ('{0}', '^{1}$', '{2}' ,{3})", oWindowTitle, oWindowTitle, Environment.UserName, oNewProcessId)
                         If Database.ExecuteNonQuery(oSQL) = False Then
                             Return False
                         End If
@@ -74,7 +76,7 @@ Public Class ctrlApplicationAssignment
     Public Function Process_DeleteAssignment() As Boolean
         Try
             Dim oProcessId = GridViewProcessProfile.GetFocusedRowCellValue(GridViewProcessProfile.Columns("GUID"))
-            Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0},{1}", oProcessId, Current_ProfileId)
+            Dim oSQL = String.Format("EXEC PRCW_DELETE_PROCESS {0}", oProcessId)
             If Database.ExecuteNonQuery(oSQL) Then
                 Process_Load(Current_ProfileId)
                 Return True
@@ -161,8 +163,6 @@ Public Class ctrlApplicationAssignment
                 TBCW_PROF_REL_WINDOWTableAdapter.Update(MyDataset.TBCW_PROF_REL_WINDOW)
                 Return True
             End If
-
-
         Catch ex As Exception
             Logger.Error(ex)
             Return False
@@ -218,10 +218,9 @@ Public Class ctrlApplicationAssignment
             If Not IsNothing(MyDataset.TBCW_PROF_REL_CONTROL.GetChanges) Then
                 TBCW_PROF_REL_CONTROLBindingSource.EndEdit()
                 TBCW_PROF_REL_CONTROLTableAdapter.Update(MyDataset.TBCW_PROF_REL_CONTROL)
-                Return True
             End If
 
-
+            Return True
         Catch ex As Exception
             Logger.Error(ex)
             Return False

app/DD_Clipboard_Searcher/frmStart.vb

@@ -1,9 +1,7 @@
 Imports System.Threading
 Imports System.IO
 Imports System.Globalization
-Imports DD_LIB_Standards
 Imports DD_Clipboard_Watcher.ClassConstants
-Imports System.Windows.Automation
 Imports DD_Clipboard_Watcher.ClassWindowAPI
 
 Public Class frmStart
@@ -75,8 +73,8 @@ Public Class frmStart
 
         End Try
         Try
-            Hotkey.RemoveHotKey(ClassConstants.HOTKEY_TOGGLE_WATCHER)
+            Hotkey.RemoveHotKey(HOTKEY_TOGGLE_WATCHER)
-            Hotkey.RemoveHotKey(ClassConstants.HOTKEY_TRIGGER_WATCHER)
+            Hotkey.RemoveHotKey(HOTKEY_TRIGGER_WATCHER)
         Catch ex As Exception
             Logger.Error(ex)
             Logger.Warn("Hotkeys could not be removed")
@@ -107,10 +105,10 @@ Public Class frmStart
             Exit Sub
         End If
 
-        Dim oWindowInfo = ClassWindowAPI.GetWindowInfo()
+        Dim oWindowInfo = GetWindowInfo()
         Dim ClipboardContents As String = Clipboard.GetText()
         Dim oProfileFilter As ClassProfileFilter
-        Dim newoResult As IntPtr = FocusedControlinActiveWindow(Handle)
+        Dim oFocusedControl As IntPtr = FocusedControlinActiveWindow(Handle)
         Try
             oProfileFilter = New ClassProfileFilter(DT_USER_PROFILES, DTPROFILE_REL_PROCESS, DTPROFILE_REL_WINDOW, DTPROFILE_REL_CONTROL)
         Catch ex As Exception
@@ -124,29 +122,9 @@ Public Class frmStart
         CurrMatchTreeView.SelectedImageIndex = 0
 
         oProfiles = oProfileFilter.FilterProfilesByClipboardRegex(oProfiles, ClipboardContents)
-        If oProfiles.Count > 0 Then
+        oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName)
-            oProfiles = oProfileFilter.FilterProfilesByProcess(oProfiles, oWindowInfo.ProcessName)
+        oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle)
-            If oProfiles.Count > 0 Then
+        oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, oFocusedControl.ToString)
-                oProfiles = oProfileFilter.FilterWindowsByWindowTitleRegex(oProfiles, oWindowInfo.WindowTitle)
-                If oProfiles.Count > 0 Then
-                    ' Dim ControlFocusResult
-                    Dim oResult As WindowInfo = GetFocusedControl(Handle)
-                    'Automation = New ClassAutomation(LogConfig)
-                    'If Not IsNothing(Automation.AutomationId) Then
-                    '    ControlFocusResult = Automation.AutomationId
-                    'Else
-                    '    ControlFocusResult = String.Empty
-                    'End If
-                    ' MsgBox(newoResult.ToString)
-                    oProfiles = oProfileFilter.FilterProfilesByFocusedControl(oProfiles, ClipboardContents, newoResult.ToString)
-                    'oProfiles = oProfileFilter.FilterWindowsByWindowClipboardRegex(oProfiles, ClipboardContents)
-                End If
-
-
-
-            End If
-            End If
-        'oProfiles = oProfileFilter.RemoveDuplicateProfiles()
         oProfiles = oProfileFilter.ClearNotMatchedProfiles(oProfiles)
         oProfiles = oProfiles.ToList()