This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 4d7a1ad852e2e9e4610883c49b119c370ea0eaae Author: Josh Tynjala <[email protected]> AuthorDate: Thu Jun 20 14:03:59 2024 -0700 FileFileFilter.FILE from commons-io is deprecated and replaced with FileFileFilter.INSTANCE --- .../internal/codegen/mxml/royale/MXMLRoyalePublisher.java | 12 ++++++------ .../internal/codegen/js/royale/TestRoyaleProject.java | 4 ++-- .../org/apache/royale/compiler/internal/test/TestBase.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java index ed9f7bdb6..7b1abcc66 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java @@ -277,17 +277,17 @@ public class MXMLRoyalePublisher extends JSPublisher implements IJSRoyalePublish // Copy static resources to the intermediate (and release) directory. ///////////////////////////////////////////////////////////////////////////////// - IOFileFilter pngSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter pngSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".png")); - IOFileFilter gifSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter gifSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".gif")); - IOFileFilter jpgSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter jpgSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".jpg")); - IOFileFilter jpegSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter jpegSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".jpeg")); - IOFileFilter svgSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter svgSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".svg")); - IOFileFilter jsonSuffixFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter jsonSuffixFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".json")); IOFileFilter assetFiles = FileFilterUtils.or(pngSuffixFilter, jpgSuffixFilter, jpegSuffixFilter, svgSuffixFilter, gifSuffixFilter, jsonSuffixFilter); diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java index 92cb1a244..3b860169e 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java @@ -399,9 +399,9 @@ public class TestRoyaleProject extends ASTestBase String projectName) { String outputFolderName = tempDir + "/" + projectName + "/bin/js-debug"; - IOFileFilter jsFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter jsFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter("js")); - IOFileFilter htmlFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter htmlFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter("html")); IOFileFilter resultsFilter = FileFilterUtils.or(jsFilter, htmlFilter); File outputFolder = new File(outputFolderName); diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java index e7ff15497..caa6ece95 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java @@ -824,7 +824,7 @@ public class TestBase implements ITestBase String projectName, String mainFileName) { String sourceFolderName = tempDir + "/" + projectName + "/src"; - IOFileFilter asFilter = FileFilterUtils.and(FileFileFilter.FILE, + IOFileFilter asFilter = FileFilterUtils.and(FileFileFilter.INSTANCE, FileFilterUtils.suffixFileFilter(".as")); File sourceFolder = new File(sourceFolderName); File projectFolder = new File(TestAdapterFactory.getTestAdapter().getUnitTestBaseDir(), projectFolderPath);
