eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-29 11:21:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4325 from qiubit/bugfix-errorPoints-v2

Browse Source 
Move updateErrorPoints background work to UI thread
This commit is contained in:
Ben Fry
2016-03-06 13:49:26 -05:00
parent d4d86d4ac1 749a4f287a
commit c8fc1fb72f
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
java/src/processing/mode/java/MarkerColumn.java
View File

@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
import javax.swing.text.BadLocationException;
import processing.app.Mode;
@@ -63,8 +62,7 @@ public class MarkerColumn extends JPanel {
private Color warningColor;
// Stores error markers displayed PER TAB along the error bar.
private List<LineMarker> errorPoints =
Collections.synchronizedList(new ArrayList<LineMarker>());
private List<LineMarker> errorPoints = new ArrayList<LineMarker>();
public MarkerColumn(JavaEditor editor, int height) {
@@ -115,40 +113,21 @@ public class MarkerColumn extends JPanel {
}
synchronized public void updateErrorPoints(final List<Problem> problems) {
// NOTE: ErrorMarkers are calculated for the present tab only Error Marker
// index in the arraylist is LOCALIZED for current tab. Also, update is in
// the UI thread via SwingWorker to prevent concurrency issues. [Manindra]
try {
new SwingWorker() {
protected Object doInBackground() throws Exception {
Sketch sketch = editor.getSketch();
int currentTab = sketch.getCurrentCodeIndex();
errorPoints = new ArrayList<>();
// Each problem.getSourceLine() will have an extra line added because
// of class declaration in the beginning as well as default imports
synchronized (problems) {
for (Problem problem : problems) {
if (problem.getTabIndex() == currentTab) {
errorPoints.add(new LineMarker(problem, problem.isError()));
}
}
}
recalculateMarkerPositions();
return null;
}
protected void done() {
repaint();
editor.getErrorChecker().updateEditorStatus();
}
}.execute();
} catch (Exception ex) {
ex.printStackTrace();
}
public void updateErrorPoints(final List<Problem> problems) {
// NOTE: ErrorMarkers are calculated for the present tab only Error Marker
// index in the arraylist is LOCALIZED for current tab.
Sketch sketch = editor.getSketch();
int currentTab = sketch.getCurrentCodeIndex();
errorPoints.clear();
// Each problem.getSourceLine() will have an extra line added because
// of class declaration in the beginning as well as default imports
for (Problem problem : problems) {
if (problem.getTabIndex() == currentTab) {
errorPoints.add(new LineMarker(problem, problem.isError()));
}
}
repaint();
editor.getErrorChecker().updateEditorStatus();
}