@@ -327,7 +327,9 @@ static public void logf(String message, Object... args) {
 
   static public void loge(String message, Throwable e) {
     if (Base.DEBUG) {
-      System.err.println(message);
+      if (message != null) {
+        System.err.println(message);
+      }
       e.printStackTrace();
     }
   }
 
@@ -1,21 +1,22 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-Part of the Processing project - http://processing.org
-Copyright (c) 2012-15 The Processing Foundation
+  Part of the Processing project - http://processing.org
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
+  Copyright (c) 2012-16 The Processing Foundation
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 package processing.mode.java.debug;
@@ -24,45 +25,38 @@
 import com.sun.jdi.ClassNotLoadedException;
 import com.sun.jdi.InvalidTypeException;
 import com.sun.jdi.Value;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import processing.app.Messages;
 
 /**
  * Specialized {@link VariableNode} for representing single fields in an array.
  * Overrides {@link #setValue} to properly change the value of the encapsulated
  * array field.
- *
- * @author Martin Leopold <m@martinleopold.com>
  */
 public class ArrayFieldNode extends VariableNode {
-
-    protected ArrayReference array;
-    protected int index;
-
-    /**
-     * Construct an {@link ArrayFieldNode}.
-     *
-     * @param name the name
-     * @param type the type
-     * @param value the value
-     * @param array a reference to the array
-     * @param index the index inside the array
-     */
-    public ArrayFieldNode(String name, String type, Value value, ArrayReference array, int index) {
-        super(name, type, value);
-        this.array = array;
-        this.index = index;
-    }
-
-    @Override
-    public void setValue(Value value) {
-        try {
-            array.setValue(index, value);
-        } catch (InvalidTypeException ex) {
-            Logger.getLogger(ArrayFieldNode.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (ClassNotLoadedException ex) {
-            Logger.getLogger(ArrayFieldNode.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        this.value = value;
+  protected ArrayReference array;
+  protected int index;
+
+
+  /**
+   * Construct an {@link ArrayFieldNode}.
+   */
+  public ArrayFieldNode(String name, String type, Value value, ArrayReference array, int index) {
+    super(name, type, value);
+    this.array = array;
+    this.index = index;
+  }
+
+
+  @Override
+  public void setValue(Value value) {
+    try {
+      array.setValue(index, value);
+    } catch (InvalidTypeException ex) {
+      Messages.loge(null, ex);
+    } catch (ClassNotLoadedException ex) {
+      Messages.loge(null, ex);
     }
+    this.value = value;
+  }
 }
@@ -1,40 +1,38 @@
 /* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 /*
-Part of the Processing project - http://processing.org
-Copyright (c) 2012-15 The Processing Foundation
+  Part of the Processing project - http://processing.org
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 2
-as published by the Free Software Foundation.
+  Copyright (c) 2012-16 The Processing Foundation
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 package processing.mode.java.debug;
 
 import com.sun.jdi.ReferenceType;
 
+
 /**
  * Listener to be notified when a class is loaded in the debugger. Used by
  * {@link LineBreakpoint}s to activate themselves as soon as the respective
  * class is loaded.
- *
- * @author Martin Leopold <m@martinleopold.com>
  */
 public interface ClassLoadListener {
 
-    /**
-     * Event handler called when a class is loaded.
-     *
-     * @param theClass the class
-     */
-    public void classLoaded(ReferenceType theClass);
+  /**
+   * Event handler called when a class is loaded.
+   */
+  public void classLoaded(ReferenceType theClass);
 }
@@ -2,20 +2,21 @@
 
 /*
   Part of the Processing project - http://processing.org
-  Copyright (c) 2012-15 The Processing Foundation
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2
-  as published by the Free Software Foundation.
+  Copyright (c) 2012-16 The Processing Foundation
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  version 2, as published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software Foundation, Inc.
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 package processing.mode.java.debug;
@@ -25,46 +26,40 @@
 import com.sun.jdi.InvalidTypeException;
 import com.sun.jdi.ObjectReference;
 import com.sun.jdi.Value;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import processing.app.Messages;
 
 
 /**
  * Specialized {@link VariableNode} for representing fields. Overrides
  * {@link #setValue} to properly change the value of the encapsulated field.
- *
- * @author Martin Leopold <m@martinleopold.com>
  */
 public class FieldNode extends VariableNode {
-    protected Field field;
-    protected ObjectReference obj;
+  protected Field field;
+  protected ObjectReference obj;
+
+
+  /**
+   * Construct a {@link FieldNode}.
+   * @param obj a reference to the object containing the field
+   */
+  public FieldNode(String name, String type, Value value, Field field,
+                   ObjectReference obj) {
+    super(name, type, value);
+    this.field = field;
+    this.obj = obj;
+  }
 
-    
-    /**
-     * Construct a {@link FieldNode}.
-     *
-     * @param name the name
-     * @param type the type
-     * @param value the value
-     * @param field the field
-     * @param obj a reference to the object containing the field
-     */
-    public FieldNode(String name, String type, Value value, Field field, ObjectReference obj) {
-        super(name, type, value);
-        this.field = field;
-        this.obj = obj;
-    }
 
-    
-    @Override
-    public void setValue(Value value) {
-        try {
-            obj.setValue(field, value);
-        } catch (InvalidTypeException ex) {
-            Logger.getLogger(FieldNode.class.getName()).log(Level.SEVERE, null, ex);
-        } catch (ClassNotLoadedException ex) {
-            Logger.getLogger(FieldNode.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        this.value = value;
+  @Override
+  public void setValue(Value value) {
+    try {
+      obj.setValue(field, value);
+    } catch (InvalidTypeException ite) {
+      Messages.loge(null, ite);
+    } catch (ClassNotLoadedException cnle) {
+      Messages.loge(null, cnle);
     }
+    this.value = value;
+  }
 }
Original file line number	Diff line number	Diff line change
@@ -327,7 +327,9 @@ static public void logf(String message, Object... args) {
327	327
328	328	static public void loge(String message, Throwable e) {
329	329	if (Base.DEBUG) {
330		- System.err.println(message);
	330	+ if (message != null) {
	331	+ System.err.println(message);
	332	+ }
331	333	e.printStackTrace();
332	334	}
333	335	}