fixed NPE in CompletionPanel

Manindra29 · Manindra29 · commit c28ef4f5dca7 · 2015-04-12T02:12:10.000-07:00
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -29,6 +29,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.ImageIcon;
+
 import processing.app.*;
 import processing.mode.java.runner.Runner;
 import processing.mode.java.tweak.SketchParser;
@@ -46,6 +48,17 @@ public JavaMode(Base base, File folder) {
 
     initLogger();
     loadPreferences();
+    loadIcons();
+  }
+  
+  /**
+   * Needed by code completion panel. See {@link processing.mode.java.pdex.CompletionPanel}
+   */
+  private void loadIcons(){
+    classIcon = loadIcon("theme/icon_class_obj.png");
+    methodIcon = loadIcon("theme/icon_methpub_obj.png");
+    fieldIcon = loadIcon("theme/icon_field_protected_obj.png");
+    localVarIcon = loadIcon("theme/icon_field_default_obj.png");
   }
 
 
@@ -316,6 +329,11 @@ void initLogger() {
   static public final String prefImportSuggestEnabled = "pdex.importSuggestEnabled";
 
   static volatile public boolean enableTweak = false;
+  
+  static public ImageIcon classIcon;
+  static public ImageIcon fieldIcon;
+  static public ImageIcon methodIcon;
+  static public ImageIcon localVarIcon;
 
 
   public void loadPreferences() {
diff --git a/java/src/processing/mode/java/pdex/CompletionPanel.java b/java/src/processing/mode/java/pdex/CompletionPanel.java
@@ -54,6 +54,7 @@
 import processing.app.Mode;
 import processing.app.syntax.JEditTextArea;
 import processing.mode.java.JavaEditor;
+import processing.mode.java.JavaMode;
 
 
 /**
@@ -93,9 +94,6 @@ public class CompletionPanel {
   
   public static final int MOUSE_COMPLETION = 10, KEYBOARD_COMPLETION = 20;
 
-  ImageIcon classIcon, fieldIcon, methodIcon, localVarIcon;
-
-
   /**
    * Triggers the completion popup
    * @param textarea
@@ -129,11 +127,6 @@ public CompletionPanel(final JEditTextArea textarea, int position, String subWor
         + location.y);
     //log("Suggestion shown: " + System.currentTimeMillis());
     
-    Mode mode = editor.getMode();
-    classIcon = mode.loadIcon("theme/icon_class_obj.png");
-    methodIcon = mode.loadIcon("theme/icon_methpub_obj.png");
-    fieldIcon = mode.loadIcon("theme/icon_field_protected_obj.png");
-    localVarIcon = mode.loadIcon("theme/icon_field_default_obj.png");
   }
 
   private void styleScrollPane() {
@@ -210,7 +203,7 @@ private int calcHeight(int itemCount) {
     int maxHeight = 250;
     FontMetrics fm = textarea.getGraphics().getFontMetrics();
     float itemHeight = Math.max((fm.getHeight() + (fm.getDescent()) * 0.5f),
-                                classIcon.getIconHeight() * 1.2f);
+                                JavaMode.classIcon.getIconHeight() * 1.2f);
     
     if (horizontalScrollBarVisible)
       itemCount++;
@@ -244,7 +237,7 @@ private int calcWidth() {
     int w = Math.min((int) min, maxWidth);
     if(w == maxWidth) 
       horizontalScrollBarVisible = true;
-    w += classIcon.getIconWidth(); // add icon width too!
+    w += JavaMode.classIcon.getIconWidth(); // add icon width too!
     w += fm.stringWidth("           "); // a bit of offset
     //log("popup width " + w);
     return w; // popup menu width
@@ -556,19 +549,19 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
         CompletionCandidate cc = (CompletionCandidate) value;
         switch (cc.getType()) {
         case CompletionCandidate.LOCAL_VAR:
-          label.setIcon(localVarIcon);
+          label.setIcon(JavaMode.localVarIcon);
           break;
         case CompletionCandidate.LOCAL_FIELD:
         case CompletionCandidate.PREDEF_FIELD:
-          label.setIcon(fieldIcon);
+          label.setIcon(JavaMode.fieldIcon);
           break;
         case CompletionCandidate.LOCAL_METHOD:
         case CompletionCandidate.PREDEF_METHOD:
-          label.setIcon(methodIcon);
+          label.setIcon(JavaMode.methodIcon);
           break;
         case CompletionCandidate.LOCAL_CLASS:
         case CompletionCandidate.PREDEF_CLASS:
-          label.setIcon(classIcon);
+          label.setIcon(JavaMode.classIcon);
           break;
 
         default:
diff --git a/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java b/java/src/processing/mode/java/pdex/ErrorMessageSimplifier.java
@@ -87,12 +87,12 @@ public static String getSimplifiedErrorMessage(Problem problem) {
       return null;
     IProblem iprob = problem.getIProblem();
     String args[] = iprob.getArguments();
-    Base.log("Simplifying message: " + problem.getMessage() + " ID: "
-        + getIDName(iprob.getID()));
-    Base.log("Arg count: " + args.length);
-    for (int i = 0; i < args.length; i++) {
-      Base.log("Arg " + args[i]);
-    }
+//    Base.log("Simplifying message: " + problem.getMessage() + " ID: "
+//        + getIDName(iprob.getID()));
+//    Base.log("Arg count: " + args.length);
+//    for (int i = 0; i < args.length; i++) {
+//      Base.log("Arg " + args[i]);
+//    }
 
     String result = null;
     
