From 6edd537c4141fd430fc719447f307c707085b179 Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Sun, 30 Jun 2013 00:16:21 +0530 Subject: [PATCH] added manual error check function to ECS --- .../mode/experimental/ASTGenerator.java | 35 +++++++++++-------- .../experimental/ErrorCheckerService.java | 10 +++++- .../mode/experimental/TextArea.java | 2 +- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java index 68a37a5b4..1229aa1dc 100644 --- a/pdex/src/processing/mode/experimental/ASTGenerator.java +++ b/pdex/src/processing/mode/experimental/ASTGenerator.java @@ -110,45 +110,47 @@ public class ASTGenerator { private JButton renameButton; - private JButton listOccurrence; + private JButton btnListOccurrence; private JTextField renameTextField; + private JFrame occurenceListFrame; + public ASTGenerator(ErrorCheckerService ecs) { this.errorCheckerService = ecs; this.editor = ecs.getEditor(); frame2 = new JFrame(); jtree = new JTree(); - frame2.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame2.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); frame2.setBounds(new Rectangle(680, 100, 460, 620)); JScrollPane sp = new JScrollPane(); sp.setViewportView(jtree); frame2.add(sp); renameButton = new JButton("Rename"); - listOccurrence = new JButton("Find All"); + btnListOccurrence = new JButton("Find All"); renameWindow = new JFrame(); - renameWindow.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + renameWindow.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); renameWindow.setBounds(new Rectangle(680, 50, 150, 150)); renameWindow.setLayout(new GridLayout(3, 1)); renameWindow.add(renameButton); - renameWindow.add(listOccurrence); + renameWindow.add(btnListOccurrence); renameWindow.setTitle("Rename.."); renameTextField = new JTextField(); renameTextField.setPreferredSize(new Dimension(150, 60)); renameWindow.add(renameTextField); - renameWindow.setVisible(true); + //renameWindow.setVisible(true); - JFrame frame4 = new JFrame(); - frame4.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - frame4.setBounds(new Rectangle(1100, 50, 350, 500)); + occurenceListFrame = new JFrame(); + occurenceListFrame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); + occurenceListFrame.setBounds(new Rectangle(1100, 50, 350, 500)); JScrollPane sp2 = new JScrollPane(); renameTree = new JTree(); sp2.setViewportView(renameTree); - frame4.add(sp2); - frame4.setVisible(true); + occurenceListFrame.add(sp2); + //occurenceListFrame.setVisible(true); // frameAutoComp = new JFrame(); // frameAutoComp.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); @@ -1296,6 +1298,7 @@ public class ASTGenerator { DefaultMutableTreeNode defCU = findAllOccurrences(); renameTree.setModel(new DefaultTreeModel(defCU)); ((DefaultTreeModel) renameTree.getModel()).reload(); + occurenceListFrame.setVisible(true); int lineOffsetDisplacementConst = newName.length() - editor.ta.getSelectedText().length(); HashMap lineOffsetDisplacement = new HashMap(); @@ -1336,13 +1339,16 @@ public class ASTGenerator { + lineOffsetDisplacement.get(lineNum)); } editor.getSketch().setModified(true); + errorCheckerService.runManualErrorCheck(); + occurenceListFrame.setVisible(false); + renameWindow.setVisible(false); } }; worker.execute(); } }); // TODO: Diable this listner at deployment - listOccurrence.addActionListener(new ActionListener() { + btnListOccurrence.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -1356,9 +1362,10 @@ public class ASTGenerator { protected void done() { if (editor.ta.getSelectedText() == null) return; - DefaultMutableTreeNode defCU = findAllOccurrences(); + DefaultMutableTreeNode defCU = findAllOccurrences(); renameTree.setModel(new DefaultTreeModel(defCU)); - ((DefaultTreeModel) renameTree.getModel()).reload(); + ((DefaultTreeModel) renameTree.getModel()).reload(); + occurenceListFrame.setVisible(true); } }; worker.execute(); diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java index 39de86ea4..67448450b 100644 --- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java +++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java @@ -260,7 +260,15 @@ public class ErrorCheckerService implements Runnable{ } protected ASTGenerator astGenerator; - AtomicInteger textModified = new AtomicInteger(); + private AtomicInteger textModified = new AtomicInteger(); + + /** + * Triggers error check + */ + public void runManualErrorCheck() { + textModified.incrementAndGet(); + } + private boolean checkCode() { System.out.println("checkCode() " + textModified.get() ); lastTimeStamp = System.currentTimeMillis(); diff --git a/pdex/src/processing/mode/experimental/TextArea.java b/pdex/src/processing/mode/experimental/TextArea.java index e07cda0b3..1ec3c2ffc 100644 --- a/pdex/src/processing/mode/experimental/TextArea.java +++ b/pdex/src/processing/mode/experimental/TextArea.java @@ -166,7 +166,7 @@ public class TextArea extends JEditTextArea { super.processKeyEvent(evt); if (evt.getID() == KeyEvent.KEY_TYPED) { - errorCheckerService.textModified.incrementAndGet(); + errorCheckerService.runManualErrorCheck(); System.out.println(" Typing: " + fetchPhrase(evt) + " " + (evt.getKeyChar() == KeyEvent.VK_BACK_SPACE));