Merge pull request #606 from digital-preservation/DR2-2520_RemoveBlankSpaceBetweenSettingsAndValidate

Dr2 2520 remove the large blank space between "Settings" and "Validate" button

Author: techncl

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
 <dependency>
 	<groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-java-api</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 </dependency>
 ```
 
@@ -109,7 +109,7 @@ Likewise, if you wish to use the CSV Validator from your own Scala project, the
 <dependency>
 	<groupId>uk.gov.nationalarchives</groupId>
     <artifactId>csv-validator-core</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.1</version>
 </dependency>
 ```
 

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-<version_number>

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)
 

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)