Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsActionsProvider.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsActionsProvider.java,v retrieving revision 1.7 diff -u -r1.7 BreakpointsActionsProvider.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsActionsProvider.java 3 Jan 2005 15:23:55 -0000 1.7 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsActionsProvider.java 1 Apr 2005 13:57:01 -0000 @@ -28,7 +28,7 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -269,11 +269,11 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { //listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { //listeners.remove (l); } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsNodeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsNodeModel.java,v retrieving revision 1.2 diff -u -r1.2 BreakpointsNodeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsNodeModel.java 1 Jul 2004 13:02:54 -0000 1.2 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsNodeModel.java 1 Apr 2005 13:57:01 -0000 @@ -15,7 +15,7 @@ import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -58,9 +58,9 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTableModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTableModel.java,v retrieving revision 1.2 diff -u -r1.2 BreakpointsTableModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTableModel.java 20 Jan 2005 09:18:29 -0000 1.2 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTableModel.java 1 Apr 2005 13:57:01 -0000 @@ -20,7 +20,7 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -67,7 +67,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -75,6 +75,6 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java,v retrieving revision 1.3 diff -u -r1.3 BreakpointsTreeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java 20 Jul 2004 13:34:03 -0000 1.3 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java 1 Apr 2005 13:57:01 -0000 @@ -26,8 +26,9 @@ import org.netbeans.api.debugger.Breakpoint; import org.netbeans.api.debugger.DebuggerManager; import org.netbeans.api.debugger.DebuggerManagerAdapter; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -117,11 +118,11 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -129,14 +130,9 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - void fireNodeChanged (Breakpoint b) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (b); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TreeChanged (this) + ); } @@ -201,8 +197,7 @@ m.fireTreeChanged (); return; } - Breakpoint b = (Breakpoint) evt.getSource (); - m.fireNodeChanged (b); + m.fireTreeChanged (); } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/SesionsNodeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/SesionsNodeModel.java,v retrieving revision 1.3 diff -u -r1.3 SesionsNodeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/SesionsNodeModel.java 1 Jul 2004 13:02:55 -0000 1.3 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/SesionsNodeModel.java 1 Apr 2005 13:57:01 -0000 @@ -21,9 +21,10 @@ import org.netbeans.api.debugger.DebuggerManager; import org.netbeans.api.debugger.DebuggerManagerAdapter; import org.netbeans.api.debugger.Session; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -85,7 +86,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -93,7 +94,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -101,14 +102,9 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TreeChanged (this) + ); } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsActionsProvider.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsActionsProvider.java,v retrieving revision 1.7 diff -u -r1.7 SessionsActionsProvider.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsActionsProvider.java 4 Aug 2004 14:27:27 -0000 1.7 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsActionsProvider.java 1 Apr 2005 13:57:01 -0000 @@ -22,7 +22,7 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -102,9 +102,9 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTableModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTableModel.java,v retrieving revision 1.2 diff -u -r1.2 SessionsTableModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTableModel.java 19 Jan 2005 10:14:46 -0000 1.2 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTableModel.java 1 Apr 2005 13:57:01 -0000 @@ -20,8 +20,9 @@ import org.netbeans.api.debugger.Session; import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.spi.debugger.ui.Constants; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -29,21 +30,11 @@ * * @author Jan Jancura */ -public class SessionsTableModel implements TableModel, Constants, -PropertyChangeListener { +public class SessionsTableModel implements TableModel, Constants { private Vector listeners = new Vector (); - public SessionsTableModel () { -// Session session = DebuggerManager.getDebuggerManager (). -// getCurrentSession (); -// session.addPropertyChangeListener ( -// Session.PROP_CURRENT_LANGUAGE, -// this -// ); - } - public Object getValueAt (Object row, String columnID) throws UnknownTypeException { if (row instanceof Session) { @@ -84,7 +75,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -93,7 +84,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -104,18 +95,8 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); - } - - public void propertyChange (PropertyChangeEvent ev) { - if (ev.getPropertyName () == Session.PROP_CURRENT_LANGUAGE) - fireTreeNodeChanged (ev.getSource ()); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TreeChanged (this) + ); } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTreeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTreeModel.java,v retrieving revision 1.2 diff -u -r1.2 SessionsTreeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTreeModel.java 20 Jul 2004 13:34:03 -0000 1.2 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/SessionsTreeModel.java 1 Apr 2005 13:57:01 -0000 @@ -20,7 +20,7 @@ import org.netbeans.api.debugger.DebuggerManager; import org.netbeans.api.debugger.DebuggerManagerAdapter; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -85,11 +85,11 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -97,7 +97,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java,v retrieving revision 1.8 diff -u -r1.8 WatchesActionsProvider.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java 26 Aug 2004 14:05:48 -0000 1.8 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java 1 Apr 2005 13:57:01 -0000 @@ -28,7 +28,7 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.DialogDisplayer; import org.openide.util.NbBundle; @@ -114,10 +114,10 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private static void customize (Watch w) { Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesNodeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesNodeModel.java,v retrieving revision 1.4 diff -u -r1.4 WatchesNodeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesNodeModel.java 1 Jul 2004 13:02:55 -0000 1.4 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesNodeModel.java 1 Apr 2005 13:57:01 -0000 @@ -18,7 +18,7 @@ import org.netbeans.api.debugger.Watch; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -63,7 +63,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -71,7 +71,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -79,13 +79,6 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged (null); } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTableModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTableModel.java,v retrieving revision 1.1 diff -u -r1.1 WatchesTableModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTableModel.java 5 Jan 2005 17:12:09 -0000 1.1 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTableModel.java 1 Apr 2005 13:57:01 -0000 @@ -20,7 +20,7 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -70,7 +70,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -78,6 +78,6 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTreeModel.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTreeModel.java,v retrieving revision 1.3 diff -u -r1.3 WatchesTreeModel.java --- debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTreeModel.java 20 Jul 2004 13:34:04 -0000 1.3 +++ debuggercore/src/org/netbeans/modules/debugger/ui/models/WatchesTreeModel.java 1 Apr 2005 13:57:01 -0000 @@ -21,8 +21,9 @@ import org.netbeans.api.debugger.Watch; import org.netbeans.api.debugger.DebuggerManager; import org.netbeans.api.debugger.DebuggerManagerAdapter; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -85,11 +86,11 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -97,14 +98,18 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TreeChanged (this) + ); } - void fireNodeChanged (Watch b) { + void fireWatchPropertyChanged (Watch b, String propertyName) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (b); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TableValueChanged (this, b, propertyName) + ); } @@ -166,7 +171,7 @@ if (! (evt.getSource () instanceof Watch)) return; Watch w = (Watch) evt.getSource (); - m.fireNodeChanged (w); + m.fireWatchPropertyChanged (w, evt.getPropertyName ()); } } } Index: debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java =================================================================== RCS file: /cvs/debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java,v retrieving revision 1.7 diff -u -r1.7 ViewModelListener.java --- debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java 21 Feb 2005 12:13:05 -0000 1.7 +++ debuggercore/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java 1 Apr 2005 13:57:01 -0000 @@ -42,7 +42,7 @@ import org.netbeans.spi.viewmodel.TreeExpansionModel; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -158,7 +158,7 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) {} - public void removeTreeModelListener (TreeModelListener l) {} + public void addTreeModelListener (ModelListener l) {} + public void removeTreeModelListener (ModelListener l) {} } } Index: debuggercore/viewmodel/apichanges.xml =================================================================== RCS file: /cvs/debuggercore/viewmodel/apichanges.xml,v retrieving revision 1.9 diff -u -r1.9 apichanges.xml --- debuggercore/viewmodel/apichanges.xml 20 Jan 2005 09:00:41 -0000 1.9 +++ debuggercore/viewmodel/apichanges.xml 1 Apr 2005 13:57:01 -0000 @@ -133,6 +133,22 @@ + + + I need to add TreeModelEvent to ViewModelAPI. + + + + + ViewModelAPI currently supports two types of changes only: + 1) all tree is changed + 2) node and all subnodes are changed + + We need more fine grained firing. This change has been already discussed on + DevRev - see http://jupiter.czech.sun.com/wiki/view/Devrev/DevRevMeeting050118. + + + Index: debuggercore/viewmodel/manifest.mf =================================================================== RCS file: /cvs/debuggercore/viewmodel/manifest.mf,v retrieving revision 1.8 diff -u -r1.8 manifest.mf --- debuggercore/viewmodel/manifest.mf 9 Nov 2004 21:01:07 -0000 1.8 +++ debuggercore/viewmodel/manifest.mf 1 Apr 2005 13:57:01 -0000 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.spi.viewmodel/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/viewmodel/Bundle.properties -OpenIDE-Module-Specification-Version: 1.3 +OpenIDE-Module-Specification-Version: 1.4 Index: debuggercore/viewmodel/src/org/netbeans/modules/viewmodel/TreeModelRoot.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/modules/viewmodel/TreeModelRoot.java,v retrieving revision 1.8 diff -u -r1.8 TreeModelRoot.java --- debuggercore/viewmodel/src/org/netbeans/modules/viewmodel/TreeModelRoot.java 19 Jan 2005 10:14:48 -0000 1.8 +++ debuggercore/viewmodel/src/org/netbeans/modules/viewmodel/TreeModelRoot.java 1 Apr 2005 13:57:01 -0000 @@ -21,7 +21,8 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelEvent; +import org.netbeans.spi.viewmodel.ModelListener; import org.openide.nodes.Node; import org.openide.util.HelpCtx; @@ -33,7 +34,7 @@ * * @author Jan Jancura */ -public class TreeModelRoot implements TreeModelListener { +public class TreeModelRoot implements ModelListener { /** generated Serialized Version UID */ static final long serialVersionUID = -1259352660663524178L; @@ -72,7 +73,7 @@ return (TreeModelNode) wr.get (); } - public void treeChanged () { + public void modelChanged (ModelEvent event) { SwingUtilities.invokeLater (new Runnable () { public void run () { if (model == null) @@ -90,15 +91,15 @@ // } } - public void treeNodeChanged (Object parent) { - final TreeModelNode tmn = findNode (parent); - if (tmn == null) return; - SwingUtilities.invokeLater (new Runnable () { - public void run () { - tmn.refresh (); - } - }); - } +// public void treeNodeChanged (Object parent) { +// final TreeModelNode tmn = findNode (parent); +// if (tmn == null) return; +// SwingUtilities.invokeLater (new Runnable () { +// public void run () { +// tmn.refresh (); +// } +// }); +// } public void destroy () { if (model != null) Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java =================================================================== RCS file: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java diff -N debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelEvent.java 1 Apr 2005 13:57:01 -0000 @@ -0,0 +1,120 @@ +/* + * Sun Public License Notice + * + * The contents of this file are subject to the Sun Public License + * Version 1.0 (the "License"). You may not use this file except in + * compliance with the License. A copy of the License is available at + * http://www.sun.com/ + * + * The Original Code is NetBeans. The Initial Developer of the Original + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun + * Microsystems, Inc. All Rights Reserved. + */ + +package org.netbeans.spi.viewmodel; + +import java.util.EventObject; + + +/** + * Encapsulates information describing changes to a model, and + * used to notify model listeners of the change. + * + * @author Jan Jancura + */ +public class ModelEvent extends EventObject { + + private ModelEvent (Object source) { + super (source); + } + + /** + * All three has been changed event. + */ + public static class TreeChanged extends ModelEvent { + + /** + * Creates a new instance of TreeChanged event. + * + * @param source a source if event. + */ + public TreeChanged (Object source) { + super (source); + } + } + + /** + * One cell in table has been changed event. + */ + public static class TableValueChanged extends ModelEvent { + + private Object node; + private String columnID; + + /** + * Creates a new instance of TableValueChanged event. + * + * @param source a source if event. + * @param node a changed node instance + * @param columnID a changed column name + */ + public TableValueChanged ( + Object source, + Object node, + String columnID + ) { + super (source); + this.node = node; + this.columnID = columnID; + } + + /** + * Returns changed node instance. + * + * @return changed node instance + */ + public Object getNode () { + return node; + } + + /** + * Returns changed column name. + * + * @return changed column name + */ + public String getColumnID () { + return columnID; + } + } + + /** + * Node has been changed event. + */ + public static class NodeChanged extends ModelEvent { + + private Object node; + + /** + * Creates a new instance of NodeChanged event. + * + * @param source a source if event. + * @param node a changed node instance + */ + public NodeChanged ( + Object source, + Object node + ) { + super (source); + this.node = node; + } + + /** + * Returns changed node instance. + * + * @return changed node instance + */ + public Object getNode () { + return node; + } + } +} Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelListener.java =================================================================== RCS file: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelListener.java diff -N debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelListener.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/ModelListener.java 1 Apr 2005 13:57:01 -0000 @@ -0,0 +1,32 @@ +/* + * Sun Public License Notice + * + * The contents of this file are subject to the Sun Public License + * Version 1.0 (the "License"). You may not use this file except in + * compliance with the License. A copy of the License is available at + * http://www.sun.com/ + * + * The Original Code is NetBeans. The Initial Developer of the Original + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun + * Microsystems, Inc. All Rights Reserved. + */ + +package org.netbeans.spi.viewmodel; + +import java.util.EventListener; + + +/** + * Notifies about changes in view model. + * + * @author Jan Jancura + */ +public interface ModelListener extends EventListener { + + /** + * View model is changed notification. + * + * @param event an event object describing change + */ + public void modelChanged (ModelEvent event); +} Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/Models.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/Models.java,v retrieving revision 1.14 diff -u -r1.14 Models.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/Models.java 27 Mar 2005 12:03:40 -0000 1.14 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/Models.java 1 Apr 2005 13:57:02 -0000 @@ -40,7 +40,7 @@ import org.netbeans.spi.viewmodel.TableModelFilter; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.nodes.Node; @@ -511,7 +511,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { filter.addTreeModelListener (l); model.addTreeModelListener (l); } @@ -521,7 +521,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { filter.removeTreeModelListener (l); model.removeTreeModelListener (l); } @@ -603,7 +603,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { filter.addTreeModelListener (l); model.addTreeModelListener (l); } @@ -613,7 +613,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { filter.removeTreeModelListener (l); model.removeTreeModelListener (l); } @@ -714,7 +714,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { filter.addTreeModelListener (l); model.addTreeModelListener (l); } @@ -724,7 +724,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { filter.removeTreeModelListener (l); model.removeTreeModelListener (l); } @@ -891,7 +891,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].addTreeModelListener (l); @@ -902,7 +902,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].removeTreeModelListener (l); @@ -1000,7 +1000,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { filter.addTreeModelListener (l); model.addTreeModelListener (l); } @@ -1010,7 +1010,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { filter.removeTreeModelListener (l); model.removeTreeModelListener (l); } @@ -1164,7 +1164,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].addTreeModelListener (l); @@ -1175,7 +1175,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].removeTreeModelListener (l); @@ -1447,7 +1447,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].addTreeModelListener (l); @@ -1458,7 +1458,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].removeTreeModelListener (l); @@ -1535,7 +1535,7 @@ * * @param l the listener to be added */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -1543,7 +1543,7 @@ * * @param l the listener to be removed */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } @@ -1595,7 +1595,7 @@ * * @param l the listener to be added */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -1603,7 +1603,7 @@ * * @param l the listener to be removed */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } @@ -1673,7 +1673,7 @@ * * @param l the listener to be added */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -1681,7 +1681,7 @@ * * @param l the listener to be removed */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } @@ -1722,7 +1722,7 @@ * * @param l the listener to be added */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -1730,7 +1730,7 @@ * * @param l the listener to be removed */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } @@ -1856,7 +1856,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].addTreeModelListener (l); @@ -1867,7 +1867,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { int i, k = models.length; for (i = 0; i < k; i++) models [i].removeTreeModelListener (l); @@ -2160,7 +2160,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { treeModel.addTreeModelListener (l); nodeModel.addTreeModelListener (l); nodeActionsProvider.addTreeModelListener (l); @@ -2172,7 +2172,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { treeModel.removeTreeModelListener (l); nodeModel.removeTreeModelListener (l); nodeActionsProvider.removeTreeModelListener (l); Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProvider.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProvider.java,v retrieving revision 1.3 diff -u -r1.3 NodeActionsProvider.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProvider.java 19 Jan 2005 10:14:49 -0000 1.3 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProvider.java 1 Apr 2005 13:57:02 -0000 @@ -50,12 +50,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProviderFilter.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProviderFilter.java,v retrieving revision 1.4 diff -u -r1.4 NodeActionsProviderFilter.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProviderFilter.java 19 Jan 2005 10:14:49 -0000 1.4 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeActionsProviderFilter.java 1 Apr 2005 13:57:02 -0000 @@ -56,12 +56,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModel.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModel.java,v retrieving revision 1.5 diff -u -r1.5 NodeModel.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModel.java 27 Mar 2005 12:03:40 -0000 1.5 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModel.java 1 Apr 2005 13:57:02 -0000 @@ -55,12 +55,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModelFilter.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModelFilter.java,v retrieving revision 1.6 diff -u -r1.6 NodeModelFilter.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModelFilter.java 27 Mar 2005 12:03:40 -0000 1.6 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/NodeModelFilter.java 1 Apr 2005 13:57:02 -0000 @@ -61,12 +61,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModel.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModel.java,v retrieving revision 1.5 diff -u -r1.5 TableModel.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModel.java 27 Mar 2005 12:03:40 -0000 1.5 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModel.java 1 Apr 2005 13:57:02 -0000 @@ -79,12 +79,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModelFilter.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModelFilter.java,v retrieving revision 1.6 diff -u -r1.6 TableModelFilter.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModelFilter.java 27 Mar 2005 12:03:41 -0000 1.6 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TableModelFilter.java 1 Apr 2005 13:57:02 -0000 @@ -94,12 +94,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModel.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModel.java,v retrieving revision 1.6 diff -u -r1.6 TreeModel.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModel.java 19 Jan 2005 10:14:50 -0000 1.6 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModel.java 1 Apr 2005 13:57:02 -0000 @@ -78,12 +78,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelEvent.java =================================================================== RCS file: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelEvent.java diff -N debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelEvent.java Index: debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelFilter.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelFilter.java,v retrieving revision 1.7 diff -u -r1.7 TreeModelFilter.java --- debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelFilter.java 27 Mar 2005 12:03:41 -0000 1.7 +++ debuggercore/viewmodel/src/org/netbeans/spi/viewmodel/TreeModelFilter.java 1 Apr 2005 13:57:02 -0000 @@ -87,12 +87,12 @@ * * @param l the listener to add */ - public abstract void addTreeModelListener (TreeModelListener l); + public abstract void addTreeModelListener (ModelListener l); /** * Unregisters given listener. * * @param l the listener to remove */ - public abstract void removeTreeModelListener (TreeModelListener l); + public abstract void removeTreeModelListener (ModelListener l); } Index: debuggercore/viewmodel/test/unit/src/org/netbeans/api/viewmodel/BasicTest.java =================================================================== RCS file: /cvs/debuggercore/viewmodel/test/unit/src/org/netbeans/api/viewmodel/BasicTest.java,v retrieving revision 1.4 diff -u -r1.4 BasicTest.java --- debuggercore/viewmodel/test/unit/src/org/netbeans/api/viewmodel/BasicTest.java 27 Mar 2005 12:03:41 -0000 1.4 +++ debuggercore/viewmodel/test/unit/src/org/netbeans/api/viewmodel/BasicTest.java 1 Apr 2005 13:57:02 -0000 @@ -330,7 +330,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -339,7 +339,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -347,7 +347,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } } } Index: debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcesNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcesNodeModel.java,v retrieving revision 1.4 diff -u -r1.4 SourcesNodeModel.java --- debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcesNodeModel.java 10 Aug 2004 12:46:11 -0000 1.4 +++ debuggerjpda/ant/src/org/netbeans/modules/debugger/projects/SourcesNodeModel.java 1 Apr 2005 13:57:02 -0000 @@ -21,7 +21,7 @@ import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; @@ -83,9 +83,9 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java,v retrieving revision 1.24 diff -u -r1.24 AbstractVariable.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java 29 Mar 2005 15:40:55 -0000 1.24 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/AbstractVariable.java 1 Apr 2005 13:57:02 -0000 @@ -113,7 +113,7 @@ // set new value to this model setInnerValue (value); // refresh tree - getModel().fireNodeChanged (this); + getModel ().fireTableValueChangedChanged (this, null); } protected void setValue (Value value) throws InvalidExpressionException { Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicCallStackTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicCallStackTreeModel.java,v retrieving revision 1.6 diff -u -r1.6 BasicCallStackTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicCallStackTreeModel.java 7 Jan 2005 09:33:22 -0000 1.6 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicCallStackTreeModel.java 1 Apr 2005 13:57:02 -0000 @@ -34,7 +34,7 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -141,14 +141,14 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); if (listener == null) { listener = new Listener (this, debugger); } } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); if (listeners.size () == 0) { listener.destroy (); @@ -160,7 +160,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } /** Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicThreadsTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicThreadsTreeModel.java,v retrieving revision 1.5 diff -u -r1.5 BasicThreadsTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicThreadsTreeModel.java 7 Jan 2005 09:33:22 -0000 1.5 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/BasicThreadsTreeModel.java 1 Apr 2005 13:57:02 -0000 @@ -32,7 +32,7 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -126,14 +126,14 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); if (listener == null) { listener = new Listener (this, debugger); } } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); if (listeners.size () == 0) { listener.destroy (); @@ -145,7 +145,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } /** Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/CallStackTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/CallStackTreeModel.java,v retrieving revision 1.9 diff -u -r1.9 CallStackTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/CallStackTreeModel.java 7 Jan 2005 09:33:22 -0000 1.9 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/CallStackTreeModel.java 1 Apr 2005 13:57:02 -0000 @@ -33,7 +33,7 @@ import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.debugger.jpda.JPDAThread; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -152,7 +152,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { //listeners.add (l); model.addTreeModelListener (l); } @@ -161,7 +161,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { //listeners.remove (l); model.removeTreeModelListener (l); } Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/ClassesTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/ClassesTreeModel.java,v retrieving revision 1.8 diff -u -r1.8 ClassesTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/ClassesTreeModel.java 7 Jan 2005 09:33:22 -0000 1.8 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/ClassesTreeModel.java 1 Apr 2005 13:57:02 -0000 @@ -54,7 +54,7 @@ import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.debugger.jpda.Variable; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -152,13 +152,13 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); if (listener == null) listener = new Listener (this, debugger); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); if (listeners.size () == 0) { listener.destroy (); @@ -173,7 +173,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAObjectWatchImpl.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAObjectWatchImpl.java,v retrieving revision 1.4 diff -u -r1.4 JPDAObjectWatchImpl.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAObjectWatchImpl.java 22 Dec 2004 13:41:21 -0000 1.4 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAObjectWatchImpl.java 1 Apr 2005 13:57:03 -0000 @@ -112,7 +112,7 @@ // set new value to this model setInnerValue (value); // refresh tree - model.fireNodeChanged (this); + model.fireTableValueChangedChanged (this, null); } protected void setValue (final Value value) Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAWatchImpl.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAWatchImpl.java,v retrieving revision 1.5 diff -u -r1.5 JPDAWatchImpl.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAWatchImpl.java 2 Aug 2004 12:00:44 -0000 1.5 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/JPDAWatchImpl.java 1 Apr 2005 13:57:03 -0000 @@ -114,7 +114,7 @@ // set new value to this model setInnerValue (value); // refresh tree - model.fireNodeChanged (this); + model.fireTableValueChangedChanged (this, null); } void setInnerValue (Value v) { Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/LocalsTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/LocalsTreeModel.java,v retrieving revision 1.23 diff -u -r1.23 LocalsTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/LocalsTreeModel.java 29 Mar 2005 15:16:14 -0000 1.23 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/LocalsTreeModel.java 1 Apr 2005 13:57:03 -0000 @@ -33,8 +33,9 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.debugger.jpda.Variable; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -158,13 +159,13 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); if (listener == null) listener = new Listener (this, debugger); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); if (listeners.size () == 0) { listener.destroy (); @@ -176,14 +177,18 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TreeChanged (this) + ); } - void fireNodeChanged (Object n) { + void fireTableValueChangedChanged (Object node, String propertyName) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (n); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TableValueChanged (this, node, propertyName) + ); } Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/TranslatingTreeModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/TranslatingTreeModel.java,v retrieving revision 1.5 diff -u -r1.5 TranslatingTreeModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/TranslatingTreeModel.java 7 Jan 2005 09:33:22 -0000 1.5 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/TranslatingTreeModel.java 1 Apr 2005 13:57:03 -0000 @@ -18,7 +18,8 @@ import java.util.WeakHashMap; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelEvent; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -165,7 +166,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -174,36 +175,21 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } - void fireTreeChanged () { + void fireModelChanged (ModelEvent event) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (event); } - void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); - } - - private class Listener implements TreeModelListener { - - public void treeNodeChanged (Object node) { - try { - fireTreeNodeChanged (translate (node)); - } catch (UnknownTypeException e) { - } - } + private class Listener implements ModelListener { - public void treeChanged () { - fireTreeChanged (); + public void modelChanged (ModelEvent event) { + fireModelChanged (event); } - } } Index: debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/WatchesModel.java =================================================================== RCS file: /cvs/debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/WatchesModel.java,v retrieving revision 1.15 diff -u -r1.15 WatchesModel.java --- debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/WatchesModel.java 2 Mar 2005 15:25:40 -0000 1.15 +++ debuggerjpda/src/org/netbeans/modules/debugger/jpda/models/WatchesModel.java 1 Apr 2005 13:57:03 -0000 @@ -31,8 +31,9 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.debugger.jpda.JPDAWatch; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.JPDADebuggerImpl; @@ -161,11 +162,11 @@ return getLocalsTreeModel ().isLeaf (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -173,14 +174,16 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); + ((ModelListener) v.get (i)).modelChanged (null); } - void fireNodeChanged (JPDAWatch w) { + void fireTableValueChangedChanged (Object node, String propertyName) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (w); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TableValueChanged (this, node, propertyName) + ); } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/FixedWatchesManager.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/FixedWatchesManager.java,v retrieving revision 1.12 diff -u -r1.12 FixedWatchesManager.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/FixedWatchesManager.java 19 Jan 2005 10:15:04 -0000 1.12 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/FixedWatchesManager.java 1 Apr 2005 13:57:03 -0000 @@ -147,14 +147,14 @@ return original.isLeaf (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { HashSet newListeners = (listeners == null) ? new HashSet () : (HashSet) listeners.clone (); newListeners.add (l); listeners = newListeners; } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { if (listeners == null) return; HashSet newListeners = (HashSet) listeners.clone (); newListeners.remove (l); @@ -252,8 +252,8 @@ private void fireModelChanged () { if (listeners == null) return; for (Iterator i = listeners.iterator (); i.hasNext ();) { - TreeModelListener listener = (TreeModelListener) i.next(); - listener.treeChanged();; + ModelListener listener = (ModelListener) i.next(); + listener.modelChanged(null);; } } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BoldVariablesTableModelFilterFirst.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BoldVariablesTableModelFilterFirst.java,v retrieving revision 1.4 diff -u -r1.4 BoldVariablesTableModelFilterFirst.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BoldVariablesTableModelFilterFirst.java 10 Feb 2005 12:33:45 -0000 1.4 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BoldVariablesTableModelFilterFirst.java 1 Apr 2005 13:57:03 -0000 @@ -20,7 +20,7 @@ import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; import org.netbeans.spi.viewmodel.TableModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -82,7 +82,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -90,7 +90,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private String bold (Object variable, String value, Map map) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsActionsProvider.java,v retrieving revision 1.8 diff -u -r1.8 BreakpointsActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsActionsProvider.java 7 Oct 2004 16:01:28 -0000 1.8 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsActionsProvider.java 1 Apr 2005 13:57:03 -0000 @@ -27,7 +27,7 @@ import org.netbeans.api.debugger.jpda.MethodBreakpoint; import org.netbeans.api.debugger.jpda.ThreadBreakpoint; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.spi.viewmodel.Models; @@ -106,10 +106,10 @@ original.performDefaultAction (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private static void customize (Breakpoint b) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsNodeModel.java,v retrieving revision 1.7 diff -u -r1.7 BreakpointsNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsNodeModel.java 10 Feb 2005 10:35:27 -0000 1.7 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsNodeModel.java 1 Apr 2005 13:57:03 -0000 @@ -28,9 +28,11 @@ import org.netbeans.api.debugger.jpda.ThreadBreakpoint; import org.netbeans.modules.debugger.jpda.ui.EditorContextBridge; import org.netbeans.spi.debugger.ContextProvider; +import org.netbeans.spi.debugger.ui.Constants; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -372,7 +374,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -380,7 +382,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -391,11 +393,14 @@ // ((TreeModelListener) v.get (i)).treeChanged (); // } // - private void fireTreeNodeChanged (Object parent) { + + void fireNodeChanged (JPDABreakpoint b) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.NodeChanged (this, b) + ); } static String getShort (String s) { @@ -419,9 +424,9 @@ public void setCurrentBreakpoint (JPDABreakpoint currentBreakpoint) { if (this.currentBreakpoint != null) - fireTreeNodeChanged (this.currentBreakpoint); + fireNodeChanged (this.currentBreakpoint); this.currentBreakpoint = currentBreakpoint; if (currentBreakpoint != null) - fireTreeNodeChanged (currentBreakpoint); + fireNodeChanged (currentBreakpoint); } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsTreeModelFilter.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsTreeModelFilter.java,v retrieving revision 1.7 diff -u -r1.7 BreakpointsTreeModelFilter.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsTreeModelFilter.java 1 Mar 2005 13:58:19 -0000 1.7 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/BreakpointsTreeModelFilter.java 1 Apr 2005 13:57:03 -0000 @@ -20,7 +20,7 @@ import org.netbeans.api.debugger.jpda.JPDABreakpoint; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -122,7 +122,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -130,6 +130,6 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackActionsProvider.java,v retrieving revision 1.10 diff -u -r1.10 CallStackActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackActionsProvider.java 7 Jan 2005 09:33:25 -0000 1.10 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackActionsProvider.java 1 Apr 2005 13:57:03 -0000 @@ -27,7 +27,7 @@ import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.api.debugger.jpda.JPDAThread; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; @@ -111,10 +111,10 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private static void popToHere (final CallStackFrame frame) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackNodeModel.java,v retrieving revision 1.8 diff -u -r1.8 CallStackNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackNodeModel.java 10 Feb 2005 10:35:27 -0000 1.8 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackNodeModel.java 1 Apr 2005 13:57:03 -0000 @@ -27,7 +27,7 @@ import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -105,7 +105,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -113,7 +113,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -121,14 +121,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged (null); } public static String getCSFName ( Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackTableModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackTableModel.java,v retrieving revision 1.2 diff -u -r1.2 CallStackTableModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackTableModel.java 7 Jan 2005 09:33:25 -0000 1.2 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/CallStackTableModel.java 1 Apr 2005 13:57:03 -0000 @@ -17,7 +17,7 @@ import org.netbeans.api.debugger.jpda.CallStackFrame; import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -67,7 +67,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -75,6 +75,6 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ClassesNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ClassesNodeModel.java,v retrieving revision 1.4 diff -u -r1.4 ClassesNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ClassesNodeModel.java 13 Jul 2004 15:41:25 -0000 1.4 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ClassesNodeModel.java 1 Apr 2005 13:57:04 -0000 @@ -19,7 +19,7 @@ import com.sun.jdi.ReferenceType; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -136,14 +136,14 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/JPDASessionActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/JPDASessionActionsProvider.java,v retrieving revision 1.2 diff -u -r1.2 JPDASessionActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/JPDASessionActionsProvider.java 21 Jun 2004 20:38:07 -0000 1.2 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/JPDASessionActionsProvider.java 1 Apr 2005 13:57:04 -0000 @@ -16,7 +16,7 @@ import org.netbeans.spi.viewmodel.NodeActionsProviderFilter; import org.netbeans.spi.viewmodel.NodeActionsProvider; import org.netbeans.spi.viewmodel.UnknownTypeException; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.api.debugger.Session; import org.netbeans.api.debugger.jpda.JPDADebugger; import org.netbeans.spi.debugger.ContextProvider; @@ -146,13 +146,13 @@ } } - public void addTreeModelListener(TreeModelListener l) { + public void addTreeModelListener(ModelListener l) { HashSet newListeners = (listeners == null) ? new HashSet() : (HashSet) listeners.clone(); newListeners.add(l); listeners = newListeners; } - public void removeTreeModelListener(TreeModelListener l) { + public void removeTreeModelListener(ModelListener l) { if (listeners == null) return; HashSet newListeners = (HashSet) listeners.clone(); newListeners.remove(l); Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/MonitorModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/MonitorModel.java,v retrieving revision 1.11 diff -u -r1.11 MonitorModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/MonitorModel.java 22 Feb 2005 15:40:10 -0000 1.11 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/MonitorModel.java 1 Apr 2005 13:57:04 -0000 @@ -30,7 +30,7 @@ import org.netbeans.spi.viewmodel.TableModel; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -228,10 +228,10 @@ return model.getIconBase (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/NumericDisplayFilter.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/NumericDisplayFilter.java,v retrieving revision 1.6 diff -u -r1.6 NumericDisplayFilter.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/NumericDisplayFilter.java 31 Jan 2005 14:04:04 -0000 1.6 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/NumericDisplayFilter.java 1 Apr 2005 13:57:04 -0000 @@ -75,14 +75,14 @@ original.setValueAt(node, columnID, value); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { HashSet newListeners = (listeners == null) ? new HashSet () : (HashSet) listeners.clone (); newListeners.add (l); listeners = newListeners; } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { if (listeners == null) return; HashSet newListeners = (HashSet) listeners.clone(); newListeners.remove (l); @@ -338,8 +338,8 @@ private void fireModelChanged () { if (listeners == null) return; for (Iterator i = listeners.iterator (); i.hasNext ();) { - TreeModelListener listener = (TreeModelListener) i.next (); - listener.treeChanged (); + ModelListener listener = (ModelListener) i.next (); + listener.modelChanged (null); } } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SessionsTableModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SessionsTableModel.java,v retrieving revision 1.3 diff -u -r1.3 SessionsTableModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SessionsTableModel.java 20 Jan 2005 20:57:12 -0000 1.3 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SessionsTableModel.java 1 Apr 2005 13:57:04 -0000 @@ -22,7 +22,7 @@ import org.netbeans.spi.debugger.ContextProvider; import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -109,7 +109,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -118,7 +118,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -126,14 +126,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged (null); } private static final Integer SD = new Integer Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SourcesModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SourcesModel.java,v retrieving revision 1.13 diff -u -r1.13 SourcesModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SourcesModel.java 7 Jan 2005 09:33:25 -0000 1.13 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/SourcesModel.java 1 Apr 2005 13:57:04 -0000 @@ -31,7 +31,7 @@ import org.netbeans.spi.viewmodel.NodeActionsProvider; import org.netbeans.spi.viewmodel.TableModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -137,11 +137,11 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -149,14 +149,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - public void fireNodeChanged (Breakpoint b) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (b); + ((ModelListener) v.get (i)).modelChanged (null); } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsActionsProvider.java,v retrieving revision 1.7 diff -u -r1.7 ThreadsActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsActionsProvider.java 18 Oct 2004 14:57:51 -0000 1.7 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsActionsProvider.java 1 Apr 2005 13:57:04 -0000 @@ -26,7 +26,7 @@ import org.netbeans.modules.debugger.jpda.ui.EditorContextBridge; import org.netbeans.modules.debugger.jpda.ui.SourcePath; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; @@ -177,14 +177,14 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private static boolean isGoToSourceSupported (JPDAThread t) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsNodeModel.java,v retrieving revision 1.9 diff -u -r1.9 ThreadsNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsNodeModel.java 10 Feb 2005 10:35:27 -0000 1.9 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsNodeModel.java 1 Apr 2005 13:57:04 -0000 @@ -30,7 +30,7 @@ import org.netbeans.api.debugger.jpda.ObjectVariable; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -197,7 +197,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -205,7 +205,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } @@ -213,14 +213,7 @@ Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeChanged (); - } - - private void fireTreeNodeChanged (Object parent) { - Vector v = (Vector) listeners.clone (); - int i, k = v.size (); - for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (parent); + ((ModelListener) v.get (i)).modelChanged (null); } private boolean isCurrent (JPDAThreadGroup tg) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsTableModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsTableModel.java,v retrieving revision 1.3 diff -u -r1.3 ThreadsTableModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsTableModel.java 3 Jan 2005 15:33:51 -0000 1.3 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/ThreadsTableModel.java 1 Apr 2005 13:57:04 -0000 @@ -17,8 +17,9 @@ import org.netbeans.api.debugger.jpda.JPDAThread; import org.netbeans.api.debugger.jpda.JPDAThreadGroup; import org.netbeans.spi.debugger.ui.Constants; +import org.netbeans.spi.viewmodel.ModelEvent; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -123,7 +124,7 @@ ((JPDAThreadGroup) row).suspend (); else ((JPDAThreadGroup) row).resume (); - refresh (row); + fireTableValueChanged (row, Constants.THREAD_SUSPENDED_COLUMN_ID); return; } } @@ -133,6 +134,7 @@ ((JPDAThread) row).suspend (); else ((JPDAThread) row).resume (); + fireTableValueChanged (row, Constants.THREAD_SUSPENDED_COLUMN_ID); return; } } @@ -144,7 +146,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { listeners.add (l); } @@ -153,14 +155,16 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { listeners.remove (l); } - private void refresh (Object node) { + private void fireTableValueChanged (Object o, String propertyName) { Vector v = (Vector) listeners.clone (); int i, k = v.size (); for (i = 0; i < k; i++) - ((TreeModelListener) v.get (i)).treeNodeChanged (node); + ((ModelListener) v.get (i)).modelChanged ( + new ModelEvent.TableValueChanged (this, o, propertyName) + ); } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesActionsProvider.java,v retrieving revision 1.8 diff -u -r1.8 VariablesActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesActionsProvider.java 2 Sep 2004 12:28:50 -0000 1.8 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesActionsProvider.java 1 Apr 2005 13:57:04 -0000 @@ -20,7 +20,7 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.NodeActionsProvider; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.ui.SourcePath; @@ -90,14 +90,14 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } public void goToSource (Field variable) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesNodeModel.java,v retrieving revision 1.7 diff -u -r1.7 VariablesNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesNodeModel.java 2 Sep 2004 12:28:50 -0000 1.7 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesNodeModel.java 1 Apr 2005 13:57:04 -0000 @@ -26,7 +26,7 @@ import org.netbeans.api.debugger.jpda.This; import org.netbeans.spi.viewmodel.NodeModel; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -166,9 +166,9 @@ throw new UnknownTypeException (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTableModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTableModel.java,v retrieving revision 1.7 diff -u -r1.7 VariablesTableModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTableModel.java 30 Mar 2005 12:47:38 -0000 1.7 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTableModel.java 1 Apr 2005 13:57:04 -0000 @@ -24,7 +24,7 @@ import org.netbeans.api.debugger.jpda.Variable; import org.netbeans.spi.debugger.ui.Constants; import org.netbeans.spi.viewmodel.TableModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -162,7 +162,7 @@ * * @param l the listener to add */ - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } /** @@ -170,7 +170,7 @@ * * @param l the listener to remove */ - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } static String getShort (String c) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilter.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilter.java,v retrieving revision 1.5 diff -u -r1.5 VariablesTreeModelFilter.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilter.java 7 Jan 2005 09:33:26 -0000 1.5 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilter.java 1 Apr 2005 13:57:04 -0000 @@ -29,7 +29,7 @@ import org.netbeans.spi.viewmodel.TableModelFilter; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -126,10 +126,10 @@ return vf.isLeaf (original, (Variable) node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java,v retrieving revision 1.9 diff -u -r1.9 VariablesTreeModelFilterSI.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java 7 Jan 2005 09:33:26 -0000 1.9 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java 1 Apr 2005 13:57:04 -0000 @@ -28,7 +28,7 @@ import org.netbeans.spi.viewmodel.TableModel; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; //import org.netbeans.modules.debugger.jpda.ui.FixedWatch; import org.openide.util.NbBundle; @@ -196,10 +196,10 @@ return (node instanceof SpecialNode) ? false : original.isLeaf(node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesActionsProvider.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesActionsProvider.java,v retrieving revision 1.6 diff -u -r1.6 WatchesActionsProvider.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesActionsProvider.java 26 Aug 2004 14:06:13 -0000 1.6 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesActionsProvider.java 1 Apr 2005 13:57:05 -0000 @@ -24,7 +24,7 @@ import org.netbeans.spi.viewmodel.Models; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.NodeActionsProvider; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.netbeans.modules.debugger.jpda.ui.WatchPanel; import org.openide.util.NbBundle; @@ -112,10 +112,10 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } private static void customize (JPDAWatch w) { Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesNodeModel.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesNodeModel.java,v retrieving revision 1.9 diff -u -r1.9 WatchesNodeModel.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesNodeModel.java 22 Mar 2005 12:25:47 -0000 1.9 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/models/WatchesNodeModel.java 1 Apr 2005 13:57:05 -0000 @@ -17,7 +17,7 @@ import org.netbeans.api.debugger.jpda.InvalidExpressionException; import org.netbeans.api.debugger.jpda.JPDAWatch; import org.netbeans.spi.viewmodel.TreeModel; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; import org.openide.util.NbBundle; @@ -74,9 +74,9 @@ return super.getIconBase (o); } - public void addTreeModelListener (TreeModelListener l) { + public void addTreeModelListener (ModelListener l) { } - public void removeTreeModelListener (TreeModelListener l) { + public void removeTreeModelListener (ModelListener l) { } } Index: debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ViewModelListener.java =================================================================== RCS file: /cvs/debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ViewModelListener.java,v retrieving revision 1.6 diff -u -r1.6 ViewModelListener.java --- debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ViewModelListener.java 21 Feb 2005 12:14:06 -0000 1.6 +++ debuggerjpda/ui/src/org/netbeans/modules/debugger/jpda/ui/views/ViewModelListener.java 1 Apr 2005 13:57:05 -0000 @@ -37,7 +37,7 @@ import org.netbeans.spi.viewmodel.TreeExpansionModel; import org.netbeans.spi.viewmodel.TreeModel; import org.netbeans.spi.viewmodel.TreeModelFilter; -import org.netbeans.spi.viewmodel.TreeModelListener; +import org.netbeans.spi.viewmodel.ModelListener; import org.netbeans.spi.viewmodel.UnknownTypeException; @@ -150,7 +150,7 @@ throw new UnknownTypeException (node); } - public void addTreeModelListener (TreeModelListener l) {} - public void removeTreeModelListener (TreeModelListener l) {} + public void addTreeModelListener (ModelListener l) {} + public void removeTreeModelListener (ModelListener l) {} } }