PDE X prefs work

Manindra29 · Manindra29 · commit cda60dd02105 · 2014-06-26T13:40:37.000+05:30
diff --git a/app/.classpath b/app/.classpath
@@ -6,7 +6,6 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="test/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/>
diff --git a/app/src/processing/app/Preferences.java b/app/src/processing/app/Preferences.java
@@ -825,7 +825,11 @@ protected void applyFrame() {
       setBoolean("platform.auto_file_type_associations", //$NON-NLS-1$
                  autoAssociateBox.isSelected());
     }
-
+    
+    setBoolean("pdex.errorCheckEnabled", errorCheckerBox.isSelected());
+    setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());
+    setBoolean("pdex.ccEnabled", codeCompletionBox.isSelected());
+    
     for (Editor editor : base.getEditors()) {
       editor.applyPreferences();
     }
diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -1609,8 +1609,8 @@ synchronized public boolean updateTable(final TableModel tableModel) {
      * at the bottom of the PDE
      */
     public void updateErrorToggle(){
-      btnShowErrors.updateMarker(errorCheckerService.hasErrors(),
-                               errorBar.errorColor);
+		btnShowErrors.updateMarker(ExperimentalMode.errorCheckEnabled
+				&& errorCheckerService.hasErrors(), errorBar.errorColor);
     }
     
     /**
@@ -1649,4 +1649,14 @@ private void checkForJavaTabs() {
         }
       }
     }
+    
+	protected void applyPreferences() {
+		super.applyPreferences();
+		if (dmode != null) {
+			dmode.loadPreferences();
+			log("Applying prefs");
+			// trigger it once to refresh UI
+			errorCheckerService.runManualErrorCheck();
+		}
+	}
 }
diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java
@@ -476,19 +476,18 @@ protected boolean checkCode() {
       }
       
       astGenerator.buildAST(cu);
-      if(ExperimentalMode.errorCheckEnabled){
-        calcPDEOffsetsForProbList();
-        updateErrorTable();
-        editor.updateErrorBar(problemsList);
-        updateEditorStatus();
-        editor.getTextArea().repaint();
-        updatePaintedThingys();
-        editor.updateErrorToggle();
-      }
-      else
-      {
-        log("Error Check disabled, so not updating UI.");
+      if(!ExperimentalMode.errorCheckEnabled){
+    	  problemsList.clear();
+    	  log("Error Check disabled, so not updating UI.");
       }
+      calcPDEOffsetsForProbList();
+      updateErrorTable();
+      editor.updateErrorBar(problemsList);
+      updateEditorStatus();
+      editor.getTextArea().repaint();
+      updatePaintedThingys();
+      editor.updateErrorToggle();
+      
       int x = textModified.get();
       //log("TM " + x);
       if (x >= 2) {
diff --git a/pdex/src/processing/mode/experimental/XQConsoleToggle.java b/pdex/src/processing/mode/experimental/XQConsoleToggle.java
@@ -94,10 +94,10 @@ public void paintComponent(Graphics g) {
 		g.drawString(buttonName, getWidth() / 2 + 2 // + 2 is a offset
 				- getFontMetrics(getFont()).stringWidth(buttonName) / 2,
 				this.getHeight() - 6);
-		if(drawMarker){
-      g.setColor(markerColor);
-      g.fillRect(4, 0, 2, this.getHeight());
-    }
+		if (drawMarker) {
+			g.setColor(markerColor);
+			g.fillRect(4, 0, 2, this.getHeight());
+		}
 	}
 	
 	boolean drawMarker = false; 

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,11 @@ protected void applyFrame() {`
`825`	`825`	`setBoolean("platform.auto_file_type_associations", //$NON-NLS-1$`
`826`	`826`	`autoAssociateBox.isSelected());`
`827`	`827`	`}`
`828`		`-`
	`828`	`+`
	`829`	`+ setBoolean("pdex.errorCheckEnabled", errorCheckerBox.isSelected());`
	`830`	`+ setBoolean("pdex.warningsEnabled", warningsCheckerBox.isSelected());`
	`831`	`+ setBoolean("pdex.ccEnabled", codeCompletionBox.isSelected());`
	`832`	`+`
`829`	`833`	`for (Editor editor : base.getEditors()) {`
`830`	`834`	`editor.applyPreferences();`
`831`	`835`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1609,8 +1609,8 @@ synchronized public boolean updateTable(final TableModel tableModel) {`
`1609`	`1609`	`* at the bottom of the PDE`
`1610`	`1610`	`*/`
`1611`	`1611`	`public void updateErrorToggle(){`
`1612`		`- btnShowErrors.updateMarker(errorCheckerService.hasErrors(),`
`1613`		`- errorBar.errorColor);`
	`1612`	`+ btnShowErrors.updateMarker(ExperimentalMode.errorCheckEnabled`
	`1613`	`+ && errorCheckerService.hasErrors(), errorBar.errorColor);`
`1614`	`1614`	`}`
`1615`	`1615`
`1616`	`1616`	`/**`
`@@ -1649,4 +1649,14 @@ private void checkForJavaTabs() {`
`1649`	`1649`	`}`
`1650`	`1650`	`}`
`1651`	`1651`	`}`
	`1652`	`+`
	`1653`	`+ protected void applyPreferences() {`
	`1654`	`+ super.applyPreferences();`
	`1655`	`+ if (dmode != null) {`
	`1656`	`+ dmode.loadPreferences();`
	`1657`	`+ log("Applying prefs");`
	`1658`	`+ // trigger it once to refresh UI`
	`1659`	`+ errorCheckerService.runManualErrorCheck();`
	`1660`	`+ }`
	`1661`	`+ }`
`1652`	`1662`	`}`