diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index c922a9c55..6960e229e 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -1040,7 +1040,6 @@ public class Editor extends JFrame implements RunnerListener { textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias")); textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand")); textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size")); - textArea.setEditorListener(new EditorListener(this)); textArea.addHyperlinkListener(new HyperlinkListener() { @Override public void hyperlinkUpdate(HyperlinkEvent hyperlinkEvent) { diff --git a/app/src/processing/app/EditorListener.java b/app/src/processing/app/EditorListener.java deleted file mode 100644 index f9fa0d5ac..000000000 --- a/app/src/processing/app/EditorListener.java +++ /dev/null @@ -1,37 +0,0 @@ -package processing.app; - -import java.awt.Toolkit; -import java.awt.event.InputEvent; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; - -import processing.app.syntax.SketchTextArea; - -public class EditorListener implements KeyListener { - - private Editor editor; - - public EditorListener(Editor editor) { - super(); - this.editor = editor; - } - - /** ctrl-alt on windows and linux, cmd-alt on mac os x */ - private static final int CTRL = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - private static final int CTRL_ALT = InputEvent.ALT_MASK | CTRL; - private static final int CTRL_SHIFT = InputEvent.SHIFT_MASK | CTRL; - - public void keyTyped(KeyEvent event) { - } - - @Override - public void keyPressed(KeyEvent event) { - } - - @Override - public void keyReleased(KeyEvent e) { - // TODO Auto-generated method stub - - } - -} diff --git a/app/src/processing/app/syntax/SketchTextArea.java b/app/src/processing/app/syntax/SketchTextArea.java index 58e0bb4e6..ac50a2dc2 100644 --- a/app/src/processing/app/syntax/SketchTextArea.java +++ b/app/src/processing/app/syntax/SketchTextArea.java @@ -38,7 +38,6 @@ import org.fife.ui.rtextarea.RTextAreaUI; import org.fife.ui.rtextarea.RUndoManager; import processing.app.Base; import processing.app.BaseNoGui; -import processing.app.EditorListener; import processing.app.PreferencesData; import javax.swing.event.EventListenerList; @@ -49,7 +48,6 @@ import javax.swing.text.Document; import javax.swing.text.Segment; import javax.swing.undo.UndoManager; import java.awt.*; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.io.File; import java.io.FileInputStream; @@ -69,8 +67,6 @@ public class SketchTextArea extends RSyntaxTextArea { private final static Logger LOG = Logger.getLogger(SketchTextArea.class.getName()); - private EditorListener editorListener; - private PdeKeywords pdeKeywords; public SketchTextArea(PdeKeywords pdeKeywords) throws IOException { @@ -152,27 +148,6 @@ public class SketchTextArea extends RSyntaxTextArea { return this.getSelectedText() != null; } - public void processKeyEvent(KeyEvent evt) { - - // this had to be added because the menu key events weren't making it up to the frame. - - switch (evt.getID()) { - case KeyEvent.KEY_TYPED: - if (editorListener != null) editorListener.keyTyped(evt); - break; - case KeyEvent.KEY_PRESSED: - if (editorListener != null) editorListener.keyPressed(evt); - break; - case KeyEvent.KEY_RELEASED: - // inputHandler.keyReleased(evt); - break; - } - - if (!evt.isConsumed()) { - super.processKeyEvent(evt); - } - } - public void switchDocument(Document document, UndoManager newUndo) { // HACK: Dont discard changes on curret UndoManager. @@ -206,11 +181,6 @@ public class SketchTextArea extends RSyntaxTextArea { } } - - public void setEditorListener(EditorListener editorListener) { - this.editorListener = editorListener; - } - private static class DocLinkGenerator implements LinkGenerator { private final PdeKeywords pdeKeywords;