From 56a71c694eb75f908a8b2e9c52a7eb87a9a002a1 Mon Sep 17 00:00:00 2001 From: techncl Date: Tue, 14 Jan 2025 12:06:24 +0000 Subject: [PATCH 1/4] Add 'Remove path substitution' button & remove right-click --- .../csv/validator/ui/CsvValidatorUi.scala | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala index b45de3e0..d7962c61 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala @@ -543,8 +543,8 @@ object CsvValidatorUi extends SimpleSwingApplication { model.asInstanceOf[DefaultTableModel].addRow(rowData.asInstanceOf[Array[AnyRef]]) } - def removeSelectedRow() : Unit = { - model.asInstanceOf[DefaultTableModel].removeRow(peer.getSelectedRow) + def removeSelectedRows() : Unit = peer.getSelectedRows.zipWithIndex.foreach { case (row, index) => + model.asInstanceOf[DefaultTableModel]removeRow(row - index) // when you delete a row, the index of row to delete next shifts down by 1 } def pathSubstitutions : List[(String, String)] = { @@ -552,15 +552,11 @@ object CsvValidatorUi extends SimpleSwingApplication { }.toList } - private val popupMenu = new PopupMenu - private val miRemove = new MenuItem("Remove Path Substitution") - miRemove.reactions += onClick(tblPathSubstitutions.removeSelectedRow()) - popupMenu.contents += miRemove - tblPathSubstitutions.popupMenu(popupMenu) - private val spTblPathSubstitutions = new ScrollPane(tblPathSubstitutions) + private val btnRemovePathSubstitution = new Button("Remove Path Substitution...") private val btnAddPathSubstitution = new Button("Add Path Substitution...") + btnRemovePathSubstitution.reactions += onClick(tblPathSubstitutions.removeSelectedRows()) btnAddPathSubstitution.reactions += onClick(tablePathDialog()) private val settingsGroupLayout = new GridBagPanel { @@ -605,6 +601,11 @@ object CsvValidatorUi extends SimpleSwingApplication { c.gridwidth = 2 layout(spTblPathSubstitutions) = c + c.gridx = 0 + c.gridy = 7 + c.anchor = Anchor.LineStart + layout(btnRemovePathSubstitution) = c + c.gridx = 1 c.gridy = 7 c.anchor = Anchor.LastLineEnd From 83d0ec49db69fd1f1c79db97178977d34032cd35 Mon Sep 17 00:00:00 2001 From: techncl Date: Tue, 14 Jan 2025 12:22:49 +0000 Subject: [PATCH 2/4] Make label text's case sentence consistent --- .../gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala index d7962c61..1a337872 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala @@ -532,7 +532,7 @@ object CsvValidatorUi extends SimpleSwingApplication { Row("From", List(fromPathText)), Row("To", List(fileTextField, fileButton)) ) - addToTableDialog(parentFrame, "Add path substitution...", rows, tblPathSubstitutions.addRow) + addToTableDialog(parentFrame, "Add Path Substitution...", rows, tblPathSubstitutions.addRow) } private val tblPathSubstitutions = new Table(0, 2) { From 1be729efa296061304862bea5a3449108e2d3ff1 Mon Sep 17 00:00:00 2001 From: techncl Date: Tue, 14 Jan 2025 12:46:00 +0000 Subject: [PATCH 3/4] Make comment clearer --- .../gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala index 1a337872..33a34519 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala @@ -544,7 +544,7 @@ object CsvValidatorUi extends SimpleSwingApplication { } def removeSelectedRows() : Unit = peer.getSelectedRows.zipWithIndex.foreach { case (row, index) => - model.asInstanceOf[DefaultTableModel]removeRow(row - index) // when you delete a row, the index of row to delete next shifts down by 1 + model.asInstanceOf[DefaultTableModel]removeRow(row - index) // when you delete a row, the index of next row to delete shifts down by 1 } def pathSubstitutions : List[(String, String)] = { From 7fd9f13d464a228f87bbf90be8dacff42d3ec934 Mon Sep 17 00:00:00 2001 From: techncl Date: Thu, 16 Jan 2025 13:46:40 +0000 Subject: [PATCH 4/4] Remove ellipsis from 'Remove' button --- .../gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala index 33a34519..19c09ed7 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala @@ -553,7 +553,7 @@ object CsvValidatorUi extends SimpleSwingApplication { } private val spTblPathSubstitutions = new ScrollPane(tblPathSubstitutions) - private val btnRemovePathSubstitution = new Button("Remove Path Substitution...") + private val btnRemovePathSubstitution = new Button("Remove Path Substitution") private val btnAddPathSubstitution = new Button("Add Path Substitution...") btnRemovePathSubstitution.reactions += onClick(tblPathSubstitutions.removeSelectedRows())