[219303] No notifications after editing web 2.5 models using model provider - fixed. Added listeners were disposed.
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java
index fe5fbc4..d16c3f7 100644
--- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java
+++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3MergedModelProviderFactory.java
@@ -10,11 +10,14 @@
***********************************************************************/
package org.eclipse.jst.jee.model.internal;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import org.eclipse.core.resources.IProject;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.IModelProviderFactory;
+import org.eclipse.jst.j2ee.model.IModelProviderListener;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
/**
@@ -28,11 +31,25 @@
public IModelProvider create(IProject project) {
IModelProvider result = getResource(project);
if(result == null || ((EJB3MergedModelProvider)result).isDisposed()){
+ Collection<IModelProviderListener> listeners = new ArrayList<IModelProviderListener>();
+ if (result != null){
+ listeners = ( (EJB3MergedModelProvider)result).getListeners();
+ }
result = new EJB3MergedModelProvider(project);
+
+ addListeners(result, listeners);
addResource(project, result);
}
return result;
}
+
+ private void addListeners(IModelProvider modelProvider,
+ Collection<IModelProviderListener> listeners) {
+ for (IModelProviderListener iModelProviderListener : listeners) {
+ if (iModelProviderListener != null)
+ modelProvider.addListener(iModelProviderListener);
+ }
+ }
public IModelProvider create(IVirtualComponent component) {
return create(component.getProject());
