From 719a4457ce90dd5b83a5f4ba2c6da2709f6fddc4 Mon Sep 17 00:00:00 2001 From: Jakub Valtar Date: Fri, 11 Mar 2016 00:18:39 +0100 Subject: [PATCH] Remove useless SwingWorkers -listeners already run on EDT --- .../mode/java/pdex/ASTGenerator.java | 165 ++++++------------ .../mode/java/pdex/SketchOutline.java | 33 ++-- .../processing/mode/java/pdex/TabOutline.java | 26 +-- 3 files changed, 74 insertions(+), 150 deletions(-) diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java index 02995ae13..5c6d7f3c2 100644 --- a/java/src/processing/mode/java/pdex/ASTGenerator.java +++ b/java/src/processing/mode/java/pdex/ASTGenerator.java @@ -59,7 +59,6 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.ListSelectionModel; -import javax.swing.SwingWorker; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.text.BadLocationException; @@ -233,19 +232,12 @@ public class ASTGenerator { Messages.loge("No CU found!"); } visitRecur((ASTNode) compilationUnit.types().get(0), codeTree); - SwingWorker worker = new SwingWorker() { - - @Override - protected Object doInBackground() throws Exception { - return null; - } - - @Override - protected void done() { + EventQueue.invokeLater(new Runnable() { + public void run() { if (codeTree != null) { - if(SHOW_AST){ - if (jtree.hasFocus() || frmASTView.hasFocus()) - return; + if (SHOW_AST) { + if (jtree.hasFocus() || frmASTView.hasFocus()) + return; jtree.setModel(new DefaultTreeModel(codeTree)); ((DefaultTreeModel) jtree.getModel()).reload(); jtree.validate(); @@ -271,8 +263,7 @@ public class ASTGenerator { // } } } - }; - worker.execute(); + }); // Base.loge("++>" + System.getProperty("java.class.path")); // log(System.getProperty("java.class.path")); // log("-------------------------------"); @@ -1869,79 +1860,55 @@ public class ASTGenerator { public void valueChanged(TreeSelectionEvent e) { Messages.log(e.toString()); - // TODO: this should already run on EDT so why the SwingWorker? - SwingWorker worker = new SwingWorker() { + if(jtree.getLastSelectedPathComponent() == null) { + return; + } + DefaultMutableTreeNode tnode = + (DefaultMutableTreeNode) jtree.getLastSelectedPathComponent(); + if (tnode.getUserObject() instanceof ASTNodeWrapper) { + ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); + awrap.highlightNode(editor); + // errorCheckerService.highlightNode(awrap); - @Override - protected Object doInBackground() throws Exception { - return null; - } - - @Override - protected void done() { - if(jtree - .getLastSelectedPathComponent() == null){ + //-- + try { + int javaLineNumber = getLineNumber(awrap.getNode()); + int pdeOffs[] = errorCheckerService + .calculateTabIndexAndLineNumber(javaLineNumber); + PlainDocument javaSource = new PlainDocument(); + javaSource.insertString(0, errorCheckerService.lastCodeCheckResult.sourceCode, null); + Element lineElement = javaSource.getDefaultRootElement() + .getElement(javaLineNumber-1); + if(lineElement == null) { return; } - DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) jtree - .getLastSelectedPathComponent(); - if (tnode.getUserObject() instanceof ASTNodeWrapper) { - ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); - awrap.highlightNode(editor); - // errorCheckerService.highlightNode(awrap); - //-- - try { - int javaLineNumber = getLineNumber(awrap.getNode()); - int pdeOffs[] = errorCheckerService - .calculateTabIndexAndLineNumber(javaLineNumber); - PlainDocument javaSource = new PlainDocument(); - javaSource.insertString(0, errorCheckerService.lastCodeCheckResult.sourceCode, null); - Element lineElement = javaSource.getDefaultRootElement() - .getElement(javaLineNumber-1); - if(lineElement == null) { - return; - } - - String javaLine = javaSource.getText(lineElement.getStartOffset(), - lineElement.getEndOffset() - - lineElement.getStartOffset()); - editor.getSketch().setCurrentCode(pdeOffs[0]); - String pdeLine = editor.getLineText(pdeOffs[1]); - //String lookingFor = nodeName.toString(); - //log(lookingFor + ", " + nodeName.getStartPosition()); - log("JL " + javaLine + " LSO " + lineElement.getStartOffset() + "," - + lineElement.getEndOffset()); - log("PL " + pdeLine); - } catch (BadLocationException e) { - e.printStackTrace(); - } - } + String javaLine = javaSource.getText(lineElement.getStartOffset(), + lineElement.getEndOffset() + - lineElement.getStartOffset()); + editor.getSketch().setCurrentCode(pdeOffs[0]); + String pdeLine = editor.getLineText(pdeOffs[1]); + //String lookingFor = nodeName.toString(); + //log(lookingFor + ", " + nodeName.getStartPosition()); + log("JL " + javaLine + " LSO " + lineElement.getStartOffset() + "," + + lineElement.getEndOffset()); + log("PL " + pdeLine); + } catch (BadLocationException ex) { + ex.printStackTrace(); } - }; - worker.execute(); + } } + }); btnRename.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if(txtRenameField.getText().length() == 0) + if(txtRenameField.getText().length() == 0) { return; - SwingWorker worker = new SwingWorker() { - - @Override - protected Object doInBackground() throws Exception { - return null; - } - - @Override - protected void done() { - refactorIt(); - } - }; - worker.execute(); + } + refactorIt(); } }); @@ -1949,19 +1916,7 @@ public class ASTGenerator { @Override public void actionPerformed(ActionEvent e) { - SwingWorker worker = new SwingWorker() { - - @Override - protected Object doInBackground() throws Exception { - return null; - } - - @Override - protected void done() { - handleShowUsage(); - } - }; - worker.execute(); + handleShowUsage(); } }); @@ -1970,30 +1925,18 @@ public class ASTGenerator { @Override public void valueChanged(TreeSelectionEvent e) { log(e); - SwingWorker worker = new SwingWorker() { + if(refactorTree + .getLastSelectedPathComponent() == null){ + return; + } + DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) refactorTree + .getLastSelectedPathComponent(); - @Override - protected Object doInBackground() throws Exception { - return null; - } - - @Override - protected void done() { - if(refactorTree - .getLastSelectedPathComponent() == null){ - return; - } - DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) refactorTree - .getLastSelectedPathComponent(); - - if (tnode.getUserObject() instanceof ASTNodeWrapper) { - ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); - //errorCheckerService.highlightNode(awrap); - awrap.highlightNode(editor); - } - } - }; - worker.execute(); + if (tnode.getUserObject() instanceof ASTNodeWrapper) { + ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); + //errorCheckerService.highlightNode(awrap); + awrap.highlightNode(editor); + } } }); } diff --git a/java/src/processing/mode/java/pdex/SketchOutline.java b/java/src/processing/mode/java/pdex/SketchOutline.java index e8c76aecf..121a26907 100644 --- a/java/src/processing/mode/java/pdex/SketchOutline.java +++ b/java/src/processing/mode/java/pdex/SketchOutline.java @@ -269,28 +269,19 @@ public class SketchOutline { private void scrollToNode() { - SwingWorker worker = new SwingWorker() { + if (soTree.getLastSelectedPathComponent() == null) { + return; + } + DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) soTree + .getLastSelectedPathComponent(); + if (tnode.getUserObject() instanceof ASTNodeWrapper) { + ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); + awrap.highlightNode(editor); + // log(awrap); + //errorCheckerService.highlightNode(awrap); + close(); + } - protected Object doInBackground() throws Exception { - return null; - } - - protected void done() { - if (soTree.getLastSelectedPathComponent() == null) { - return; - } - DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) soTree - .getLastSelectedPathComponent(); - if (tnode.getUserObject() instanceof ASTNodeWrapper) { - ASTNodeWrapper awrap = (ASTNodeWrapper) tnode.getUserObject(); - awrap.highlightNode(editor); - // log(awrap); - //errorCheckerService.highlightNode(awrap); - close(); - } - } - }; - worker.execute(); } diff --git a/java/src/processing/mode/java/pdex/TabOutline.java b/java/src/processing/mode/java/pdex/TabOutline.java index e521c697a..876339e01 100644 --- a/java/src/processing/mode/java/pdex/TabOutline.java +++ b/java/src/processing/mode/java/pdex/TabOutline.java @@ -221,31 +221,21 @@ public class TabOutline { tabTree.addTreeSelectionListener(new TreeSelectionListener() { public void valueChanged(TreeSelectionEvent e) { - if (internalSelection) { //log("Internal selection"); internalSelection = (false); return; } // log(e); - SwingWorker worker = new SwingWorker() { - protected Object doInBackground() throws Exception { - return null; - } - - protected void done() { - if (tabTree.getLastSelectedPathComponent() == null) { - return; - } - DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree - .getLastSelectedPathComponent(); - //log("Clicked " + tnode); - switchToTab(tnode.toString()); - close(); - } - }; - worker.execute(); + if (tabTree.getLastSelectedPathComponent() == null) { + return; + } + DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree + .getLastSelectedPathComponent(); + //log("Clicked " + tnode); + switchToTab(tnode.toString()); + close(); } });