diff --git a/pdex/Todo, GSoC 2013.txt b/pdex/Todo, GSoC 2013.txt index 83602d2ad..05384a011 100644 --- a/pdex/Todo, GSoC 2013.txt +++ b/pdex/Todo, GSoC 2013.txt @@ -132,5 +132,5 @@ General Stuff x Add option for toggling debug output x On Run/Debug Console is visible(ProblemsList hidden) * Update wiki for Ctrl + H instead of Ctrl + J shortcuts -* update build.xml to produce dists -* Make this a contributed mode - mode.txt, github releases feature, version numbering, git tags, etc +x update build.xml to produce dists +x 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 6a71610f8..810b9a985 100644 --- a/pdex/src/processing/mode/experimental/ASTGenerator.java +++ b/pdex/src/processing/mode/experimental/ASTGenerator.java @@ -170,7 +170,7 @@ public class ASTGenerator { btnListOccurrence = new JButton("Show Usage"); frmRename = new JFrame(); frmRename.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); - frmRename.setBounds(new Rectangle(680, 50, 250, 130)); + frmRename.setSize(250, 130); frmRename.setLayout(new BoxLayout(frmRename.getContentPane(), BoxLayout.Y_AXIS)); Toolkit.setIcon(frmRename); JPanel panelTop = new JPanel(), panelBottom = new JPanel(); @@ -192,13 +192,18 @@ public class ASTGenerator { panelTop.add(Box.createRigidArea(new Dimension(0, 10))); panelTop.add(lblRefactorOldName); frmRename.add(panelTop); - frmRename.add(panelBottom); - + frmRename.add(panelBottom); frmRename.setMinimumSize(frmRename.getSize()); + frmRename.setLocation(editor.getX() + + (editor.getWidth() - frmRename.getWidth()) / 2, + editor.getY() + + (editor.getHeight() - frmRename.getHeight()) + / 2); + frmOccurenceList = new JFrame(); frmOccurenceList.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); - frmOccurenceList.setBounds(new Rectangle(1100, 50, 350, 500)); + frmOccurenceList.setSize(300, 400); Toolkit.setIcon(frmOccurenceList); JScrollPane sp2 = new JScrollPane(); treeRename = new JTree(); @@ -1843,6 +1848,7 @@ public class ASTGenerator { treeRename.setModel(new DefaultTreeModel(defCU)); ((DefaultTreeModel) treeRename.getModel()).reload(); frmOccurenceList.setTitle("Usage of " + selText); + frmOccurenceList.setLocation(editor.getX() + editor.getWidth(),editor.getY()); frmOccurenceList.setVisible(true); int lineOffsetDisplacementConst = newName.length() - selText.length(); @@ -1917,6 +1923,7 @@ public class ASTGenerator { ((DefaultTreeModel) treeRename.getModel()).reload(); treeRename.setRootVisible(false); frmOccurenceList.setTitle("Usage of \"" + selText+ "\""); + frmOccurenceList.setLocation(editor.getX() + editor.getWidth(),editor.getY()); frmOccurenceList.setVisible(true); lastClickedWord = null; lastClickedWordNode = null; @@ -2168,6 +2175,11 @@ public class ASTGenerator { return; } if (!frmRename.isVisible()){ + frmRename.setLocation(editor.getX() + + (editor.getWidth() - frmRename.getWidth()) / 2, + editor.getY() + + (editor.getHeight() - frmRename.getHeight()) + / 2); frmRename.setVisible(true); SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java index ce341b7fb..aea75af9d 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -1251,14 +1251,14 @@ public class DebugEditor extends JavaEditor implements ActionListener { } private void handleRefactor() { - System.out.println("Caret at:"); - System.out.println(ta.getLineText(ta.getCaretLine())); + log("Caret at:"); + log(ta.getLineText(ta.getCaretLine())); errorCheckerService.astGenerator.handleRefactor(); } private void handleShowUsage() { - System.out.println("Caret at:"); - System.out.println(ta.getLineText(ta.getCaretLine())); + log("Caret at:"); + log(ta.getLineText(ta.getCaretLine())); errorCheckerService.astGenerator.handleShowUsage(); } diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index 61d93d498..8619af055 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);