mirror of
https://github.com/arduino/Arduino.git
synced 2024-11-29 10:24:12 +01:00
Code cleanup
This commit is contained in:
Federico Fissore
parent
43743bb1a3
commit
fc8d903c7d
@ -22,47 +22,60 @@
|
||||
|
||||
package processing.app;
|
||||
|
||||
import cc.arduino.packages.BoardPort;
|
||||
import cc.arduino.packages.MonitorFactory;
|
||||
|
||||
import cc.arduino.packages.Uploader;
|
||||
import cc.arduino.packages.uploaders.SerialUploader;
|
||||
import cc.arduino.view.StubMenuListener;
|
||||
import cc.arduino.view.findreplace.FindReplace;
|
||||
import com.google.common.base.Predicate;
|
||||
import com.jcraft.jsch.JSchException;
|
||||
import jssc.SerialPortException;
|
||||
import processing.app.debug.*;
|
||||
import processing.app.forms.PasswordAuthorizationDialog;
|
||||
import processing.app.helpers.OSUtils;
|
||||
import processing.app.helpers.PreferencesMapException;
|
||||
import processing.app.legacy.PApplet;
|
||||
import processing.app.syntax.*;
|
||||
import processing.app.tools.*;
|
||||
import static processing.app.I18n._;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.datatransfer.*;
|
||||
import java.awt.event.*;
|
||||
import java.awt.print.*;
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.zip.*;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.MatteBorder;
|
||||
import javax.swing.event.*;
|
||||
import javax.swing.text.*;
|
||||
import javax.swing.undo.*;
|
||||
|
||||
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
|
||||
import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
|
||||
import org.fife.ui.rsyntaxtextarea.RSyntaxUtilities;
|
||||
import org.fife.ui.rtextarea.Gutter;
|
||||
import org.fife.ui.rtextarea.RTextScrollPane;
|
||||
import processing.app.debug.RunnerException;
|
||||
import processing.app.debug.RunnerListener;
|
||||
import processing.app.forms.PasswordAuthorizationDialog;
|
||||
import processing.app.helpers.OSUtils;
|
||||
import processing.app.helpers.PreferencesMapException;
|
||||
import processing.app.legacy.PApplet;
|
||||
import processing.app.syntax.ArduinoTokenMakerFactory;
|
||||
import processing.app.syntax.SketchTextArea;
|
||||
import processing.app.tools.DiscourseFormat;
|
||||
import processing.app.tools.MenuScroller;
|
||||
import processing.app.tools.Tool;
|
||||
|
||||
import cc.arduino.packages.BoardPort;
|
||||
import cc.arduino.packages.Uploader;
|
||||
import cc.arduino.packages.uploaders.SerialUploader;
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.MatteBorder;
|
||||
import javax.swing.event.*;
|
||||
import javax.swing.text.BadLocationException;
|
||||
import javax.swing.text.PlainDocument;
|
||||
import javax.swing.undo.CannotRedoException;
|
||||
import javax.swing.undo.CannotUndoException;
|
||||
import javax.swing.undo.UndoManager;
|
||||
import java.awt.*;
|
||||
import java.awt.datatransfer.DataFlavor;
|
||||
import java.awt.datatransfer.Transferable;
|
||||
import java.awt.event.*;
|
||||
import java.awt.print.PageFormat;
|
||||
import java.awt.print.PrinterException;
|
||||
import java.awt.print.PrinterJob;
|
||||
import java.io.File;
|
||||
import java.io.FileFilter;
|
||||
import java.io.FilenameFilter;
|
||||
import java.io.IOException;
|
||||
import java.net.ConnectException;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipFile;
|
||||
|
||||
import static processing.app.I18n._;
|
||||
|
||||
/**
|
||||
* Main editor panel for the Processing Development Environment.
|
||||
@ -1937,7 +1950,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
if (shouldSavePredicate.apply(sketch)) {
|
||||
handleSave(true);
|
||||
}
|
||||
toolbar.activate(EditorToolbar.RUN);
|
||||
toolbar.activateRun();
|
||||
status.progress(_("Compiling sketch..."));
|
||||
|
||||
// do this to advance/clear the terminal window / dos prompt / etc
|
||||
@ -1988,7 +2001,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
}
|
||||
|
||||
status.unprogress();
|
||||
toolbar.deactivate(EditorToolbar.RUN);
|
||||
toolbar.deactivateRun();
|
||||
}
|
||||
}
|
||||
|
||||
@ -2008,7 +2021,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
|
||||
internalCloseRunner();
|
||||
|
||||
toolbar.deactivate(EditorToolbar.RUN);
|
||||
toolbar.deactivateRun();
|
||||
// toolbar.deactivate(EditorToolbar.STOP);
|
||||
|
||||
// focus the PDE again after quitting presentation mode [toxi 030903]
|
||||
@ -2272,7 +2285,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
|
||||
|
||||
private boolean handleSave2() {
|
||||
toolbar.activate(EditorToolbar.SAVE);
|
||||
toolbar.activateSave();
|
||||
statusNotice(_("Saving..."));
|
||||
boolean saved = false;
|
||||
try {
|
||||
@ -2306,7 +2319,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
// this is used when another operation calls a save
|
||||
}
|
||||
//toolbar.clear();
|
||||
toolbar.deactivate(EditorToolbar.SAVE);
|
||||
toolbar.deactivateSave();
|
||||
return saved;
|
||||
}
|
||||
|
||||
@ -2315,7 +2328,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
//stopRunner(); // formerly from 0135
|
||||
handleStop();
|
||||
|
||||
toolbar.activate(EditorToolbar.SAVE);
|
||||
toolbar.activateSave();
|
||||
|
||||
//SwingUtilities.invokeLater(new Runnable() {
|
||||
//public void run() {
|
||||
@ -2339,7 +2352,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
|
||||
} finally {
|
||||
// make sure the toolbar button deactivates
|
||||
toolbar.deactivate(EditorToolbar.SAVE);
|
||||
toolbar.deactivateSave();
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -2393,7 +2406,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
handleSave(true);
|
||||
}
|
||||
}
|
||||
toolbar.activate(EditorToolbar.EXPORT);
|
||||
toolbar.activateExport();
|
||||
console.clear();
|
||||
status.progress(_("Uploading to I/O Board..."));
|
||||
|
||||
@ -2440,7 +2453,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
status.unprogress();
|
||||
uploading = false;
|
||||
//toolbar.clear();
|
||||
toolbar.deactivate(EditorToolbar.EXPORT);
|
||||
toolbar.deactivateExport();
|
||||
|
||||
resumeOrCloseSerialMonitor();
|
||||
resumeOrCloseSerialPlotter();
|
||||
@ -2535,7 +2548,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
status.unprogress();
|
||||
uploading = false;
|
||||
//toolbar.clear();
|
||||
toolbar.deactivate(EditorToolbar.EXPORT);
|
||||
toolbar.deactivateExport();
|
||||
|
||||
resumeOrCloseSerialMonitor();
|
||||
resumeOrCloseSerialPlotter();
|
||||
@ -2815,7 +2828,7 @@ public class Editor extends JFrame implements RunnerListener {
|
||||
System.err.println(what);
|
||||
status.error(what);
|
||||
//new Exception("deactivating RUN").printStackTrace();
|
||||
toolbar.deactivate(EditorToolbar.RUN);
|
||||
toolbar.deactivateRun();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -38,65 +38,80 @@ import static processing.app.I18n._;
|
||||
*/
|
||||
public class EditorToolbar extends JComponent implements MouseInputListener, KeyListener {
|
||||
|
||||
/** Rollover titles for each button. */
|
||||
static final String title[] = {
|
||||
/**
|
||||
* Rollover titles for each button.
|
||||
*/
|
||||
private static final String[] title = {
|
||||
_("Verify"), _("Upload"), _("New"), _("Open"), _("Save"), _("Serial Monitor")
|
||||
};
|
||||
|
||||
/** Titles for each button when the shift key is pressed. */
|
||||
static final String titleShift[] = {
|
||||
/**
|
||||
* Titles for each button when the shift key is pressed.
|
||||
*/
|
||||
private static final String[] titleShift = {
|
||||
_("Verify"), _("Upload Using Programmer"), _("New"), _("Open"), _("Save As..."), _("Serial Monitor")
|
||||
};
|
||||
|
||||
static final int BUTTON_COUNT = title.length;
|
||||
/** Width of each toolbar button. */
|
||||
static final int BUTTON_WIDTH = 27;
|
||||
/** Height of each toolbar button. */
|
||||
static final int BUTTON_HEIGHT = 32;
|
||||
/** The amount of space between groups of buttons on the toolbar. */
|
||||
static final int BUTTON_GAP = 5;
|
||||
/** Size of the button image being chopped up. */
|
||||
static final int BUTTON_IMAGE_SIZE = 33;
|
||||
private static final int BUTTON_COUNT = title.length;
|
||||
/**
|
||||
* Width of each toolbar button.
|
||||
*/
|
||||
private static final int BUTTON_WIDTH = 27;
|
||||
/**
|
||||
* Height of each toolbar button.
|
||||
*/
|
||||
private static final int BUTTON_HEIGHT = 32;
|
||||
/**
|
||||
* The amount of space between groups of buttons on the toolbar.
|
||||
*/
|
||||
private static final int BUTTON_GAP = 5;
|
||||
/**
|
||||
* Size of the button image being chopped up.
|
||||
*/
|
||||
private static final int BUTTON_IMAGE_SIZE = 33;
|
||||
|
||||
|
||||
static final int RUN = 0;
|
||||
static final int EXPORT = 1;
|
||||
private static final int RUN = 0;
|
||||
private static final int EXPORT = 1;
|
||||
|
||||
static final int NEW = 2;
|
||||
static final int OPEN = 3;
|
||||
static final int SAVE = 4;
|
||||
private static final int NEW = 2;
|
||||
private static final int OPEN = 3;
|
||||
private static final int SAVE = 4;
|
||||
|
||||
static final int SERIAL = 5;
|
||||
private static final int SERIAL = 5;
|
||||
|
||||
static final int INACTIVE = 0;
|
||||
static final int ROLLOVER = 1;
|
||||
static final int ACTIVE = 2;
|
||||
private static final int INACTIVE = 0;
|
||||
private static final int ROLLOVER = 1;
|
||||
private static final int ACTIVE = 2;
|
||||
|
||||
Editor editor;
|
||||
private final Editor editor;
|
||||
|
||||
Image offscreen;
|
||||
int width, height;
|
||||
private Image offscreen;
|
||||
private int width;
|
||||
private int height;
|
||||
|
||||
Color bgcolor;
|
||||
private final Color bgcolor;
|
||||
|
||||
static Image[][] buttonImages;
|
||||
int currentRollover;
|
||||
private static Image[][] buttonImages;
|
||||
private int currentRollover;
|
||||
|
||||
JPopupMenu popup;
|
||||
JMenu menu;
|
||||
private JPopupMenu popup;
|
||||
private final JMenu menu;
|
||||
|
||||
int buttonCount;
|
||||
int[] state = new int[BUTTON_COUNT];
|
||||
Image[] stateImage;
|
||||
int which[]; // mapping indices to implementation
|
||||
private int buttonCount;
|
||||
private int[] state = new int[BUTTON_COUNT];
|
||||
private Image[] stateImage;
|
||||
private final int[] which; // mapping indices to implementation
|
||||
|
||||
int x1[], x2[];
|
||||
int y1, y2;
|
||||
private int[] x1;
|
||||
private int[] x2;
|
||||
private int y1;
|
||||
private int y2;
|
||||
|
||||
Font statusFont;
|
||||
Color statusColor;
|
||||
private final Font statusFont;
|
||||
private final Color statusColor;
|
||||
|
||||
boolean shiftPressed;
|
||||
private boolean shiftPressed;
|
||||
|
||||
public EditorToolbar(Editor editor, JMenu menu) {
|
||||
this.editor = editor;
|
||||
@ -123,17 +138,17 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
addMouseMotionListener(this);
|
||||
}
|
||||
|
||||
protected void loadButtons() {
|
||||
private void loadButtons() {
|
||||
Image allButtons = Base.getThemeImage("buttons.gif", this);
|
||||
buttonImages = new Image[BUTTON_COUNT][3];
|
||||
|
||||
for (int i = 0; i < BUTTON_COUNT; i++) {
|
||||
for (int i = 0; i < BUTTON_COUNT; i++) {
|
||||
for (int state = 0; state < 3; state++) {
|
||||
Image image = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
|
||||
Graphics g = image.getGraphics();
|
||||
g.drawImage(allButtons,
|
||||
-(i*BUTTON_IMAGE_SIZE) - 3,
|
||||
(-2 + state)*BUTTON_IMAGE_SIZE, null);
|
||||
-(i * BUTTON_IMAGE_SIZE) - 3,
|
||||
(-2 + state) * BUTTON_IMAGE_SIZE, null);
|
||||
buttonImages[i][state] = image;
|
||||
}
|
||||
}
|
||||
@ -161,7 +176,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
|
||||
Dimension size = getSize();
|
||||
if ((offscreen == null) ||
|
||||
(size.width != width) || (size.height != height)) {
|
||||
(size.width != width) || (size.height != height)) {
|
||||
offscreen = createImage(size.width, size.height);
|
||||
width = size.width;
|
||||
height = size.height;
|
||||
@ -204,7 +219,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
int statusY = (BUTTON_HEIGHT + g.getFontMetrics().getAscent()) / 2;
|
||||
String status = shiftPressed ? titleShift[currentRollover] : title[currentRollover];
|
||||
if (currentRollover != SERIAL)
|
||||
g.drawString(status, (buttonCount-1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
|
||||
g.drawString(status, (buttonCount - 1) * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
|
||||
else {
|
||||
int statusX = x1[SERIAL] - BUTTON_GAP;
|
||||
statusX -= g.getFontMetrics().stringWidth(status);
|
||||
@ -215,9 +230,9 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
screen.drawImage(offscreen, 0, 0, null);
|
||||
|
||||
if (!isEnabled()) {
|
||||
screen.setColor(new Color(0,0,0,100));
|
||||
screen.setColor(new Color(0, 0, 0, 100));
|
||||
screen.fillRect(0, 0, getWidth(), getHeight());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -236,16 +251,17 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
}
|
||||
|
||||
|
||||
public void mouseDragged(MouseEvent e) { }
|
||||
public void mouseDragged(MouseEvent e) {
|
||||
}
|
||||
|
||||
|
||||
public void handleMouse(MouseEvent e) {
|
||||
private void handleMouse(MouseEvent e) {
|
||||
int x = e.getX();
|
||||
int y = e.getY();
|
||||
|
||||
if (currentRollover != -1) {
|
||||
if ((x > x1[currentRollover]) && (y > y1) &&
|
||||
(x < x2[currentRollover]) && (y < y2)) {
|
||||
(x < x2[currentRollover]) && (y < y2)) {
|
||||
return;
|
||||
|
||||
} else {
|
||||
@ -270,7 +286,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
|
||||
for (int i = 0; i < buttonCount; i++) {
|
||||
if ((y > y1) && (x > x1[i]) &&
|
||||
(y < y2) && (x < x2[i])) {
|
||||
(y < y2) && (x < x2[i])) {
|
||||
//System.out.println("sel is " + i);
|
||||
return i;
|
||||
}
|
||||
@ -304,8 +320,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
handleMouse(e);
|
||||
}
|
||||
|
||||
int wasDown = -1;
|
||||
|
||||
|
||||
public void mousePressed(MouseEvent e) {
|
||||
|
||||
@ -322,71 +336,95 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
currentRollover = -1;
|
||||
|
||||
switch (sel) {
|
||||
case RUN:
|
||||
editor.handleRun(false, editor.presentHandler, editor.runHandler);
|
||||
break;
|
||||
case RUN:
|
||||
editor.handleRun(false, editor.presentHandler, editor.runHandler);
|
||||
break;
|
||||
|
||||
// case STOP:
|
||||
// editor.handleStop();
|
||||
// break;
|
||||
//
|
||||
case OPEN:
|
||||
popup = menu.getPopupMenu();
|
||||
popup.show(EditorToolbar.this, x, y);
|
||||
break;
|
||||
case OPEN:
|
||||
popup = menu.getPopupMenu();
|
||||
popup.show(EditorToolbar.this, x, y);
|
||||
break;
|
||||
|
||||
case NEW:
|
||||
try {
|
||||
editor.base.handleNew();
|
||||
} catch (Exception e1) {
|
||||
throw new RuntimeException(e1);
|
||||
}
|
||||
break;
|
||||
case NEW:
|
||||
try {
|
||||
editor.base.handleNew();
|
||||
} catch (Exception e1) {
|
||||
throw new RuntimeException(e1);
|
||||
}
|
||||
break;
|
||||
|
||||
case SAVE:
|
||||
if (e.isShiftDown()) {
|
||||
editor.handleSaveAs();
|
||||
} else {
|
||||
editor.handleSave(false);
|
||||
}
|
||||
break;
|
||||
case SAVE:
|
||||
if (e.isShiftDown()) {
|
||||
editor.handleSaveAs();
|
||||
} else {
|
||||
editor.handleSave(false);
|
||||
}
|
||||
break;
|
||||
|
||||
case EXPORT:
|
||||
editor.handleExport(e.isShiftDown());
|
||||
break;
|
||||
case EXPORT:
|
||||
editor.handleExport(e.isShiftDown());
|
||||
break;
|
||||
|
||||
case SERIAL:
|
||||
editor.handleSerial();
|
||||
break;
|
||||
case SERIAL:
|
||||
editor.handleSerial();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void mouseClicked(MouseEvent e) { }
|
||||
|
||||
|
||||
public void mouseReleased(MouseEvent e) { }
|
||||
|
||||
|
||||
/**
|
||||
* Set a particular button to be active.
|
||||
*/
|
||||
public void activate(int what) {
|
||||
if (buttonImages != null) {
|
||||
setState(what, ACTIVE, true);
|
||||
public void mouseClicked(MouseEvent e) {
|
||||
}
|
||||
|
||||
|
||||
public void mouseReleased(MouseEvent e) {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set a particular button to be active.
|
||||
*/
|
||||
public void deactivate(int what) {
|
||||
private void activate(int what) {
|
||||
if (buttonImages != null) {
|
||||
setState(what, INACTIVE, true);
|
||||
}
|
||||
setState(what, ACTIVE, true);
|
||||
}
|
||||
}
|
||||
|
||||
public void activateRun() {
|
||||
activate(RUN);
|
||||
}
|
||||
|
||||
public void activateSave() {
|
||||
activate(SAVE);
|
||||
}
|
||||
|
||||
public void activateExport() {
|
||||
activate(EXPORT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set a particular button to be active.
|
||||
*/
|
||||
private void deactivate(int what) {
|
||||
if (buttonImages != null) {
|
||||
setState(what, INACTIVE, true);
|
||||
}
|
||||
}
|
||||
|
||||
public void deactivateRun() {
|
||||
deactivate(RUN);
|
||||
}
|
||||
|
||||
public void deactivateSave() {
|
||||
deactivate(SAVE);
|
||||
}
|
||||
|
||||
public void deactivateExport() {
|
||||
deactivate(EXPORT);
|
||||
}
|
||||
|
||||
public Dimension getPreferredSize() {
|
||||
return getMinimumSize();
|
||||
@ -394,7 +432,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
|
||||
|
||||
public Dimension getMinimumSize() {
|
||||
return new Dimension((BUTTON_COUNT + 1)*BUTTON_WIDTH, BUTTON_HEIGHT);
|
||||
return new Dimension((BUTTON_COUNT + 1) * BUTTON_WIDTH, BUTTON_HEIGHT);
|
||||
}
|
||||
|
||||
|
||||
@ -407,7 +445,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
if (e.getKeyCode() == KeyEvent.VK_SHIFT) {
|
||||
shiftPressed = true;
|
||||
repaint();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -419,5 +457,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
|
||||
}
|
||||
|
||||
|
||||
public void keyTyped(KeyEvent e) { }
|
||||
public void keyTyped(KeyEvent e) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user