From b8b5cfc54a840532a5b6a6b8316c0a13b473c60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Galland?= Date: Mon, 20 Nov 2017 00:58:15 +0100 Subject: [PATCH] [inputoutput] Add toJavaFX() to FileFilter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function replies the JavaFX file extension filter from the generic FileFilter. Signed-off-by: Stéphane Galland --- core/inputoutput/pom.xml | 4 ++++ .../afc/inputoutput/filefilter/AbstractFileFilter.java | 6 ++++++ .../arakhne/afc/inputoutput/filefilter/FileFilter.java | 8 ++++++++ .../afc/inputoutput/filefilter/MultiFileFilter.java | 6 ++++++ .../afc/inputoutput/xml/XMLIdentifierConstraintTest.java | 2 +- .../afc/inputoutput/xml/XMLNameConstraintTest.java | 2 +- .../afc/inputoutput/xml/XMLValueConstraintTest.java | 2 +- 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/core/inputoutput/pom.xml b/core/inputoutput/pom.xml index b9a79ee1a..a467eec4e 100644 --- a/core/inputoutput/pom.xml +++ b/core/inputoutput/pom.xml @@ -20,6 +20,10 @@ org.arakhne.afc.core text + + javafx + jfxrt + org.arakhne.afc.core testtools diff --git a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/AbstractFileFilter.java b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/AbstractFileFilter.java index 802aaa57f..dbe494ff5 100644 --- a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/AbstractFileFilter.java +++ b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/AbstractFileFilter.java @@ -22,6 +22,7 @@ import java.io.File; +import javafx.stage.FileChooser.ExtensionFilter; import org.eclipse.xtext.xbase.lib.Pure; import org.arakhne.afc.vmutil.FileSystem; @@ -75,6 +76,11 @@ public AbstractFileFilter(boolean acceptDirectories, String description, String. this.description = Locale.getString("EXTENSION_STRING", description, b.toString()); //$NON-NLS-1$ } + @Override + public ExtensionFilter toJavaFX() { + return new ExtensionFilter(getDescription(), getExtensions()); + } + @Pure @Override public final boolean accept(File file) { diff --git a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/FileFilter.java b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/FileFilter.java index 682d99aca..5c4d0f626 100644 --- a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/FileFilter.java +++ b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/FileFilter.java @@ -22,6 +22,7 @@ import java.io.FilenameFilter; +import javafx.stage.FileChooser; import org.eclipse.xtext.xbase.lib.Pure; /** File filter. @@ -47,4 +48,11 @@ public interface FileFilter extends java.io.FileFilter, FilenameFilter { @Pure String[] getExtensions(); + /** Replies the JavaFX file extension filter. + * + * @return the filter. + * @since 15.0 + */ + FileChooser.ExtensionFilter toJavaFX(); + } diff --git a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/MultiFileFilter.java b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/MultiFileFilter.java index 35d67570d..451495eee 100644 --- a/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/MultiFileFilter.java +++ b/core/inputoutput/src/main/java/org/arakhne/afc/inputoutput/filefilter/MultiFileFilter.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.List; +import javafx.stage.FileChooser.ExtensionFilter; import org.eclipse.xtext.xbase.lib.Pure; /** Multi file filter. @@ -64,6 +65,11 @@ public MultiFileFilter(boolean acceptDirectories1, String description, FileFilte this.description = description; } + @Override + public ExtensionFilter toJavaFX() { + return new ExtensionFilter(getDescription(), getExtensions()); + } + @Pure @Override public boolean accept(File file) { diff --git a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLIdentifierConstraintTest.java b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLIdentifierConstraintTest.java index 5b80f1f7b..b0bd6df37 100644 --- a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLIdentifierConstraintTest.java +++ b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLIdentifierConstraintTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLNameConstraintTest.java b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLNameConstraintTest.java index b9d73bb4f..0b1e9cf8d 100644 --- a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLNameConstraintTest.java +++ b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLNameConstraintTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLValueConstraintTest.java b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLValueConstraintTest.java index c55f4bdbb..d210a1abf 100644 --- a/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLValueConstraintTest.java +++ b/core/inputoutput/src/test/java/org/arakhne/afc/inputoutput/xml/XMLValueConstraintTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when;