Skip to content

Commit 49460ba

Browse files
committed
Merge branch 'master' into DR2-2460_outputBoxResizingCausesButtonsToVanish
2 parents df66bf9 + 03298f5 commit 49460ba

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

csv-validator-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<plugin>
216216
<groupId>org.apache.maven.plugins</groupId>
217217
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.11.3</version>
218+
<version>3.12.0</version>
219219
</plugin>
220220
<plugin>
221221
<groupId>org.codehaus.mojo</groupId>

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ object CsvValidatorUi extends SimpleSwingApplication {
232232
}
233233

234234
private val txtArReport = new TextArea()
235+
txtArReport.lineWrap = true
235236

236237
/**
237238
* The main UI of the application
@@ -336,6 +337,7 @@ object CsvValidatorUi extends SimpleSwingApplication {
336337

337338
private val scrollPane = new ScrollPane
338339
txtArReport.peer.setTransferHandler(fileHandler)
340+
scrollPane.preferredSize = new Dimension(300, 70) // for some reason, line wrap only works if this is here so this will have to stay
339341
scrollPane.viewportView = txtArReport
340342

341343
private val btnValidate = new Button("Validate")

0 commit comments

Comments
 (0)