From: Prakash <dug...@us...> - 2005-11-22 11:16:46
|
Update of /cvsroot/jedit/plugins/JavaDebugger/src/debugger/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5507/src/debugger/gui Modified Files: ClassPanel.java GUIUtils.java StartupDialog.java StepHighlight.java Log Message: Bug fixes and support for breakpoints in inner classes Index: StartupDialog.java =================================================================== RCS file: /cvsroot/jedit/plugins/JavaDebugger/src/debugger/gui/StartupDialog.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- StartupDialog.java 22 Dec 2004 19:36:41 -0000 1.1.1.1 +++ StartupDialog.java 22 Nov 2005 11:16:35 -0000 1.2 @@ -2,6 +2,8 @@ import debugger.options.DebuggerOptions; +import debugger.plugin.Application; + import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; @@ -69,7 +71,7 @@ constraints.gridx = 1; constraints.gridwidth = GridBagConstraints.REMAINDER; - classPath = new JTextField(jEdit.getProperty(DebuggerOptions.CLASSPATH)); + classPath = new JTextField(Application.getInstance().getClasspath()); layout.setConstraints(classPath, constraints); panel.add(classPath); @@ -101,7 +103,7 @@ accepted = true; jEdit.setProperty(DebuggerOptions.CLASS_NAME, className.getText()); jEdit.setProperty(DebuggerOptions.CLASS_ARGS, classArgs.getText()); - jEdit.setProperty(DebuggerOptions.CUSTOM_CLASSPATH, classPath.getText()); + jEdit.setTemporaryProperty(DebuggerOptions.CUSTOM_CLASSPATH, classPath.getText()); dispose(); } Index: StepHighlight.java =================================================================== RCS file: /cvsroot/jedit/plugins/JavaDebugger/src/debugger/gui/StepHighlight.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- StepHighlight.java 22 Feb 2005 04:58:08 -0000 1.2 +++ StepHighlight.java 22 Nov 2005 11:16:35 -0000 1.3 @@ -112,9 +112,9 @@ { if (evaluator != null && isDebuggerRunning() ) { - String identifier = getIdentifierAtCursor(x, y); try { + String identifier = getIdentifierAtCursor(x, y); return evaluator.evaluate(identifier); } catch(Exception ex) Index: ClassPanel.java =================================================================== RCS file: /cvsroot/jedit/plugins/JavaDebugger/src/debugger/gui/ClassPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ClassPanel.java 22 Feb 2005 04:58:08 -0000 1.2 +++ ClassPanel.java 22 Nov 2005 11:16:35 -0000 1.3 @@ -74,17 +74,24 @@ { ReferenceType rt = (ReferenceType) obj; String name = rt.name(); - StringTokenizer tokenizer = new StringTokenizer(name, "."); - TreeNode node = root; - while (tokenizer.hasMoreTokens()) - { - String token = tokenizer.nextToken(); - if (tokenizer.countTokens() != 0) + if (name.indexOf('.') != -1) + { + StringTokenizer tokenizer = new StringTokenizer(name, "."); + TreeNode node = root; + while (tokenizer.hasMoreTokens()) { - node = node.getCreateChild(token); - } + String token = tokenizer.nextToken(); + if (tokenizer.countTokens() != 0) + { + node = node.getCreateChild(token); + } + } + node.getCreateChild(rt); } - node.add(TreeNodeFactory.createNode(rt)); + else + { + root.getCreateChild(rt); + } } } } Index: GUIUtils.java =================================================================== RCS file: /cvsroot/jedit/plugins/JavaDebugger/src/debugger/gui/GUIUtils.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- GUIUtils.java 22 Dec 2004 19:36:41 -0000 1.1.1.1 +++ GUIUtils.java 22 Nov 2005 11:16:35 -0000 1.2 @@ -244,15 +244,15 @@ public static List getExpandedPaths(JTree tree) { TreePath rootPath = new TreePath(tree.getModel().getRoot()); - Enumeration enum = tree.getExpandedDescendants(rootPath); + Enumeration descendants = tree.getExpandedDescendants(rootPath); // (Copy these to be safe in case the enumeration chokes when // the backing data source changes.) - if(enum != null) + if(descendants != null) { List expandedPaths = new ArrayList(); - while (enum.hasMoreElements()) - expandedPaths.add(enum.nextElement()); + while (descendants.hasMoreElements()) + expandedPaths.add(descendants.nextElement()); return expandedPaths; } return null; |