FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

move this feller over · ghetas/processing@bac82db · GitHub

  1. ghetas
  2. processing

Repository navigation

Commit bac82db

Browse files
benfry
committed
move this feller over
1 parent 923bd98 commit bac82db

2 files changed

Lines changed: 24 additions & 32 deletions

File tree

‎java/src/processing/mode/java/JavaEditor.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import processing.mode.java.debug.LineBreakpoint;
3131
import processing.mode.java.debug.LineHighlight;
3232
import processing.mode.java.debug.LineID;
33-
import processing.mode.java.debug.VariableInspector;
3433
import processing.mode.java.pdex.ErrorBar;
3534
import processing.mode.java.pdex.ErrorCheckerService;
3635
import processing.mode.java.pdex.ErrorMessageSimplifier;

java/src/processing/mode/java/debug/VariableInspector.java renamed to java/src/processing/mode/java/VariableInspector.java

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
2020

21-
package processing.mode.java.debug;
21+
package processing.mode.java;
2222

2323
import java.awt.*;
2424
import java.awt.event.ComponentEvent;
@@ -42,8 +42,7 @@
4242
import com.sun.jdi.Value;
4343

4444
import processing.app.Mode;
45-
import processing.mode.java.Debugger;
46-
import processing.mode.java.JavaEditor;
45+
import processing.mode.java.debug.VariableNode;
4746

4847

4948
public class VariableInspector extends JFrame {
@@ -73,7 +72,7 @@ public class VariableInspector extends JFrame {
7372
protected List<VariableNode> declaredThisFields;
7473

7574
protected JavaEditor editor;
76-
protected Debugger dbg;
75+
// protected Debugger dbg;
7776

7877
/// list of expanded tree paths. (using list to maintain the order of expansion)
7978
protected List<TreePath> expandedNodes = new ArrayList<TreePath>();
@@ -84,16 +83,29 @@ public class VariableInspector extends JFrame {
8483
final int VERTICAL_OFFSET = 64;
8584

8685

87-
public VariableInspector(JavaEditor je) {
88-
editor = je;
89-
dbg = editor.getDebugger();
86+
public VariableInspector(JavaEditor editor) {
87+
this.editor = editor;
9088

9189
setUndecorated(true);
92-
9390
editor.addComponentListener(new EditorFollower());
94-
95-
initComponents();
9691

92+
scrollPane = new JScrollPane();
93+
tree = new Outline();
94+
95+
scrollPane.setViewportView(tree);
96+
97+
GroupLayout layout = new GroupLayout(getContentPane());
98+
getContentPane().setLayout(layout);
99+
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
100+
.addGap(0, 400, Short.MAX_VALUE)
101+
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
102+
.addComponent(scrollPane, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)));
103+
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
104+
.addGap(0, 300, Short.MAX_VALUE)
105+
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
106+
.addComponent(scrollPane, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)));
107+
pack();
108+
97109
// setup Outline
98110
rootNode = new DefaultMutableTreeNode("root");
99111
builtins = new DefaultMutableTreeNode("Processing");
@@ -224,6 +236,7 @@ public boolean isCellEditable(Object o, int i) {
224236
public void setValueFor(Object o, int i, Object o1) {
225237
VariableNode var = (VariableNode) o;
226238
String stringValue = (String) o1;
239+
Debugger dbg = editor.getDebugger();
227240

228241
Value value = null;
229242
try {
@@ -516,7 +529,7 @@ public void treeWillExpand(TreeExpansionEvent tee) throws ExpandVetoException {
516529
}
517530
VariableNode var = (VariableNode) last;
518531
var.removeAllChildren(); // TODO: should we only load it once?
519-
var.addChildren(filterNodes(dbg.getFields(var.getValue(), 0, true), new ThisFilter()));
532+
var.addChildren(filterNodes(editor.getDebugger().getFields(var.getValue(), 0, true), new ThisFilter()));
520533
}
521534

522535
@Override
@@ -560,26 +573,6 @@ public void treeExpansionVetoed(TreeExpansionEvent tee, ExpandVetoException eve)
560573
}
561574

562575

563-
private void initComponents() {
564-
scrollPane = new JScrollPane();
565-
tree = new Outline();
566-
567-
scrollPane.setViewportView(tree);
568-
569-
GroupLayout layout = new GroupLayout(getContentPane());
570-
getContentPane().setLayout(layout);
571-
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
572-
.addGap(0, 400, Short.MAX_VALUE)
573-
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
574-
.addComponent(scrollPane, GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)));
575-
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
576-
.addGap(0, 300, Short.MAX_VALUE)
577-
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
578-
.addComponent(scrollPane, GroupLayout.Alignment.TRAILING, GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)));
579-
pack();
580-
}
581-
582-
583576
protected static void run(final VariableInspector vi) {
584577
EventQueue.invokeLater(new Runnable() {
585578
@Override

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL