diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java index f539d69c3..2c65bd88f 100644 --- a/java/src/processing/mode/java/pdex/ASTGenerator.java +++ b/java/src/processing/mode/java/pdex/ASTGenerator.java @@ -2179,11 +2179,8 @@ public class ASTGenerator { } } - DefaultMutableTreeNode defCU = new DefaultMutableTreeNode( - new ASTNodeWrapper( - wnode - .getNode(), - selText)); + DefaultMutableTreeNode defCU = + new DefaultMutableTreeNode(new ASTNodeWrapper(wnode.getNode(), selText)); dfsNameOnly(defCU, wnode.getNode(), selText); // Reverse the list obtained via dfs diff --git a/java/src/processing/mode/java/pdex/TabOutline.java b/java/src/processing/mode/java/pdex/TabOutline.java index 360e2e3a7..ca57781a6 100644 --- a/java/src/processing/mode/java/pdex/TabOutline.java +++ b/java/src/processing/mode/java/pdex/TabOutline.java @@ -56,29 +56,24 @@ import processing.mode.java.JavaEditor; public class TabOutline { protected JFrame frmOutlineView; - protected JScrollPane jsp; - - protected DefaultMutableTreeNode tabNode, tempNode; - + protected DefaultMutableTreeNode tabNode; + protected DefaultMutableTreeNode tempNode; protected JTree tabTree; - protected JTextField searchField; - protected JLabel lblCaption; - protected JavaEditor editor; - protected ErrorCheckerService errorCheckerService; - protected boolean internalSelection = false; + public TabOutline(ErrorCheckerService ecs) { errorCheckerService = ecs; editor = ecs.getEditor(); createGUI(); } + private void createGUI() { frmOutlineView = new JFrame(); frmOutlineView.setAlwaysOnTop(true); @@ -120,12 +115,8 @@ public class TabOutline { frmOutlineView.setMinimumSize(new Dimension(minWidth, Math .min(errorCheckerService.getEditor().getTextArea().getHeight(), frmOutlineView.getHeight()))); - frmOutlineView.setLocation(tp.x - + errorCheckerService.getEditor().getTextArea() - .getWidth()/2 - frmOutlineView.getWidth()/2, - frmOutlineView.getY() - + (editor.getTextArea().getHeight() - frmOutlineView - .getHeight()) / 2); + frmOutlineView.setLocation(tp.x + errorCheckerService.getEditor().getTextArea().getWidth()/2 - frmOutlineView.getWidth()/2, + frmOutlineView.getY() + (editor.getTextArea().getHeight() - frmOutlineView.getHeight()) / 2); DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer) tabTree.getCellRenderer(); renderer.setLeafIcon(null); renderer.setClosedIcon(null); @@ -133,6 +124,7 @@ public class TabOutline { addListeners(); } + private void addListeners() { searchField.addKeyListener(new KeyAdapter() { public void keyPressed(KeyEvent evt) { @@ -258,14 +250,14 @@ public class TabOutline { worker.execute(); } }); - + tabTree.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent me) { if (tabTree.getLastSelectedPathComponent() == null) { return; } - DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree - .getLastSelectedPathComponent(); + DefaultMutableTreeNode tnode = + (DefaultMutableTreeNode) tabTree.getLastSelectedPathComponent(); //log("Clicked " + tnode); switchToTab(tnode.toString()); close(); @@ -281,7 +273,7 @@ public class TabOutline { } }); } - + private void switchToTab(String tabName) { for (SketchCode sc : editor.getSketch().getCode()) { if (sc.getPrettyName().equals(tabName)) { @@ -326,7 +318,7 @@ public class TabOutline { } return found; } - + private int estimateFrameWidth() { FontMetrics fm = editor.getTextArea().getGraphics().getFontMetrics(); int w = fm.stringWidth(lblCaption.getText()) + 10; @@ -335,7 +327,7 @@ public class TabOutline { } return w; } - + private int estimateFrameHeight() { int textHeight = jsp.getGraphics().getFontMetrics().getHeight() + 2; int t = Math.max(4, editor.getSketch().getCodeCount() + 3); @@ -354,5 +346,4 @@ public class TabOutline { public boolean isVisible() { return frmOutlineView.isVisible(); } - }