| commit | 5273b3d57ec4056204f687d50076973994dbd6e5 | [log] [tgz] |
|---|---|---|
| author | sbegaudeau <stephane.begaudeau@obeo.fr> | Tue Jul 05 10:37:27 2011 +0200 |
| committer | sbegaudeau <stephane.begaudeau@obeo.fr> | Tue Jul 05 10:37:27 2011 +0200 |
| tree | 78930435468a72629634bef0e29cf3d32da448a6 | |
| parent | 4b29eede7b4e050d15169ec34fcdd6849208f99f [diff] |
Improved removal of services instance after generation.
diff --git a/plugins/org.eclipse.acceleo.common/src/org/eclipse/acceleo/common/AcceleoServicesRegistry.java b/plugins/org.eclipse.acceleo.common/src/org/eclipse/acceleo/common/AcceleoServicesRegistry.java index e69a409..e076e88 100644 --- a/plugins/org.eclipse.acceleo.common/src/org/eclipse/acceleo/common/AcceleoServicesRegistry.java +++ b/plugins/org.eclipse.acceleo.common/src/org/eclipse/acceleo/common/AcceleoServicesRegistry.java
@@ -262,5 +262,6 @@ */ public void clearRegistry() { registeredServices.clear(); + serviceInstances.clear(); } }
diff --git a/plugins/org.eclipse.acceleo.engine/src/org/eclipse/acceleo/engine/service/AbstractAcceleoGenerator.java b/plugins/org.eclipse.acceleo.engine/src/org/eclipse/acceleo/engine/service/AbstractAcceleoGenerator.java index 35f6710..c027bbf 100644 --- a/plugins/org.eclipse.acceleo.engine/src/org/eclipse/acceleo/engine/service/AbstractAcceleoGenerator.java +++ b/plugins/org.eclipse.acceleo.engine/src/org/eclipse/acceleo/engine/service/AbstractAcceleoGenerator.java
@@ -22,6 +22,7 @@ import org.eclipse.acceleo.common.AcceleoServicesRegistry; import org.eclipse.acceleo.common.IAcceleoConstants; +import org.eclipse.acceleo.common.internal.utils.AcceleoServicesEclipseUtil; import org.eclipse.acceleo.common.internal.utils.workspace.AcceleoWorkspaceUtil; import org.eclipse.acceleo.common.internal.utils.workspace.BundleURLConverter; import org.eclipse.acceleo.common.utils.ModelUtils; @@ -454,6 +455,7 @@ */ protected void postGenerate(ResourceSet rs) { AcceleoServicesRegistry.INSTANCE.clearRegistry(); + AcceleoServicesEclipseUtil.clearRegistry(); List<Resource> unload = new ArrayList<Resource>(rs.getResources()); unload.removeAll(originalResources); for (Resource res : unload) {