From 72ff1f460545e779548bedabee2a56475aec2a5d Mon Sep 17 00:00:00 2001 From: Bastien Jansen Date: Sun, 10 Mar 2024 10:03:24 +0100 Subject: [PATCH] refact: remove usage of deprecated interfaces --- .../java/org/antlr/intellij/plugin/Utils.java | 4 ++-- .../templates/ANTLRLiveTemplatesProvider.java | 20 ------------------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/org/antlr/intellij/plugin/templates/ANTLRLiveTemplatesProvider.java diff --git a/src/main/java/org/antlr/intellij/plugin/Utils.java b/src/main/java/org/antlr/intellij/plugin/Utils.java index 418151b6..50d31828 100644 --- a/src/main/java/org/antlr/intellij/plugin/Utils.java +++ b/src/main/java/org/antlr/intellij/plugin/Utils.java @@ -1,6 +1,6 @@ package org.antlr.intellij.plugin; -import com.intellij.util.containers.Predicate; +import java.util.function.Predicate; import java.util.ArrayList; import java.util.Collection; @@ -11,7 +11,7 @@ public static List filter(Collection data, Predicate pred) { if ( data==null ) return null; List filtered = new ArrayList<>(); for (T x : data) { - if ( pred.apply(x) ) filtered.add(x); + if ( pred.test(x) ) filtered.add(x); } return filtered; } diff --git a/src/main/java/org/antlr/intellij/plugin/templates/ANTLRLiveTemplatesProvider.java b/src/main/java/org/antlr/intellij/plugin/templates/ANTLRLiveTemplatesProvider.java deleted file mode 100644 index ac8bf16e..00000000 --- a/src/main/java/org/antlr/intellij/plugin/templates/ANTLRLiveTemplatesProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.antlr.intellij.plugin.templates; - -import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; -import org.jetbrains.annotations.Nullable; - -public class ANTLRLiveTemplatesProvider implements DefaultLiveTemplatesProvider { - // make sure module shows liveTemplates as source dir or whatever dir holds "lexer" - public static final String[] TEMPLATES = {"liveTemplates/lexer/user"}; - - @Override - public String[] getDefaultLiveTemplateFiles() { - return TEMPLATES; - } - - @Nullable - @Override - public String[] getHiddenLiveTemplateFiles() { - return new String[0]; - } -}