diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index 202f2c19a..40814d83d 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/java/src/processing/mode/java/JavaEditor.java @@ -9,8 +9,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.*; import javax.swing.border.*; @@ -220,7 +218,7 @@ public class JavaEditor extends Editor { stopItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (isDebuggerEnabled()) { - Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Stop' menu item"); + Messages.log("Invoked 'Stop' menu item"); debugger.stopDebug(); } else { handleStop(); @@ -1144,22 +1142,22 @@ public class JavaEditor extends Editor { public void handleStep(int modifiers) { if (modifiers == 0) { - Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Over' menu item"); + Messages.log("Invoked 'Step Over' menu item"); debugger.stepOver(); } else if ((modifiers & ActionEvent.SHIFT_MASK) != 0) { - Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Into' menu item"); + Messages.log("Invoked 'Step Into' menu item"); debugger.stepInto(); } else if ((modifiers & ActionEvent.ALT_MASK) != 0) { - Logger.getLogger(getClass().getName()).log(Level.INFO, "Invoked 'Step Out' menu item"); + Messages.log("Invoked 'Step Out' menu item"); debugger.stepOut(); } } public void handleContinue() { - Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Continue' menu item"); + Messages.log("Invoked 'Continue' menu item"); debugger.continueDebug(); } @@ -1399,7 +1397,7 @@ public class JavaEditor extends Editor { Toolkit.newJMenuItem(Language.text("menu.debug.toggle_breakpoint"), 'B'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Logger.getLogger(JavaEditor.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' menu item"); + Messages.log("Invoked 'Toggle Breakpoint' menu item"); // TODO wouldn't getCaretLine() do the same thing with less effort? toggleBreakpoint(getCurrentLineID().lineIdx()); } @@ -1603,7 +1601,7 @@ public class JavaEditor extends Editor { tab.setProgram(code); tab.save(); } catch (IOException ex) { - Logger.getLogger(JavaEditor.class.getName()).log(Level.SEVERE, null, ex); + Messages.loge(null, ex); } } diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java index 365fa3e6d..58423decb 100644 --- a/java/src/processing/mode/java/JavaMode.java +++ b/java/src/processing/mode/java/JavaMode.java @@ -30,10 +30,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.logging.FileHandler; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.SwingUtilities; @@ -56,7 +52,7 @@ public class JavaMode extends Mode { public JavaMode(Base base, File folder) { super(base, folder); - initLogger(); +// initLogger(); loadPreferences(); } @@ -263,7 +259,7 @@ public class JavaMode extends Mode { // Merged from ExperimentalMode - + /* void initLogger() { final boolean VERBOSE_LOGGING = true; final int LOG_SIZE = 512 * 1024; // max log file size (in bytes) @@ -293,6 +289,7 @@ public class JavaMode extends Mode { Logger.getLogger(JavaMode.class.getName()).log(Level.SEVERE, null, ex); } } + */ //ImageIcon classIcon, fieldIcon, methodIcon, localVarIcon; diff --git a/java/src/processing/mode/java/VariableInspector.java b/java/src/processing/mode/java/VariableInspector.java index e9e30a4e7..f0cdde4f6 100644 --- a/java/src/processing/mode/java/VariableInspector.java +++ b/java/src/processing/mode/java/VariableInspector.java @@ -26,8 +26,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.*; import javax.swing.event.TreeExpansionEvent; @@ -40,17 +38,12 @@ import org.netbeans.swing.outline.*; import com.sun.jdi.Value; import processing.app.Language; +import processing.app.Messages; import processing.app.Mode; import processing.mode.java.debug.VariableNode; public class VariableInspector extends JDialog { -// static public final int GAP = 13; - -// EditorButton continueButton; -// EditorButton stepButton; -// EditorButton breakpointButton; - // The tray will be placed at this amount from the top of the editor window, // and extend to this amount from the bottom of the editor window. static final int VERTICAL_OFFSET = 64; @@ -441,11 +434,12 @@ public class VariableInspector extends JDialog { break; } } catch (NumberFormatException ex) { - Logger.getLogger(VariableRowModel.class.getName()).log(Level.INFO, "invalid value entered for {0}: {1}", new Object[]{var.getName(), stringValue}); + Messages.log(getClass().getName() + " invalid value entered for " + + var.getName() + " -> " + stringValue); } if (value != null) { var.setValue(value); - Logger.getLogger(VariableRowModel.class.getName()).log(Level.INFO, "new value set: {0}", var.getStringValue()); + Messages.log(getClass().getName() + " new value set: " + var.getStringValue()); } } @@ -483,7 +477,7 @@ public class VariableInspector extends JDialog { Mode mode = editor.getMode(); File file = mode.getContentFile(fileName); if (!file.exists()) { - Logger.getLogger(OutlineRenderer.class.getName()).log(Level.SEVERE, "icon file not found: {0}", file.getAbsolutePath()); + Messages.log(getClass().getName(), "icon file not found: " + file.getAbsolutePath()); return null; } Image allIcons = mode.loadImage(fileName);