diff --git a/Global_Indexer/ClassConstants.vb b/Global_Indexer/ClassConstants.vb index 2c76877..4a31328 100644 --- a/Global_Indexer/ClassConstants.vb +++ b/Global_Indexer/ClassConstants.vb @@ -1,3 +1,7 @@ Public Class ClassConstants Public Const VECTORSEPARATOR = "╚" + + Public Const INDEX_TYPE_BOOLEAN = "BOOLEAN" + Public Const INDEX_TYPE_INTEGER = "INTEGER" + Public Const INDEX_TYPE_VARCHAR = "VARCHAR" End Class diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb index 4f8a658..ee4cbea 100644 --- a/Global_Indexer/ClassControls.vb +++ b/Global_Indexer/ClassControls.vb @@ -27,7 +27,7 @@ Public Class ClassControls chk.Location = New Point(11, y) chk.Tag = New ControlMeta() With { .IndexName = indexname, - .IndexType = "BOOLEAN" + .IndexType = ClassConstants.INDEX_TYPE_BOOLEAN } If caption <> "" Then @@ -312,7 +312,7 @@ Public Class ClassControls } Select Case DataType - Case "INTEGER" + Case ClassConstants.INDEX_TYPE_INTEGER oEdit.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric oEdit.Properties.Mask.EditMask = "d" Console.WriteLine() diff --git a/Global_Indexer/ClassPatterns.vb b/Global_Indexer/ClassPatterns.vb index 956c35e..378ee6f 100644 --- a/Global_Indexer/ClassPatterns.vb +++ b/Global_Indexer/ClassPatterns.vb @@ -231,9 +231,9 @@ Public Class ClassPatterns If oLookupControl.Properties.MultiSelect Then Select Case oFoundType - Case "INTEGER" + Case ClassConstants.INDEX_TYPE_INTEGER oValue = String.Join(",", oLookupControl.Properties.SelectedValues) - Case "VARCHAR" + Case ClassConstants.INDEX_TYPE_VARCHAR Dim oWrapped = oLookupControl.Properties.SelectedValues oValue = String.Join(",", oWrapped) Case Else diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 02aaa3a..64d4979 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -146,7 +146,7 @@ Public Class frmIndex If connectionString <> "" Then Dim sqlscalar = DR.Item("SQL_CHECK") Select Case DR.Item("DATENTYP") - Case "INTEGER" + Case ClassConstants.INDEX_TYPE_INTEGER sqlscalar = sqlscalar.ToString.Replace("@manValue", wert) Case Else sqlscalar = sqlscalar.ToString.Replace("@manValue", "'" & wert & "'") @@ -1844,7 +1844,7 @@ Public Class frmIndex LOGGER.Debug("IndexName: {0}", oControlName) LOGGER.Debug("SQL: {0}", oSQLResult) - If oDataType <> "BOOLEAN" Then + If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount) End If @@ -1854,12 +1854,12 @@ Public Class frmIndex End If Select Case oDataType - Case "BOOLEAN" + Case ClassConstants.INDEX_TYPE_BOOLEAN Dim chk As CheckBox = oControls.AddCheckBox(oControlName, oControlPosition, DefaultValue, oRow.Item("COMMENT").ToString) If Not IsNothing(chk) Then pnlIndex.Controls.Add(chk) End If - Case "INTEGER" + Case ClassConstants.INDEX_TYPE_INTEGER If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) If Not IsNothing(oControl) Then @@ -1872,7 +1872,7 @@ Public Class frmIndex pnlIndex.Controls.Add(oControl) End If End If - Case "VARCHAR" + Case ClassConstants.INDEX_TYPE_VARCHAR If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) If Not IsNothing(oControl) Then