Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PlayWallDesktop
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
PlayWallDesktop wird heute 10 Jahre alt!
Show more breadcrumbs
PlayWall
PlayWallDesktop
Commits
da739127
Commit
da739127
authored
Nov 6, 2021
by
Tobias Ullerich
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into develop
parents
6cd5a52a
35d34130
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
+2
-1
2 additions, 1 deletion
...laypad/layout/desktop/listener/PadNewContentListener.java
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
with
3 additions
and
2 deletions
PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadNewContentListener.java
+
2
−
1
View file @
da739127
...
@@ -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
())
{
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
da739127
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<properties>
<properties>
<project.build.code>
4
2
</project.build.code>
<project.build.code>
4
3
</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>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment