removing more underbrush

benfry · benfry · commit 4f05cfe704e4 · 2015-01-25T12:55:57.000-05:00
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -60,31 +60,11 @@ public class JavaEditor extends Editor {
   protected LineHighlight currentLine; // line the debugger is currently suspended at
   protected final String breakpointMarkerComment = " //<>//"; // breakpoint marker comment
 
-  protected JMenu debugMenu; // the debug menu
-
-//  protected JMenuItem debugMenuItem;
-//  protected JMenuItem continueMenuItem;
-//  protected JMenuItem stopMenuItem;
-
-//  protected JMenuItem toggleBreakpointMenuItem;
-//  protected JMenuItem listBreakpointsMenuItem;
-
-//  protected JMenuItem stepOverMenuItem;
-//  protected JMenuItem stepIntoMenuItem;
-//  protected JMenuItem stepOutMenuItem;
-
-//  protected JMenuItem printStackTraceMenuItem;
-//  protected JMenuItem printLocalsMenuItem;
-//  protected JMenuItem printThisMenuItem;
-//  protected JMenuItem printSourceMenuItem;
-//  protected JMenuItem printThreads;
-
-//  protected JMenuItem toggleVariableInspectorMenuItem;
+  protected JMenu debugMenu;
 
   protected Debugger debugger; // the debugger
   protected DebugTray tray; // the variable inspector frame
 
-//  public JavaTextArea ta; // the text area
   public ErrorBar errorBar;
     
   protected XQConsoleToggle btnShowConsole;
@@ -94,16 +74,7 @@ public class JavaEditor extends Editor {
   protected XQErrorTable errorTable;
 
   // TODO how is this different from hasJavaTabs?
-  public boolean compilationCheckEnabled = true;
-
-//  protected JCheckBoxMenuItem showWarnings;
-//  public JCheckBoxMenuItem problemWindowMenuCB;
-//  protected JCheckBoxMenuItem debugMessagesEnabled;
-//  protected JMenuItem showOutline; 
-//  protected JMenuItem showTabOutline;
-//  protected JCheckBoxMenuItem writeErrorLog;
-//  protected JCheckBoxMenuItem completionsEnabled;
-    
+//  public boolean compilationCheckEnabled = true;
   private boolean hasJavaTabs;
   
 
@@ -2428,7 +2399,6 @@ public boolean hasJavaTabs() {
     private boolean checkForJavaTabs() {
       for (SketchCode code : getSketch().getCode()) {
         if (code.getExtension().equals("java")) {
-          compilationCheckEnabled = false;
           final String msg = 
             getSketch().getName() + " contains .java tabs. Some editor " +
             "features are not supported for .java tabs and will be disabled.";
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -504,7 +504,7 @@ protected boolean checkCode() {
       if (!hasSyntaxErrors()) {
              
       }
-      if (problems.length == 0 && editor.compilationCheckEnabled) {
+      if (problems.length == 0 && !editor.hasJavaTabs()) {
         //mainClassOffset++; // just a hack.
         
         sourceCode = xqpreproc.doYourThing(sourceCode, programImports);
diff --git a/todo.txt b/todo.txt
@@ -94,6 +94,9 @@ X remove public 'ta' object in DebugEditor, also dmode
 _ fix hasJavaTabs() function
 _   almost always used as a negative, or tied to a 'return' from fxn
 _   name isn't tied to its function, but the symptom
+_   only checked once (when the editor is created)
+X   how does it relate to compilationCheckEnabled?
+X     removed, seems to be duplicate/used the same way
 _ crashed on startup w/ JavaScript mode as default b/c PdeKeyListener not found
 _   because it's in the other ClassLoader, can no longer rely on it
 

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ protected boolean checkCode() {`
`504`	`504`	`if (!hasSyntaxErrors()) {`
`505`	`505`
`506`	`506`	`}`
`507`		`- if (problems.length == 0 && editor.compilationCheckEnabled) {`
	`507`	`+ if (problems.length == 0 && !editor.hasJavaTabs()) {`
`508`	`508`	`//mainClassOffset++; // just a hack.`
`509`	`509`
`510`	`510`	`sourceCode = xqpreproc.doYourThing(sourceCode, programImports);`