1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-19 06:05:56 +02:00

[234057] Wrong or missing model change event

This commit is contained in:
David McKnight 2008-05-28 22:27:00 +00:00
parent c10c3e7577
commit 084217df5e

View file

@ -51,6 +51,7 @@
* Martin Oberhuber (Wind River) - [228774] Improve ElementComparer Performance * Martin Oberhuber (Wind River) - [228774] Improve ElementComparer Performance
* David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE * David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE
* David McKnight (IBM) - [229116] NPE in when editing remote file in new workspace * David McKnight (IBM) - [229116] NPE in when editing remote file in new workspace
* David McKnight (IBM) - [234057] Wrong or missing model change event
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.core.model; package org.eclipse.rse.internal.core.model;
@ -122,8 +123,7 @@ public class SystemRegistry implements ISystemRegistry
private final SystemPreferenceChangeManager preferenceListManager = new SystemPreferenceChangeManager(); private final SystemPreferenceChangeManager preferenceListManager = new SystemPreferenceChangeManager();
private final SystemModelChangeEventManager modelListenerManager = new SystemModelChangeEventManager(); private final SystemModelChangeEventManager modelListenerManager = new SystemModelChangeEventManager();
private final SystemRemoteChangeEventManager remoteListManager = new SystemRemoteChangeEventManager(); private final SystemRemoteChangeEventManager remoteListManager = new SystemRemoteChangeEventManager();
private SystemModelChangeEvent modelEvent;
private SystemRemoteChangeEvent remoteEvent;
private int listenerCount = 0; private int listenerCount = 0;
private int modelListenerCount = 0; private int modelListenerCount = 0;
private int remoteListCount = 0; private int remoteListCount = 0;
@ -2487,8 +2487,7 @@ public class SystemRegistry implements ISystemRegistry
*/ */
public void fireModelChangeEvent(int eventType, int resourceType, Object resource, String oldName) public void fireModelChangeEvent(int eventType, int resourceType, Object resource, String oldName)
{ {
if (modelEvent == null) SystemModelChangeEvent modelEvent = new SystemModelChangeEvent();
modelEvent = new SystemModelChangeEvent();
modelEvent.setEventType(eventType); modelEvent.setEventType(eventType);
modelEvent.setResourceType(resourceType); modelEvent.setResourceType(resourceType);
modelEvent.setResource(resource); modelEvent.setResource(resource);
@ -2581,8 +2580,7 @@ public class SystemRegistry implements ISystemRegistry
// mark stale any filters that reference this object // mark stale any filters that reference this object
invalidateFiltersFor(resourceParent, subsystem); invalidateFiltersFor(resourceParent, subsystem);
if (remoteEvent == null) SystemRemoteChangeEvent remoteEvent = new SystemRemoteChangeEvent();
remoteEvent = new SystemRemoteChangeEvent();
remoteEvent.setEventType(eventType); remoteEvent.setEventType(eventType);
remoteEvent.setResource(resource); remoteEvent.setResource(resource);
remoteEvent.setResourceParent(resourceParent); remoteEvent.setResourceParent(resourceParent);
@ -2620,8 +2618,7 @@ public class SystemRegistry implements ISystemRegistry
// mark stale any filters that reference this object // mark stale any filters that reference this object
invalidateFiltersFor(resourceParent, subsystem); invalidateFiltersFor(resourceParent, subsystem);
//if (remoteEvent == null) SystemRemoteChangeEvent remoteEvent = new SystemRemoteChangeEvent();
remoteEvent = new SystemRemoteChangeEvent();
remoteEvent.setEventType(eventType); remoteEvent.setEventType(eventType);
remoteEvent.setResource(resource); remoteEvent.setResource(resource);
remoteEvent.setResourceParent(resourceParent); remoteEvent.setResourceParent(resourceParent);
@ -2659,8 +2656,7 @@ public class SystemRegistry implements ISystemRegistry
// mark stale any filters that reference this object // mark stale any filters that reference this object
invalidateFiltersFor(resourceParent, subsystem); invalidateFiltersFor(resourceParent, subsystem);
if (remoteEvent == null) SystemRemoteChangeEvent remoteEvent = new SystemRemoteChangeEvent();
remoteEvent = new SystemRemoteChangeEvent();
remoteEvent.setOperation(operation); remoteEvent.setOperation(operation);
remoteEvent.setEventType(eventType); remoteEvent.setEventType(eventType);
remoteEvent.setResource(resource); remoteEvent.setResource(resource);
@ -2700,8 +2696,7 @@ public class SystemRegistry implements ISystemRegistry
// mark stale any filters that reference this object // mark stale any filters that reference this object
invalidateFiltersFor(resourceParent, subsystem); invalidateFiltersFor(resourceParent, subsystem);
if (remoteEvent == null) SystemRemoteChangeEvent remoteEvent = new SystemRemoteChangeEvent();
remoteEvent = new SystemRemoteChangeEvent();
remoteEvent.setOperation(operation); remoteEvent.setOperation(operation);
remoteEvent.setEventType(eventType); remoteEvent.setEventType(eventType);
remoteEvent.setResource(resource); remoteEvent.setResource(resource);