Index: openide/src/org/openide/explorer/propertysheet/PropertySetModelImpl.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertySetModelImpl.java,v retrieving revision 1.9 diff -u -r1.9 PropertySetModelImpl.java --- openide/src/org/openide/explorer/propertysheet/PropertySetModelImpl.java 22 Feb 2004 11:55:48 -0000 1.9 +++ openide/src/org/openide/explorer/propertysheet/PropertySetModelImpl.java 8 Apr 2004 13:24:36 -0000 @@ -66,16 +66,16 @@ setPropertySets (ps); } - public synchronized int getCount() { + public int getCount() { return fds.size(); } - public synchronized FeatureDescriptor getFeatureDescriptor(int index) { + public FeatureDescriptor getFeatureDescriptor(int index) { if (index == -1) return null; return (FeatureDescriptor) fds.get(index); } - public synchronized int indexOf(FeatureDescriptor fd) { + public int indexOf(FeatureDescriptor fd) { return fds.indexOf (fd); } @@ -93,7 +93,7 @@ } } - public synchronized void setPropertySets(PropertySet[] sets) { + public void setPropertySets(PropertySet[] sets) { setCount = sets == null ? 0 : sets.length; if (sets == null) sets = new PropertySet[0]; Index: openide/src/org/openide/explorer/propertysheet/PropertySheet.java =================================================================== RCS file: /cvs/openide/src/org/openide/explorer/propertysheet/PropertySheet.java,v retrieving revision 1.158 diff -u -r1.158 PropertySheet.java --- openide/src/org/openide/explorer/propertysheet/PropertySheet.java 29 Feb 2004 03:24:30 -0000 1.158 +++ openide/src/org/openide/explorer/propertysheet/PropertySheet.java 8 Apr 2004 13:24:36 -0000 @@ -1036,8 +1036,12 @@ } public void nodeDestroyed(org.openide.nodes.NodeEvent ev) { - detach(); - getTable().getPropertySetModel().setPropertySets(null); + Mutex.EVENT.readAccess(new Runnable() { + public void run() { + detach(); + getTable().getPropertySetModel().setPropertySets(null); + } + }); } private class PCL implements PropertyChangeListener {