From 0fa9d198920ef4832591a4dd6501d2097be2f7a3 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sun, 1 Aug 2021 13:15:47 -0400
Subject: [PATCH] cleaning up suggestions list access and remove unused lines

---
 .../mode/java/CompletionGenerator.java          | 12 ++++--------
 java/src/processing/mode/java/JavaMode.java     | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/java/src/processing/mode/java/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java
index 8b1c7c2df..b530d7d9c 100644
--- a/java/src/processing/mode/java/CompletionGenerator.java
+++ b/java/src/processing/mode/java/CompletionGenerator.java
@@ -1289,8 +1289,7 @@ public class CompletionGenerator {
   }
 
 
-  protected static boolean ignorableSuggestionImport(PreprocSketch ps, String impName) {
-
+  static protected boolean ignorableSuggestionImport(PreprocSketch ps, String impName) {
     String impNameLc = impName.toLowerCase();
 
     List<ImportStatement> programImports = ps.programImports;
@@ -1305,17 +1304,14 @@ public class CompletionGenerator {
 
     if (isImported) return false;
 
-    final String include = "include";
-    final String exclude = "exclude";
-
     if (impName.startsWith("processing")) {
-      if (JavaMode.suggestionsMap.containsKey(include) && JavaMode.suggestionsMap.get(include).contains(impName)) {
+      if (JavaMode.checkSuggestion("include", impName)) {
         return false;
-      } else if (JavaMode.suggestionsMap.containsKey(exclude) && JavaMode.suggestionsMap.get(exclude).contains(impName)) {
+      } else if (JavaMode.checkSuggestion("exclude", impName)) {
         return true;
       }
     } else if (impName.startsWith("java")) {
-      if (JavaMode.suggestionsMap.containsKey(include) && JavaMode.suggestionsMap.get(include).contains(impName)) {
+      if (JavaMode.checkSuggestion("include", impName)) {
         return false;
       }
     }
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
index f40de67b3..b3b934321 100644
--- a/java/src/processing/mode/java/JavaMode.java
+++ b/java/src/processing/mode/java/JavaMode.java
@@ -235,10 +235,17 @@ public class JavaMode extends Mode {
 
 
   /**
-   * Stores the white list/black list of allowed/blacklisted imports. These are defined in
-   * suggestions.txt in java mode folder.
+   * Stores the white list/black list of allowed/blacklisted imports.
+   * These are defined in suggestions.txt in java mode folder.
    */
-  static public final Map<String, Set<String>> suggestionsMap = new HashMap<>();
+  static private final Map<String, Set<String>> suggestionsMap = new HashMap<>();
+
+
+  static boolean checkSuggestion(String mapName, String impName) {
+    return suggestionsMap.containsKey(mapName) &&
+      JavaMode.suggestionsMap.get(mapName).contains(impName);
+  }
+
 
   public void loadPreferences() {
     Messages.log("Load PDEX prefs");
@@ -246,10 +253,8 @@ public class JavaMode extends Mode {
     errorCheckEnabled = Preferences.getBoolean(prefErrorCheck);
     warningsEnabled = Preferences.getBoolean(prefWarnings);
     codeCompletionsEnabled = Preferences.getBoolean(COMPLETION_PREF);
-//    DEBUG = Preferences.getBoolean(prefDebugOP);
     errorLogsEnabled = Preferences.getBoolean(prefErrorLogs);
     autoSaveInterval = Preferences.getInteger(prefAutoSaveInterval);
-//    untitledAutoSaveEnabled = Preferences.getBoolean(prefUntitledAutoSave);
     autoSaveEnabled = Preferences.getBoolean(prefAutoSave);
     autoSavePromptEnabled = Preferences.getBoolean(prefAutoSavePrompt);
     defaultAutoSaveEnabled = Preferences.getBoolean(prefDefaultAutoSave);
@@ -265,10 +270,8 @@ public class JavaMode extends Mode {
     Preferences.setBoolean(prefErrorCheck, errorCheckEnabled);
     Preferences.setBoolean(prefWarnings, warningsEnabled);
     Preferences.setBoolean(COMPLETION_PREF, codeCompletionsEnabled);
-//    Preferences.setBoolean(prefDebugOP, DEBUG);
     Preferences.setBoolean(prefErrorLogs, errorLogsEnabled);
     Preferences.setInteger(prefAutoSaveInterval, autoSaveInterval);
-//    Preferences.setBoolean(prefUntitledAutoSave,untitledAutoSaveEnabled);
     Preferences.setBoolean(prefAutoSave, autoSaveEnabled);
     Preferences.setBoolean(prefAutoSavePrompt, autoSavePromptEnabled);
     Preferences.setBoolean(prefDefaultAutoSave, defaultAutoSaveEnabled);