Skip to content
Snippets Groups Projects
Commit da739127 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Merge branch 'master' into develop

parents 6cd5a52a 35d34130
No related branches found
No related tags found
No related merge requests found
...@@ -52,7 +52,8 @@ public class PadNewContentListener { ...@@ -52,7 +52,8 @@ public class PadNewContentListener {
if (multiSelect) { if (multiSelect) {
selectedFiles = chooser.showOpenMultipleDialog(window); selectedFiles = chooser.showOpenMultipleDialog(window);
} else { } else {
selectedFiles = Collections.singletonList(chooser.showOpenDialog(window)); final File selectedFile = chooser.showOpenDialog(window);
selectedFiles = selectedFile == null ? Collections.emptyList() : Collections.singletonList(selectedFile);
} }
if (selectedFiles != null && !selectedFiles.isEmpty()) { if (selectedFiles != null && !selectedFiles.isEmpty()) {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<project.build.code>42</project.build.code> <project.build.code>43</project.build.code>
<project.versionDate>${maven.build.timestamp}</project.versionDate> <project.versionDate>${maven.build.timestamp}</project.versionDate>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment