From f50442bf307e573abccf3f22803b226e04bebaac Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Thu, 28 Sep 2023 12:06:39 +0200
Subject: [PATCH] clean up

---
 .../Classes/ClassFileResult.vb                |  2 +-
 app/DD-Record-Organizer/OrgFlow.ruleset       | 13 +++++
 app/DD-Record-Organizer/OrgFlow.vbproj        |  1 +
 .../frmConstructor_Main.resx                  | 54 +++++++++----------
 app/DD-Record-Organizer/frmFileRename.vb      | 11 ++--
 5 files changed, 46 insertions(+), 35 deletions(-)
 create mode 100644 app/DD-Record-Organizer/OrgFlow.ruleset

diff --git a/app/DD-Record-Organizer/Classes/ClassFileResult.vb b/app/DD-Record-Organizer/Classes/ClassFileResult.vb
index d524a88..26f9258 100644
--- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb
+++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb
@@ -1,5 +1,5 @@
 Public Class ClassFileResult
-    Public Shared DocID As Integer
+    Public Shared Property DocID As Integer
     Public Shared InWork As Boolean = False
     Public Shared Function Set_InWork(state As Integer, comment As String)
         Try
diff --git a/app/DD-Record-Organizer/OrgFlow.ruleset b/app/DD-Record-Organizer/OrgFlow.ruleset
new file mode 100644
index 0000000..aa1e315
--- /dev/null
+++ b/app/DD-Record-Organizer/OrgFlow.ruleset
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="New Rule Set" Description=" " ToolsVersion="17.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1823" Action="Warning" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+    <Rule Id="C6259" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj
index 08c8407..5252a8c 100644
--- a/app/DD-Record-Organizer/OrgFlow.vbproj
+++ b/app/DD-Record-Organizer/OrgFlow.vbproj
@@ -1277,6 +1277,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="OrgFlow.ruleset" />
     <None Include="packages.config" />
     <None Include="Resources\database_go.png" />
   </ItemGroup>
diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx
index c70a164..b5d410e 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.resx
+++ b/app/DD-Record-Organizer/frmConstructor_Main.resx
@@ -230,7 +230,7 @@
     <value>Knoten umbenennen</value>
   </data>
   <data name="SdsdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>216, 26</value>
+    <value>212, 22</value>
   </data>
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
@@ -242,7 +242,7 @@
     <value>152, 23</value>
   </data>
   <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>213, 6</value>
+    <value>209, 6</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -253,7 +253,7 @@
 </value>
   </data>
   <data name="OberhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>216, 26</value>
+    <value>212, 22</value>
   </data>
   <data name="OberhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Auf dieser Ebene</value>
@@ -268,7 +268,7 @@
 </value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>216, 26</value>
+    <value>212, 22</value>
   </data>
   <data name="UnterhalbToolStripMenuItem.Text" xml:space="preserve">
     <value>Unterhalb</value>
@@ -322,7 +322,7 @@
     <value>Suche Knoten</value>
   </data>
   <data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>225, 257</value>
+    <value>225, 235</value>
   </data>
   <data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve">
     <value>cmsTreeView</value>
@@ -496,7 +496,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>908, 237</value>
+    <value>910, 237</value>
   </data>
   <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -592,7 +592,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>699, 231</value>
+    <value>699, 223</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -634,7 +634,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDocFill.Size" type="System.Drawing.Size, System.Drawing">
-    <value>486, 206</value>
+    <value>488, 198</value>
   </data>
   <data name="pnlDocFill.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -681,10 +681,10 @@
     <value>Ansicht eingeschränkt - Klick Bearbeiten für Entsperren</value>
   </data>
   <data name="statStripDoc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 206</value>
+    <value>0, 198</value>
   </data>
   <data name="statStripDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>486, 25</value>
+    <value>488, 25</value>
   </data>
   <data name="statStripDoc.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -720,7 +720,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 235</value>
+    <value>1201, 227</value>
   </data>
   <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -896,7 +896,7 @@
     <value>1</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 262</value>
+    <value>1201, 254</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -914,7 +914,7 @@
     <value>0</value>
   </data>
   <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1203, 290</value>
+    <value>1203, 282</value>
   </data>
   <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -926,7 +926,7 @@
     <value>0, 27</value>
   </data>
   <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 227</value>
+    <value>1201, 237</value>
   </data>
   <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1183,7 +1183,7 @@
 </value>
   </data>
   <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>Positionen</value>
@@ -1239,7 +1239,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1257,7 +1257,7 @@
     <value>0</value>
   </data>
   <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1688,7 +1688,7 @@
     <value>2</value>
   </data>
   <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Wiedervorlage</value>
@@ -1790,7 +1790,7 @@
     <value>5</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 227</value>
+    <value>1201, 237</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>90</value>
@@ -1862,7 +1862,7 @@
     <value>1</value>
   </data>
   <data name="TabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="TabPageVariant.Text" xml:space="preserve">
     <value>Vorgängervarianten</value>
@@ -1963,7 +1963,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1203, 539</value>
+    <value>1203, 529</value>
   </data>
   <data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1987,7 +1987,7 @@
     <value>Fill</value>
   </data>
   <data name="SplitContainerFORM.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 147</value>
+    <value>0, 158</value>
   </data>
   <data name="SplitContainerFORM.Panel1.Text" xml:space="preserve">
     <value>Panel1</value>
@@ -2020,7 +2020,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerFORM.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1203, 539</value>
+    <value>1203, 529</value>
   </data>
   <data name="SplitContainerFORM.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -2289,7 +2289,7 @@
     <value>Ansicht zurücksetzen</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 520</value>
+    <value>256, 542</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
     <value>ContextMenuStripResultFiles</value>
@@ -3085,13 +3085,13 @@
     <value>Funktionen</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1203, 147</value>
+    <value>1203, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 686</value>
+    <value>0, 687</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1203, 23</value>
+    <value>1203, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
diff --git a/app/DD-Record-Organizer/frmFileRename.vb b/app/DD-Record-Organizer/frmFileRename.vb
index d85acd0..a03c4c7 100644
--- a/app/DD-Record-Organizer/frmFileRename.vb
+++ b/app/DD-Record-Organizer/frmFileRename.vb
@@ -1,8 +1,9 @@
 Imports System.IO
 
 Public Class frmFileRename
-    Dim oRenameType As String
-    Public Sub New(DocID As Int32, oldName As String, pRenameType As String)
+    Private ReadOnly oRenameType As String
+
+    Public Sub New(DocID As Integer, oldName As String, pRenameType As String)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
@@ -43,7 +44,7 @@ Public Class frmFileRename
                 OnlyFilename = NewName
                 Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)
                 Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName)
-                NewName = NewName & Path.GetExtension(oFullFilename)
+                NewName &= Path.GetExtension(oFullFilename)
                 OnlyFilename &= Path.GetExtension(oFullFilename)
                 ' Rename file.
                 LOGGER.Info($"Renaming Old: [{OldName}]")
@@ -59,9 +60,5 @@ Public Class frmFileRename
                 End If
             End If
         End If
-
-
-
-
     End Sub
 End Class
\ No newline at end of file