diff --git a/README.md b/README.md index 59c8127c..9d815418 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ The Validation tool and APIs are written in Scala 2.13 and may be used as: * A library in your Scala project. -* A library in your Java project (We provide a Java 11 interface, to make things simple for Java programmers too). +* A library in your Java project (We provide a Java 21 interface, to make things simple for Java programmers too). -The Validation Tool and APIs can be used on any Java Virtual Machine which supports Java 11 or better (**NB Java 6 support was removed in version 1.1**). The source code is +The Validation Tool and APIs can be used on any Java Virtual Machine which supports Java 21 or better (**NB Java 6 support was removed in version 1.1**). The source code is built using the [Apache Maven](https://maven.apache.org/) build tool: 1. For use in other Java/Scala Applications, build by executing `mvn clean install`. @@ -41,7 +41,7 @@ If you wish to use the CSV Validator from your own Java project, we provide a na uk.gov.nationalarchives csv-validator-java-api - 1.4.0 + 1.4.1 ``` @@ -109,7 +109,7 @@ Likewise, if you wish to use the CSV Validator from your own Scala project, the uk.gov.nationalarchives csv-validator-core - 1.3.0 + 1.4.1 ``` diff --git a/csv-validator-distribution/README.md b/csv-validator-distribution/README.md index 756efe78..4c31deda 100644 --- a/csv-validator-distribution/README.md +++ b/csv-validator-distribution/README.md @@ -5,7 +5,7 @@ This module assembles the csv-validator deliverable in a zip format. --- ### Structure of the generated ZIP file -The zip, which includes bundled JRE, has following structure. +The zip, which includes bundled JRE, has the following structure: ``` csv-validator-application- 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 9ed26f4d..9336e8c0 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 @@ -71,6 +71,9 @@ object CsvValidatorUi extends SimpleSwingApplication { //handle resizing the main window, when resizing the settings panel settings.settingsGroup.reactions += SJXTaskPane.onViewStateChanged { this.preferredSize = this.size + if (settings.settingsGroup.collapsed) settings.settingsGroup.remove(settings.settingsGroupLayout) + else settings.settingsGroup.add(settings.settingsGroupLayout) + this.pack() } new ContentPanel(settings, this) @@ -582,7 +585,7 @@ object CsvValidatorUi extends SimpleSwingApplication { btnRemovePathSubstitution.reactions += onClick(tblPathSubstitutions.removeSelectedRows()) btnAddPathSubstitution.reactions += onClick(tablePathDialog()) - private val settingsGroupLayout = new GridBagPanel { + val settingsGroupLayout: GridBagPanel = new GridBagPanel { private val c = new Constraints c.anchor = Anchor.West @@ -658,7 +661,6 @@ object CsvValidatorUi extends SimpleSwingApplication { c.anchor = Anchor.LastLineEnd layout(btnAddPathSubstitution) = c } - settingsGroup.add(settingsGroupLayout) add(settingsGroup) diff --git a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/SJXHelpers.scala b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/SJXHelpers.scala index b66eb8a7..a0b522d1 100644 --- a/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/SJXHelpers.scala +++ b/csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/SJXHelpers.scala @@ -44,6 +44,7 @@ class SJXTaskPane(title: String) extends Panel with Publisher { this.collapsed = collapsed } def add(component: Component) = peer.add(component.peer) + def remove(component: Component) = peer.remove(component.peer) def collapsed = peer.isCollapsed def collapsed_= (c : Boolean) : Unit = { peer.setCollapsed(c)