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

more scrubbing

Browse Source
This commit is contained in:
Ben Fry
2015-08-21 13:13:49 -04:00
parent 47d8405809
commit 34a296d05a
4 changed files with 260 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

301
java/src/processing/mode/java/ErrorColumn.java
View File

@@ -1,301 +0,0 @@
/* -*- 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
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.
*/
package processing.mode.java;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import processing.app.Mode;
import processing.app.Sketch;
import processing.app.SketchCode;
import processing.app.Util;
import processing.mode.java.pdex.ErrorCheckerService;
import processing.mode.java.pdex.LineMarker;
import processing.mode.java.pdex.Problem;
import processing.app.Language;
/**
* Implements the column to the right of the editor window that displays ticks
* for errors and warnings.
* <br>
* All errors and warnings of a sketch are drawn on the bar, clicking on one,
* scrolls to the tab and location. Error messages displayed on hover. Markers
* are not in sync with the error line. Similar to eclipse's right error bar
* which displays the overall errors in a document
*/
public class ErrorColumn extends JPanel {
protected JavaEditor editor;
protected ErrorCheckerService errorCheckerService;
static final int WIDE = 12;
// protected int preferredHeight;
// protected int preferredWidth = 12;
// static final int errorMarkerHeight = 4;
private Color errorColor;
private Color warningColor;
private Color backgroundColor;
/** Stores error markers displayed PER TAB along the error bar. */
private List<LineMarker> errorPoints =
Collections.synchronizedList(new ArrayList<LineMarker>());
/** Stores previous list of error markers. */
private List<LineMarker> errorPointsOld = new ArrayList<LineMarker>();
public void paintComponent(Graphics g) {
// Graphics2D g2d = (Graphics2D) g;
// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
// RenderingHints.VALUE_ANTIALIAS_ON);
g.setColor(backgroundColor);
g.fillRect(0, 0, getWidth(), getHeight());
for (LineMarker m : errorPoints) {
if (m.getType() == LineMarker.ERROR) {
g.setColor(errorColor);
} else {
g.setColor(warningColor);
}
//g.fillRect(2, emarker.getY(), (getWidth() - 3), errorMarkerHeight);
g.drawLine(2, m.getY(), getWidth() - 2, m.getY());
}
}
// public Dimension getPreferredSize() {
// return new Dimension(preferredWidth, preferredHeight);
// }
// public Dimension getMinimumSize() {
// return getPreferredSize();
// }
public ErrorColumn(JavaEditor editor, int height) {
this.editor = editor;
// this.preferredHeight = height;
this.errorCheckerService = editor.errorCheckerService;
Mode mode = editor.getMode();
errorColor = mode.getColor("editor.column.error.color");
warningColor = mode.getColor("editor.column.warning.color");
backgroundColor = mode.getColor("editor.gutter.bgcolor");
addListeners();
}
public List<LineMarker> getErrorPoints() {
return errorPoints;
}
synchronized public void updateErrorPoints(final List<Problem> problems) {
// NOTE TO SELF: ErrorMarkers are calculated for the present tab only
// Error Marker index in the arraylist is LOCALIZED for current tab.
// Also, need to do the update in the UI thread via SwingWorker to prevent
// concurrency issues.
final int fheight = this.getHeight();
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
Sketch sketch = editor.getSketch();
SketchCode sc = sketch.getCurrentCode();
int totalLines = 0;
int currentTab = sketch.getCurrentCodeIndex();
try {
Document doc = sc.getDocument();
totalLines = Util.countLines(doc.getText(0, doc.getLength())) + 1;
} catch (BadLocationException e) {
e.printStackTrace();
}
// System.out.println("Total lines: " + totalLines);
// synchronized (errorPoints) {
errorPointsOld = errorPoints;
errorPoints = new ArrayList<>();
// errorPointsOld.clear();
// for (ErrorMarker marker : errorPoints) {
// errorPointsOld.add(marker);
// }
// errorPoints.clear();
// 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) {
// Ratio of error line to total lines
float y = (problem.getLineNumber() + 1) / ((float) totalLines);
// Ratio multiplied by height of the error bar
y *= fheight - 15; // -15 is just a vertical offset
errorPoints.add(new LineMarker(problem, (int) y,
problem.isError() ?
LineMarker.ERROR
: LineMarker.WARNING));
// System.out.println("Y: " + y);
}
}
}
// }
return null;
}
protected void done() {
repaint();
}
};
try {
worker.execute(); // I eat concurrency bugs for breakfast.
} catch (Exception exp) {
System.out.println("Errorbar update markers is slacking."
+ exp.getMessage());
// e.printStackTrace();
}
}
/**
* Check if new errors have popped up in the sketch since the last check
*
* @return true - if errors have changed
*/
public boolean errorPointsChanged() {
if (errorPointsOld.size() != errorPoints.size()) {
editor.getTextArea().repaint();
// System.out.println("2 Repaint " + System.currentTimeMillis());
return true;
}
else {
for (int i = 0; i < errorPoints.size(); i++) {
if (errorPoints.get(i).getY() != errorPointsOld.get(i).getY()) {
editor.getTextArea().repaint();
// System.out.println("3 Repaint " +
// System.currentTimeMillis());
return true;
}
}
}
return false;
}
/**
* Add various mouse listeners.
*/
protected void addListeners() {
addMouseListener(new MouseAdapter() {
// Find out which error/warning the user has clicked
// and then scroll to that
@Override
public void mouseClicked(final MouseEvent e) {
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
for (LineMarker eMarker : errorPoints) {
// -2 and +2 are extra allowance, clicks in the
// vicinity of the markers register that way
if (e.getY() >= eMarker.getY() - 2
&& e.getY() <= eMarker.getY() + 2) {
errorCheckerService.scrollToErrorLine(eMarker.getProblem());
return null;
}
}
return null;
}
};
try {
worker.execute();
} catch (Exception exp) {
System.out.println("Errorbar mouseClicked is slacking."
+ exp.getMessage());
// e.printStackTrace();
}
}
});
// Tooltip on hover
addMouseMotionListener(new MouseMotionAdapter() {
public void mouseMoved(final MouseEvent evt) {
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
for (LineMarker eMarker : errorPoints) {
if (evt.getY() >= eMarker.getY() - 2 &&
evt.getY() <= eMarker.getY() + 2) {
Problem p = eMarker.getProblem();
String msg = ((p.isError()
? Language.text("editor.status.error")
: Language.text("editor.status.warning")) + ": "
+ p.getMessage());
setToolTipText(msg);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
break;
}
}
return null;
}
};
try {
worker.execute();
} catch (Exception exp) {
System.out
.println("Errorbar mousemoved Worker is slacking."
+ exp.getMessage());
// e.printStackTrace();
}
}
});
}
public Dimension getPreferredSize() {
return new Dimension(WIDE, super.getPreferredSize().height);
}
public Dimension getMinimumSize() {
return new Dimension(WIDE, super.getMinimumSize().height);
}
}

