From 16bc17ae644908dde88cd7f29b86c02d9e31da29 Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Thu, 20 Aug 2015 21:04:03 -0700 Subject: [PATCH] wrap up #2951 --- .../mode/java/pdex/ASTGenerator.java | 11 ++- java/suggestions.txt | 86 +++++++++---------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java index 93e5a07e0..5ab752705 100644 --- a/java/src/processing/mode/java/pdex/ASTGenerator.java +++ b/java/src/processing/mode/java/pdex/ASTGenerator.java @@ -3520,18 +3520,17 @@ public class ASTGenerator { log("SuggestionsMap is null or empty, won't be able to trim class names"); return true; } - final String processingInclude = "include.processing"; - final String processingExclude = "exclude.processing"; - final String jdkInclude = "include.jdk"; + final String include = "include"; + final String exclude = "exclude"; if (impName.startsWith("processing")) { - if (JavaMode.suggestionsMap.get(processingInclude).contains(impName)) { + if (JavaMode.suggestionsMap.get(include).contains(impName)) { return false; - } else if (JavaMode.suggestionsMap.get(processingExclude).contains(impName)) { + } else if (JavaMode.suggestionsMap.get(exclude).contains(impName)) { return true; } } else if (impName.startsWith("java")) { - if (JavaMode.suggestionsMap.get(jdkInclude).contains(impName)) { + if (JavaMode.suggestionsMap.get(include).contains(impName)) { return false; } } diff --git a/java/suggestions.txt b/java/suggestions.txt index ff86167a2..ae9f8642e 100644 --- a/java/suggestions.txt +++ b/java/suggestions.txt @@ -1,48 +1,48 @@ #List of suggestions to include/exclude in code completion -#.