IJMP-1609 Added check if the text field value matches the previous fi…

…le name when renaming
zowe · Apr 18, 2024 · 3587a87 · 3587a87
1 parent 6162706
commit 3587a87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/RenameDialog.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/RenameDialog.kt
@@ -20,11 +20,7 @@ import eu.ibagroup.formainframe.common.ui.StatefulComponent
 import eu.ibagroup.formainframe.dataops.attributes.RemoteDatasetAttributes
 import eu.ibagroup.formainframe.explorer.actions.DuplicateMemberAction
 import eu.ibagroup.formainframe.explorer.actions.RenameAction
-import eu.ibagroup.formainframe.utils.validateDatasetNameOnInput
-import eu.ibagroup.formainframe.utils.validateForBlank
-import eu.ibagroup.formainframe.utils.validateMemberName
-import eu.ibagroup.formainframe.utils.validateUssFileName
-import eu.ibagroup.formainframe.utils.validateUssFileNameAlreadyExists
+import eu.ibagroup.formainframe.utils.*
 import javax.swing.JComponent
 import javax.swing.JTextField
 
@@ -83,6 +79,9 @@ class RenameDialog(
    */
   private fun validateOnInput(component: JTextField): ValidationInfo? {
     val attributes = selectedNodeData.attributes
+
+    validateForTheSameValue(attributes?.name, component)?.let { return it }
+
     when (node) {
       is LibraryNode, is FileLikeDatasetNode -> {
         return if (attributes is RemoteDatasetAttributes) {

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/utils/validationFunctions.kt b/src/main/kotlin/eu/ibagroup/formainframe/utils/validationFunctions.kt
@@ -49,6 +49,14 @@ private val volserRegex = Regex("[A-Za-z0-9]{1,6}")
 private val firstLetterRegex = Regex("[A-Z@\$#a-z]")
 private val memberRegex = Regex("[A-Z@$#a-z][A-Z@#\$a-z0-9]{0,7}")
 
+/**
+ * Validate text field for a match with the previous value
+ * @param prev of the current node
+ * @param component the component containing the invalid data
+ */
+fun validateForTheSameValue(prev: String?, component: JTextField): ValidationInfo? {
+  return if (component.text == prev) ValidationInfo("Field value matches the previous one", component) else null
+}
 
 /**
  * Validate text field for blank value