4
java/src/processing/mode/java/JavaEditor.java
View File

@@ -83,7 +83,7 @@ public class JavaEditor extends Editor {
protected VariableInspector inspector;
protected JMenuItem inspectorItem;
private ErrorColumn errorColumn;
private MarkerColumn errorColumn;
protected JScrollPane errorTableScrollPane;
protected XQErrorTable errorTable;
@@ -164,7 +164,7 @@ public class JavaEditor extends Editor {
// remove the text area temporarily
box.remove(2);
textAndError.setLayout(new BorderLayout());
errorColumn = new ErrorColumn(this, textarea.getMinimumSize().height);
errorColumn = new MarkerColumn(this, textarea.getMinimumSize().height);
textAndError.add(errorColumn, BorderLayout.EAST);
textarea.setBounds(0, 0, errorColumn.getX() - 1, textarea.getHeight());
textAndError.add(textarea);

256
java/src/processing/mode/java/MarkerColumn.java Normal file
View File

@@ -0,0 +1,256 @@
/* -*- 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
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.
*/
package processing.mode.java;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.swing.JPanel;
import javax.swing.SwingWorker;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import processing.app.Mode;
import processing.app.Sketch;
import processing.app.SketchCode;
import processing.app.Util;
import processing.mode.java.pdex.ErrorCheckerService;
import processing.mode.java.pdex.LineMarker;
import processing.mode.java.pdex.Problem;
import processing.app.Language;
/**
* Implements the column to the right of the editor window that displays ticks
* for errors and warnings.
* <br>
* All errors and warnings of a sketch are drawn on the bar, clicking on one,
* scrolls to the tab and location. Error messages displayed on hover. Markers
* are not in sync with the error line. Similar to Eclipse's right error bar
* which displays the overall errors in a document
*/
public class MarkerColumn extends JPanel {
protected JavaEditor editor;
protected ErrorCheckerService errorCheckerService;
static final int WIDE = 12;
// protected int preferredHeight;
// protected int preferredWidth = 12;
// static final int errorMarkerHeight = 4;
private Color errorColor;
private Color warningColor;
private Color backgroundColor;
/** Stores error markers displayed PER TAB along the error bar. */
private List<LineMarker> errorPoints =
Collections.synchronizedList(new ArrayList<LineMarker>());
// /** Stores previous list of error markers. */
// private List<LineMarker> errorPointsOld = new ArrayList<LineMarker>();
public void paintComponent(Graphics g) {
// Graphics2D g2d = (Graphics2D) g;
// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
// RenderingHints.VALUE_ANTIALIAS_ON);
g.setColor(backgroundColor);
g.fillRect(0, 0, getWidth(), getHeight());
for (LineMarker m : errorPoints) {
if (m.getType() == LineMarker.ERROR) {
g.setColor(errorColor);
} else {
g.setColor(warningColor);
}
//g.fillRect(2, emarker.getY(), (getWidth() - 3), errorMarkerHeight);
g.drawLine(2, m.getY(), getWidth() - 2, m.getY());
}
}
public MarkerColumn(JavaEditor editor, int height) {
this.editor = editor;
this.errorCheckerService = editor.errorCheckerService;
Mode mode = editor.getMode();
errorColor = mode.getColor("editor.column.error.color");
warningColor = mode.getColor("editor.column.warning.color");
backgroundColor = mode.getColor("editor.gutter.bgcolor");
addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
scrollToMarkerAt(e.getY());
}
});
addMouseMotionListener(new MouseMotionAdapter() {
public void mouseMoved(final MouseEvent e) {
showMarkerHover(e.getY());
}
});
}
public List<LineMarker> getErrorPoints() {
return errorPoints;
}
synchronized public void updateErrorPoints(final List<Problem> problems) {
// NOTE TO SELF: ErrorMarkers are calculated for the present tab only
// Error Marker index in the arraylist is LOCALIZED for current tab.
// Also, need to do the update in the UI thread via SwingWorker to prevent
// concurrency issues.
try {
new SwingWorker() {
protected Object doInBackground() throws Exception {
Sketch sketch = editor.getSketch();
SketchCode sc = sketch.getCurrentCode();
int totalLines = 0;
int currentTab = sketch.getCurrentCodeIndex();
try {
Document doc = sc.getDocument();
totalLines = Util.countLines(doc.getText(0, doc.getLength())) + 1;
} catch (BadLocationException e) {
e.printStackTrace();
}
// errorPointsOld = errorPoints;
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) {
// Ratio of error line to total lines
float y = (problem.getLineNumber() + 1) / ((float) totalLines);
// Ratio multiplied by height of the error bar
y *= getHeight() - 15; // -15 is just a vertical offset
errorPoints.add(new LineMarker(problem, (int) y, problem.isError()));
}
}
}
return null;
}
protected void done() {
repaint();
}
}.execute();
} catch (Exception ex) {
ex.printStackTrace();
}
}
/*
// Check if new errors have popped up in the sketch since the last check
public boolean errorPointsChanged() {
if (errorPointsOld.size() != errorPoints.size()) {
editor.getTextArea().repaint();
// System.out.println("2 Repaint " + System.currentTimeMillis());
return true;
}
else {
for (int i = 0; i < errorPoints.size(); i++) {
if (errorPoints.get(i).getY() != errorPointsOld.get(i).getY()) {
editor.getTextArea().repaint();
// System.out.println("3 Repaint " +
// System.currentTimeMillis());
return true;
}
}
}
return false;
}
*/
/** Find out which error/warning the user has clicked and scroll to it */
void scrollToMarkerAt(final int y) {
try {
new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
for (LineMarker m : errorPoints) {
// -2 and +2 are extra allowance, clicks in the
// vicinity of the markers register that way
if (Math.abs(y - m.getY()) < 3) {
errorCheckerService.scrollToErrorLine(m.getProblem());
return null;
}
}
return null;
}
}.execute();
} catch (Exception ex) {
ex.printStackTrace();
}
}
/** Show tooltip on hover. */
void showMarkerHover(final int y) {
try {
new SwingWorker<Object, Object>() {
protected Object doInBackground() throws Exception {
for (LineMarker m : errorPoints) {
if (Math.abs(y - m.getY()) < 3) {
Problem p = m.getProblem();
String msg = ((p.isError()
? Language.text("editor.status.error")
: Language.text("editor.status.warning")) + ": "
+ p.getMessage());
setToolTipText(msg);
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
break;
}
}
return null;
}
}.execute();
} catch (Exception ex) {
ex.printStackTrace();
}
}
public Dimension getPreferredSize() {
return new Dimension(WIDE, super.getPreferredSize().height);
}
public Dimension getMinimumSize() {
return new Dimension(WIDE, super.getMinimumSize().height);
}
}

4
java/src/processing/mode/java/pdex/LineMarker.java
View File

@@ -48,10 +48,10 @@ public class LineMarker {
private Problem problem;
public LineMarker(Problem problem, int y, int type) {
public LineMarker(Problem problem, int y, boolean error) {
this.problem = problem;
this.y = y;
this.type = type;
this.type = error ? ERROR : WARNING;
}