eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

bit of refactoring and tidying things up

Browse Source
This commit is contained in:
Manindra Moharana
2013-12-07 02:56:12 +05:30
parent ceb59def37
commit 788cec41c8
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pdex/src/processing/mode/experimental/ASTGenerator.java
View File

@@ -109,7 +109,7 @@ public class ASTGenerator {
/**
* AST Window
*/
protected JFrame frame2;
protected JFrame frmASTView;
protected JFrame frameAutoComp;
@@ -153,14 +153,15 @@ public class ASTGenerator {
}
protected void setupGUI(){
frame2 = new JFrame();
frmASTView = new JFrame();
jtree = new JTree();
frame2.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
frame2.setBounds(new Rectangle(680, 100, 460, 620));
frmASTView.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
frmASTView.setBounds(new Rectangle(680, 100, 460, 620));
frmASTView.setTitle("AST View - " + editor.getSketch().getName());
JScrollPane sp = new JScrollPane();
sp.setViewportView(jtree);
frame2.add(sp);
frmASTView.add(sp);
btnRename = new JButton("Rename");
btnListOccurrence = new JButton("Show Usage");
@@ -231,6 +232,8 @@ public class ASTGenerator {
}
public static final boolean SHOWAST = true;
protected DefaultMutableTreeNode buildAST(String source, CompilationUnit cu) {
if (cu == null) {
@@ -267,14 +270,16 @@ public class ASTGenerator {
protected void done() {
if (codeTree != null) {
// if (jtree.hasFocus() || frame2.hasFocus())
// return;
// jtree.setModel(new DefaultTreeModel(codeTree));
// ((DefaultTreeModel) jtree.getModel()).reload();
// jtree.validate();
// if (!frame2.isVisible()) {
// frame2.setVisible(true);
// }
if(SHOWAST){
if (jtree.hasFocus() || frmASTView.hasFocus())
return;
jtree.setModel(new DefaultTreeModel(codeTree));
((DefaultTreeModel) jtree.getModel()).reload();
jtree.validate();
if (!frmASTView.isVisible()) {
frmASTView.setVisible(true);
}
}
// if (!frameAutoComp.isVisible()) {
//
// frameAutoComp.setVisible(true);
@@ -3156,7 +3161,7 @@ public class ASTGenerator {
}
public void disposeAllWindows(){
disposeWindow(frame2);
disposeWindow(frmASTView);
disposeWindow(frameAutoComp);
disposeWindow(frmImportSuggest);
disposeWindow(frmOccurenceList);

6
pdex/src/processing/mode/experimental/CompletionPanel.java
View File

@@ -60,7 +60,7 @@ public class CompletionPanel {
textarea.requestFocusInWindow();
popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0)
+ location.y);
log("Suggestion constructed" + System.nanoTime());
//log("Suggestion constructed" + System.nanoTime());
}
public boolean isVisible() {
@@ -130,7 +130,7 @@ public class CompletionPanel {
completionList.setSelectedIndex(0);
scrollPane.setViewportView(completionList);
popupMenu.setPopupSize(popupMenu.getSize().width, setHeight(items.getSize()));
log("Suggestion updated" + System.nanoTime());
//log("Suggestion updated" + System.nanoTime());
textarea.requestFocusInWindow();
popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0)
+ location.y);
@@ -176,7 +176,7 @@ public class CompletionPanel {
public void hide() {
popupMenu.setVisible(false);
log("Suggestion hidden" + System.nanoTime());
//log("Suggestion hidden" + System.nanoTime());
//textarea.errorCheckerService.getASTGenerator().jdocWindowVisible(false);
}