diff options
author | Stephan Schwär | 2020-12-16 03:56:57 +0100 |
---|---|---|
committer | Stephan Schwär | 2020-12-16 03:56:57 +0100 |
commit | eed4391f165ab90a336d91d0a01c7c563b4d2cad (patch) | |
tree | df4aa04ef278836c8725b2647608f21213c5c1a4 /dozentenmodul/src/main/java/org | |
parent | Merge remote-tracking branch 'origin/feature/docker-integration-new' into fea... (diff) | |
parent | [client] fix directory navigation in file chooser (diff) | |
download | tutor-module-eed4391f165ab90a336d91d0a01c7c563b4d2cad.tar.gz tutor-module-eed4391f165ab90a336d91d0a01c7c563b4d2cad.tar.xz tutor-module-eed4391f165ab90a336d91d0a01c7c563b4d2cad.zip |
Merge remote-tracking branch 'origin/feature/docker-integration-new' into feature-merge
Diffstat (limited to 'dozentenmodul/src/main/java/org')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 874a2435..fb5a8b86 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -242,13 +242,12 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { private static class DockerfileFilter extends FileFilter { @Override public boolean accept(File f) { - - + Pattern p = Pattern.compile("[Dd]ockerfile"); Matcher m = p.matcher(f.getName()); boolean accept = false; - if (f.isFile() && m.matches()) + if ((f.isFile() && m.matches()) || f.isDirectory()) accept = true; return accept; } |