Merge branch 'v0.15.x_bugfix' into v0.15.x

integrity-tf · Aug 31, 2016 · 1d53f3d · 1d53f3d
2 parents ea6a19a + 786bbf2
commit 1d53f3d
Show file tree

Hide file tree

Showing 4 changed files with 916 additions and 822 deletions.
diff --git a/de.gebit.integrity.dsl/src/de/gebit/integrity/DSLRuntimeModule.java b/de.gebit.integrity.dsl/src/de/gebit/integrity/DSLRuntimeModule.java
@@ -13,6 +13,8 @@
 import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.parser.IEncodingProvider;
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
+import org.eclipse.xtext.resource.clustering.DynamicResourceClusteringPolicy;
+import org.eclipse.xtext.resource.clustering.IResourceClusteringPolicy;
 import org.eclipse.xtext.scoping.IScopeProvider;
 import org.eclipse.xtext.service.DispatchingProvider;
 
@@ -153,4 +155,15 @@ public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResource
 		return DSLResourceDescriptionStrategy.class;
 	}
 
+	/**
+	 * Binds the {@link IResourceClusteringPolicy}. This dynamic policy improves memory behavior when dealing with large
+	 * script sets.
+	 * 
+	 * @return
+	 */
+	@SuppressWarnings("restriction")
+	public Class<? extends IResourceClusteringPolicy> bindIResourceClusteringPolicy() {
+		return DynamicResourceClusteringPolicy.class;
+	}
+
 }
diff --git a/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java b/de.gebit.integrity.dsl/src/de/gebit/integrity/scoping/DSLResourceDescriptionStrategy.java
@@ -25,7 +25,7 @@ public class DSLResourceDescriptionStrategy extends DefaultResourceDescriptionSt
 
 	@Override
 	public boolean createEObjectDescriptions(EObject anObject, IAcceptor<IEObjectDescription> anAcceptor) {
-		if (IntegrityDSLUtil.isPrivate(anObject)) {
+		if (IntegrityDSLUtil.isPrivateInsideSuite(anObject)) {
 			return false;
 		}