Tab outline stuff

Manindra29 · Manindra29 · commit ab9823c8a0c7 · 2014-07-15T07:34:00.000+05:30
diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java
@@ -2327,8 +2327,11 @@ else if (prop.isChildListProperty()) {
   
   protected SketchOutline sketchOutline;
   protected void showSketchOutline(){
-    //sketchOutline = new SketchOutline(codeTree, errorCheckerService);
-    //sketchOutline.show();
+    sketchOutline = new SketchOutline(codeTree, errorCheckerService);
+    sketchOutline.show();
+  }
+  
+  protected void showTabOutline(){
     new TabOutline(errorCheckerService).show();
   }
   
diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -183,7 +183,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
     /**
      * Show outline view
      */
-    protected JMenuItem showOutline;
+    protected JMenuItem showOutline, showTabOutline;
     
     /**
      * Enable/Disable error logging
@@ -670,6 +670,11 @@ public void actionPerformed(ActionEvent e) {
         showOutline.addActionListener(this);
         debugMenu.add(showOutline);
         
+        showTabOutline = Toolkit.newJMenuItem("Show Outline", KeyEvent.VK_SEMICOLON);
+        showTabOutline.addActionListener(this);
+        debugMenu.add(showTabOutline);
+        
+        
         return debugMenu;
     }
     
@@ -773,9 +778,13 @@ public void actionPerformed(ActionEvent ae) {
             Logger.getLogger(DebugEditor.class.getName()).log(Level.INFO, "Invoked 'Toggle Variable Inspector' menu item");
             toggleVariableInspector();
         } else if (source.equals(showOutline)){
-            log("Show Outline :D");
+            log("Show Sketch Outline:");
             errorCheckerService.getASTGenerator().showSketchOutline();
         }
+        else if (source.equals(showTabOutline)){
+          log("Show Tab Outline:");
+          errorCheckerService.getASTGenerator().showTabOutline();
+      }
     }
 
 //    @Override
diff --git a/pdex/src/processing/mode/experimental/TabOutline.java b/pdex/src/processing/mode/experimental/TabOutline.java
@@ -111,7 +111,7 @@ public void keyPressed(KeyEvent evt) {
           if (tabTree.getLastSelectedPathComponent() != null) {
             DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree
                 .getLastSelectedPathComponent();
-            log("Enter Key, Tab: " + tnode);
+            //log("Enter Key, Tab: " + tnode);
             switchToTab(tnode.toString());
             close();
           }
@@ -197,7 +197,7 @@ protected void done() {
       public void valueChanged(TreeSelectionEvent e) {
 
         if (internalSelection) {
-          log("Internal selection");
+          //log("Internal selection");
           internalSelection = (false);
           return;
         }
@@ -214,7 +214,7 @@ protected void done() {
             }
             DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree
                 .getLastSelectedPathComponent();
-            log("Clicked " + tnode);
+            //log("Clicked " + tnode);
             switchToTab(tnode.toString());
             close();
           }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void keyPressed(KeyEvent evt) {`
`111`	`111`	`if (tabTree.getLastSelectedPathComponent() != null) {`
`112`	`112`	`DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree`
`113`	`113`	`.getLastSelectedPathComponent();`
`114`		`- log("Enter Key, Tab: " + tnode);`
	`114`	`+ //log("Enter Key, Tab: " + tnode);`
`115`	`115`	`switchToTab(tnode.toString());`
`116`	`116`	`close();`
`117`	`117`	`}`
`@@ -197,7 +197,7 @@ protected void done() {`
`197`	`197`	`public void valueChanged(TreeSelectionEvent e) {`
`198`	`198`
`199`	`199`	`if (internalSelection) {`
`200`		`- log("Internal selection");`
	`200`	`+ //log("Internal selection");`
`201`	`201`	`internalSelection = (false);`
`202`	`202`	`return;`
`203`	`203`	`}`
`@@ -214,7 +214,7 @@ protected void done() {`
`214`	`214`	`}`
`215`	`215`	`DefaultMutableTreeNode tnode = (DefaultMutableTreeNode) tabTree`
`216`	`216`	`.getLastSelectedPathComponent();`
`217`		`- log("Clicked " + tnode);`
	`217`	`+ //log("Clicked " + tnode);`
`218`	`218`	`switchToTab(tnode.toString());`
`219`	`219`	`close();`
`220`	`220`	`}`