From f49066264fd58cfd5f8a91a2dc16de57b4ec287b Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Sat, 17 Aug 2013 20:54:05 +0530 Subject: [PATCH] refactor bug fix --- pdex/Todo, GSoC 2013.txt | 3 ++- .../mode/experimental/ASTGenerator.java | 10 +++++++--- .../mode/experimental/ErrorCheckerService.java | 16 ++++++++-------- .../mode/experimental/ExperimentalMode.java | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pdex/Todo, GSoC 2013.txt b/pdex/Todo, GSoC 2013.txt index 6268ef55f..cd2025c60 100644 --- a/pdex/Todo, GSoC 2013.txt +++ b/pdex/Todo, GSoC 2013.txt @@ -119,6 +119,7 @@ x Working for local code General Stuff ============= -* Add option for toggling debug output +x Add option for toggling debug output +x On Run/Debug Console is visible(ProblemsList hidden) * update build.xml to produce dists * Make this a contributed mode - mode.txt, github releases feature, version numbering, git tags, etc diff --git a/pdex/src/processing/mode/experimental/ASTGenerator.java b/pdex/src/processing/mode/experimental/ASTGenerator.java index c64d9037c..9073a4d70 100644 --- a/pdex/src/processing/mode/experimental/ASTGenerator.java +++ b/pdex/src/processing/mode/experimental/ASTGenerator.java @@ -38,6 +38,7 @@ import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JList; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; @@ -1813,6 +1814,7 @@ public class ASTGenerator { editor.statusError("Can't locate definition of " + selText); return; } + errorCheckerService.pauseThread(); treeRename.setModel(new DefaultTreeModel(defCU)); ((DefaultTreeModel) treeRename.getModel()).reload(); frmOccurenceList.setTitle("Usage of " + selText); @@ -1824,14 +1826,14 @@ public class ASTGenerator { // I need to store the pde and java offsets beforehand because once // the replace starts, all offsets returned are affected int offsetsMap[][][] = new int[defCU.getChildCount()][2][]; - for (int i = defCU.getChildCount() - 1; i >= 0; i--) { + for (int i = 0; i < defCU.getChildCount(); i++) { ASTNodeWrapper awrap = (ASTNodeWrapper) ((DefaultMutableTreeNode) (defCU .getChildAt(i))).getUserObject(); offsetsMap[i][0] = awrap.getPDECodeOffsets(errorCheckerService); offsetsMap[i][1] = awrap.getJavaCodeOffsets(errorCheckerService); } - for (int i = defCU.getChildCount() - 1; i >= 0; i--) { + for (int i = 0; i < defCU.getChildCount(); i++) { int pdeoffsets[] = offsetsMap[i][0]; int javaoffsets[] = offsetsMap[i][1]; // correction for pde enhancements related displacement on a line @@ -1845,13 +1847,15 @@ public class ASTGenerator { lineOffsetDisplacement.put(javaoffsets[0], lineOffsetDisplacementConst); } - ErrorCheckerService.scrollToErrorLine(editor, pdeoffsets[0], pdeoffsets[1], javaoffsets[1] + off, javaoffsets[2]); + //int k = JOptionPane.showConfirmDialog(new JFrame(), "Rename?","", JOptionPane.OK_OPTION)); editor.ta.setSelectedText(newName); } + errorCheckerService.resumeThread(); + errorCheckerService.runManualErrorCheck(); for (Integer lineNum : lineOffsetDisplacement.keySet()) { log(lineNum + "line, disp" + lineOffsetDisplacement.get(lineNum)); diff --git a/pdex/src/processing/mode/experimental/ErrorCheckerService.java b/pdex/src/processing/mode/experimental/ErrorCheckerService.java index 3a73b03c5..3853a367d 100644 --- a/pdex/src/processing/mode/experimental/ErrorCheckerService.java +++ b/pdex/src/processing/mode/experimental/ErrorCheckerService.java @@ -378,10 +378,10 @@ public class ErrorCheckerService implements Runnable{ Problem p = new Problem(problems[i], a[0], a[1] + 1); //TODO: ^Why do cheeky stuff? problemsList.add(p); - log(problems[i].getMessage()); - for (String j : problems[i].getArguments()) { - log("arg " + j); - } +// log(problems[i].getMessage()); +// for (String j : problems[i].getArguments()) { +// log("arg " + j); +// } // log(p.toString()); } @@ -491,10 +491,10 @@ public class ErrorCheckerService implements Runnable{ // + problems[i].isWarning()); IProblem problem = problems[i]; - log(problem.getMessage()); - for (String j : problem.getArguments()) { - log("arg " + j); - } +// log(problem.getMessage()); +// for (String j : problem.getArguments()) { +// log("arg " + j); +// } int a[] = calculateTabIndexAndLineNumber(problem); Problem p = new Problem(problem, a[0], a[1]); if ((Boolean) errorList[i][8]) { diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index 8619af055..61d93d498 100755 --- a/pdex/src/processing/mode/experimental/ExperimentalMode.java +++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java @@ -43,7 +43,7 @@ public class ExperimentalMode extends JavaMode { public static final boolean VERBOSE_LOGGING = true; //public static final boolean VERBOSE_LOGGING = false; public static final int LOG_SIZE = 512 * 1024; // max log file size (in bytes) - public static boolean DEBUG = !true; + public static boolean DEBUG = true; public ExperimentalMode(Base base, File folder) { super(base, folder);