mirror of
https://github.com/processing/processing4.git
synced 2026-02-04 06:09:17 +01:00
more ErrorTable into processing.app.ui
This commit is contained in:
Ben Fry
@@ -14,10 +14,7 @@ import java.util.logging.Logger;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.*;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
import javax.swing.event.MenuEvent;
|
||||
import javax.swing.event.MenuListener;
|
||||
import javax.swing.event.*;
|
||||
import javax.swing.text.BadLocationException;
|
||||
import javax.swing.text.Document;
|
||||
|
||||
@@ -26,23 +23,11 @@ import org.eclipse.jdt.core.compiler.IProblem;
|
||||
import processing.core.PApplet;
|
||||
import processing.data.StringList;
|
||||
import processing.app.*;
|
||||
import processing.app.contrib.AvailableContribution;
|
||||
import processing.app.contrib.Contribution;
|
||||
import processing.app.contrib.ContributionListing;
|
||||
import processing.app.contrib.ContributionManager;
|
||||
import processing.app.contrib.ToolContribution;
|
||||
import processing.app.contrib.*;
|
||||
import processing.app.syntax.JEditTextArea;
|
||||
import processing.app.syntax.PdeTextAreaDefaults;
|
||||
import processing.app.ui.About;
|
||||
import processing.app.ui.ColorChooser;
|
||||
import processing.app.ui.Editor;
|
||||
import processing.app.ui.EditorException;
|
||||
import processing.app.ui.EditorFooter;
|
||||
import processing.app.ui.EditorHeader;
|
||||
import processing.app.ui.EditorState;
|
||||
import processing.app.ui.EditorToolbar;
|
||||
import processing.app.ui.*;
|
||||
import processing.app.ui.Toolkit;
|
||||
import processing.app.ui.Welcome;
|
||||
import processing.mode.java.debug.LineBreakpoint;
|
||||
import processing.mode.java.debug.LineHighlight;
|
||||
import processing.mode.java.debug.LineID;
|
||||
@@ -51,7 +36,6 @@ import processing.mode.java.pdex.LineMarker;
|
||||
import processing.mode.java.pdex.ErrorMessageSimplifier;
|
||||
import processing.mode.java.pdex.JavaTextArea;
|
||||
import processing.mode.java.pdex.Problem;
|
||||
import processing.mode.java.pdex.XQErrorTable;
|
||||
import processing.mode.java.runner.Runner;
|
||||
import processing.mode.java.tweak.ColorControlBox;
|
||||
import processing.mode.java.tweak.Handle;
|
||||
@@ -87,8 +71,6 @@ public class JavaEditor extends Editor {
|
||||
|
||||
private MarkerColumn errorColumn;
|
||||
|
||||
protected JScrollPane errorTableScrollPane;
|
||||
protected XQErrorTable errorTable;
|
||||
static final int ERROR_TAB_INDEX = 0;
|
||||
|
||||
private boolean hasJavaTabs;
|
||||
@@ -212,17 +194,7 @@ public class JavaEditor extends Editor {
|
||||
@Override
|
||||
public EditorFooter createFooter() {
|
||||
EditorFooter footer = super.createFooter();
|
||||
|
||||
// Adding Error Table in a scroll pane
|
||||
errorTableScrollPane = new JScrollPane();
|
||||
errorTable = new XQErrorTable(this);
|
||||
// errorTableScrollPane.setBorder(new EmptyBorder(2, 2, 2, 2));
|
||||
// errorTableScrollPane.setBorder(new EtchedBorder());
|
||||
errorTableScrollPane.setBorder(BorderFactory.createEmptyBorder());
|
||||
// errorTableScrollPane.setBorder(new EmptyBorder(0, Editor.LEFT_GUTTER, 0, 0));
|
||||
errorTableScrollPane.setViewportView(errorTable);
|
||||
footer.addPanel(errorTableScrollPane, Language.text("editor.footer.errors"), "/lib/footer/error");
|
||||
|
||||
addErrorTable();
|
||||
return footer;
|
||||
}
|
||||
|
||||
@@ -2561,11 +2533,6 @@ public class JavaEditor extends Editor {
|
||||
// }
|
||||
|
||||
|
||||
public XQErrorTable getErrorTable() {
|
||||
return errorTable;
|
||||
}
|
||||
|
||||
|
||||
public void errorTableClick(Object item) {
|
||||
Problem p = (Problem) item;
|
||||
errorCheckerService.scrollToErrorLine(p);
|
||||
@@ -2680,7 +2647,7 @@ public class JavaEditor extends Editor {
|
||||
* the error button at the bottom of the PDE
|
||||
*/
|
||||
public void updateErrorToggle() {
|
||||
footer.setNotification(errorTableScrollPane,
|
||||
footer.setNotification(errorTable.getParent(), //errorTableScrollPane,
|
||||
JavaMode.errorCheckEnabled &&
|
||||
errorCheckerService.hasErrors());
|
||||
// String title = Language.text("editor.footer.errors");
|
||||
|
||||
@@ -56,6 +56,7 @@ import processing.app.Util;
|
||||
import processing.app.syntax.SyntaxDocument;
|
||||
import processing.app.ui.Editor;
|
||||
import processing.app.ui.EditorStatus;
|
||||
import processing.app.ui.ErrorTable;
|
||||
import processing.core.PApplet;
|
||||
import processing.mode.java.JavaMode;
|
||||
import processing.mode.java.JavaEditor;
|
||||
@@ -918,8 +919,8 @@ public class ErrorCheckerService implements Runnable {
|
||||
*/
|
||||
public void updateErrorTable() {
|
||||
try {
|
||||
XQErrorTable table = editor.getErrorTable();
|
||||
table.clear();
|
||||
ErrorTable table = editor.getErrorTable();
|
||||
table.clearRows();
|
||||
|
||||
// String[][] errorData = new String[problemsList.size()][3];
|
||||
// int index = 0;
|
||||
@@ -943,7 +944,7 @@ public class ErrorCheckerService implements Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
table.append(p, message,
|
||||
table.addRow(p, message,
|
||||
sketch.getCode(p.getTabIndex()).getPrettyName(),
|
||||
Integer.toString(p.getLineNumber() + 1));
|
||||
// Added +1 because lineNumbers internally are 0-indexed
|
||||
|
||||
@@ -1,309 +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.pdex;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Font;
|
||||
import java.awt.event.MouseAdapter;
|
||||
import java.awt.event.MouseEvent;
|
||||
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.SwingWorker;
|
||||
import javax.swing.ToolTipManager;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
import javax.swing.table.JTableHeader;
|
||||
import javax.swing.table.TableCellRenderer;
|
||||
import javax.swing.table.TableColumnModel;
|
||||
import javax.swing.table.TableModel;
|
||||
|
||||
import processing.app.Language;
|
||||
import processing.app.Messages;
|
||||
import processing.app.Mode;
|
||||
import processing.app.ui.Editor;
|
||||
|
||||
|
||||
public class XQErrorTable extends JTable {
|
||||
Editor editor;
|
||||
|
||||
static final String[] columnNames = {
|
||||
"",
|
||||
Language.text("editor.footer.errors.problem"),
|
||||
Language.text("editor.footer.errors.tab"),
|
||||
Language.text("editor.footer.errors.line")
|
||||
};
|
||||
|
||||
int[] columnWidths = { Editor.LEFT_GUTTER, 400, 100, 50 };
|
||||
|
||||
/** Is the column being resized? */
|
||||
private boolean columnResizing = false;
|
||||
|
||||
Font headerFont;
|
||||
Color headerColor;
|
||||
Color headerBgColor;
|
||||
|
||||
Font rowFont;
|
||||
Color rowColor;
|
||||
Color rowBgColor;
|
||||
|
||||
|
||||
/*
|
||||
class Item {
|
||||
String message;
|
||||
String filename;
|
||||
int line;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
public void clear() {
|
||||
DefaultTableModel dtm = (DefaultTableModel) getModel();
|
||||
dtm.setRowCount(0);
|
||||
}
|
||||
|
||||
|
||||
public void append(Object data, String message, String filename, String line) {
|
||||
DefaultTableModel dtm = (DefaultTableModel) getModel();
|
||||
dtm.addRow(new Object[] { data, message, filename, line });
|
||||
}
|
||||
|
||||
|
||||
public XQErrorTable(final Editor editor) {
|
||||
super(new DefaultTableModel(columnNames, 0));
|
||||
|
||||
this.editor = editor;
|
||||
JTableHeader header = getTableHeader();
|
||||
|
||||
Mode mode = editor.getMode();
|
||||
header.setDefaultRenderer(new GradyHeaderRenderer(mode));
|
||||
setDefaultRenderer(Object.class, new GradyRowRenderer(mode));
|
||||
//setShowGrid(false);
|
||||
setIntercellSpacing(new Dimension(0, 0));
|
||||
|
||||
// this did nothing, no columns existed yet
|
||||
/*
|
||||
TableColumnModel columnModel = getColumnModel();
|
||||
for (int i = 0; i < columnModel.getColumnCount(); i++) {
|
||||
columnModel.getColumn(i).setPreferredWidth(columnWidths[i]);
|
||||
//System.out.println("class is " + columnModel.getColumn(i).getClass());
|
||||
}
|
||||
*/
|
||||
// DefaultTableModel tm = new DefaultTableModel(columnNames, 0);
|
||||
|
||||
addMouseListener(new MouseAdapter() {
|
||||
@Override
|
||||
synchronized public void mouseClicked(MouseEvent e) {
|
||||
try {
|
||||
int row = ((XQErrorTable) e.getSource()).getSelectedRow();
|
||||
Object data = getModel().getValueAt(row, 0);
|
||||
int clickCount = e.getClickCount();
|
||||
if (clickCount == 1) {
|
||||
editor.errorTableClick(data);
|
||||
} else if (clickCount > 1) {
|
||||
editor.errorTableDoubleClick(data);
|
||||
}
|
||||
// editor.getErrorChecker().scrollToErrorLine(row);
|
||||
} catch (Exception e1) {
|
||||
Messages.log("Exception XQErrorTable mouseReleased " + e);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
/*
|
||||
addMouseMotionListener(new MouseMotionAdapter() {
|
||||
@Override
|
||||
public void mouseMoved(MouseEvent evt) {
|
||||
int rowIndex = rowAtPoint(evt.getPoint());
|
||||
|
||||
List<Problem> problemsList = editor.getErrorChecker().problemsList;
|
||||
synchronized (problemsList) {
|
||||
if (rowIndex < problemsList.size()) {
|
||||
|
||||
Problem p = problemsList.get(rowIndex);
|
||||
if (p.getImportSuggestions() != null
|
||||
&& p.getImportSuggestions().length > 0) {
|
||||
String t = p.getMessage() + "(Import Suggestions available)";
|
||||
FontMetrics fm = getFontMetrics(getFont());
|
||||
int x1 = fm.stringWidth(p.getMessage());
|
||||
int x2 = fm.stringWidth(t);
|
||||
if (evt.getX() > x1 && evt.getX() < x2) {
|
||||
String[] list = p.getImportSuggestions();
|
||||
String className = list[0].substring(list[0].lastIndexOf('.') + 1);
|
||||
String[] temp = new String[list.length];
|
||||
for (int i = 0; i < list.length; i++) {
|
||||
temp[i] = "<html>Import '" + className + "' <font color=#777777>(" + list[i] + ")</font></html>";
|
||||
}
|
||||
showImportSuggestion(temp, evt.getXOnScreen(), evt.getYOnScreen() - 3 * getFont().getSize());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
*/
|
||||
|
||||
header.setReorderingAllowed(false);
|
||||
|
||||
// Handles the resizing of columns. When mouse press is detected on
|
||||
// table header, Stop updating the table, store new values of column
|
||||
// widths, and resume updating. Updating is disabled as long as
|
||||
// columnResizing is true
|
||||
header.addMouseListener(new MouseAdapter() {
|
||||
|
||||
@Override
|
||||
public void mousePressed(MouseEvent e) {
|
||||
columnResizing = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mouseReleased(MouseEvent e) {
|
||||
columnResizing = false;
|
||||
TableColumnModel columnModel =
|
||||
((JTableHeader) e.getSource()).getColumnModel();
|
||||
for (int i = 0; i < columnModel.getColumnCount(); i++) {
|
||||
columnWidths[i] = columnModel.getColumn(i).getWidth();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
ToolTipManager.sharedInstance().registerComponent(this);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isCellEditable(int rowIndex, int colIndex) {
|
||||
return false; // Disallow the editing of any cell
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Updates table contents with new data
|
||||
* @return boolean - If table data was updated
|
||||
*/
|
||||
synchronized public boolean updateTable(final TableModel tableModel) {
|
||||
if (!isVisible()) return false;
|
||||
|
||||
SwingWorker<Object, Object> worker = new SwingWorker<Object, Object>() {
|
||||
|
||||
protected Object doInBackground() throws Exception {
|
||||
return null;
|
||||
}
|
||||
|
||||
protected void done() {
|
||||
try {
|
||||
setModel(tableModel);
|
||||
|
||||
// Set column widths to user defined widths
|
||||
for (int i = 0; i < getColumnModel().getColumnCount(); i++) {
|
||||
getColumnModel().getColumn(i).setPreferredWidth(columnWidths[i]);
|
||||
}
|
||||
getTableHeader().setReorderingAllowed(false);
|
||||
validate();
|
||||
repaint();
|
||||
} catch (Exception e) {
|
||||
System.out.println("Exception at XQErrorTable.updateTable " + e);
|
||||
// e.printStackTrace();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
if (!columnResizing) {
|
||||
worker.execute();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.out.println("ErrorTable updateTable Worker's slacking."
|
||||
+ e.getMessage());
|
||||
// e.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
|
||||
|
||||
|
||||
static class GradyHeaderRenderer extends JLabel implements TableCellRenderer {
|
||||
|
||||
public GradyHeaderRenderer(Mode mode) {
|
||||
setFont(mode.getFont("errors.header.font"));
|
||||
setAlignmentX(LEFT_ALIGNMENT);
|
||||
|
||||
setForeground(mode.getColor("errors.header.fgcolor"));
|
||||
setBackground(mode.getColor("errors.header.bgcolor"));
|
||||
setOpaque(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Component getTableCellRendererComponent(JTable table, Object value,
|
||||
boolean selected,
|
||||
boolean focused,
|
||||
int row, int column) {
|
||||
setText(value == null ? "" : value.toString());
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
|
||||
|
||||
|
||||
static class GradyRowRenderer extends JLabel implements TableCellRenderer {
|
||||
Color textColor;
|
||||
Color bgColor;
|
||||
Color textColorSelected;
|
||||
Color bgColorSelected;
|
||||
|
||||
public GradyRowRenderer(Mode mode) {
|
||||
setFont(mode.getFont("errors.row.font"));
|
||||
setAlignmentX(LEFT_ALIGNMENT);
|
||||
|
||||
textColor = mode.getColor("errors.row.fgcolor");
|
||||
bgColor = mode.getColor("errors.row.bgcolor");
|
||||
textColorSelected = mode.getColor("errors.selection.fgcolor");
|
||||
bgColorSelected = mode.getColor("errors.selection.bgcolor");
|
||||
setOpaque(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Component getTableCellRendererComponent(JTable table, Object value,
|
||||
boolean selected,
|
||||
boolean focused,
|
||||
int row, int column) {
|
||||
setBackground(Color.RED);
|
||||
if (selected) {
|
||||
setForeground(textColorSelected);
|
||||
setBackground(bgColorSelected);
|
||||
} else {
|
||||
setForeground(textColor);
|
||||
setBackground(bgColor);
|
||||
}
|
||||
if (column == 0 || value == null) {
|
||||
setText("");
|
||||
} else {
|
||||
setText(value.toString());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user