Merge branch 'sizeBasedEviction' into release/2.6

Author: basilevs

core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/persistence/PersistenceManager.java

@@ -521,4 +521,13 @@ public IPersistenceModel getModel(byte[] content, Resource res) {
 		}
 		return null;
 	}
+
+	public int cachedSize(Resource res) {
+		IFile file = WorkspaceSynchronizer.getFile(res);
+		if (!file.exists() || !file.isSynchronized(IResource.DEPTH_INFINITE)) {
+			return 0;
+		}
+		File fs = file.getLocation().toFile();
+		return (int) Math.min(fs.length(), Integer.MAX_VALUE);
+	}
 }

core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/core/workspace/RcpttCore.java

@@ -283,9 +283,9 @@ public List<String> getContextReferences(IContext context) {
 		try {
 			NamedElement namedElement = context.getNamedElement();
 			if (namedElement instanceof GroupContext) {
-				return ((GroupContext) namedElement).getContextReferences();
+				return copy(((GroupContext) namedElement).getContextReferences());
 			} else if (namedElement instanceof SuperContext) {
-				return ((SuperContext) namedElement).getContextReferences();
+				return copy(((SuperContext) namedElement).getContextReferences());
 			} else if (namedElement instanceof CapabilityContext) {
 				final CapabilityContext ccontext = (CapabilityContext) namedElement;
 				final Set<String> result = new LinkedHashSet<String>();
@@ -529,6 +529,9 @@ public IVerification[] getVerifications(IQ7NamedElement element, List<String> ve
 
 	public IContext findContext(IQ7NamedElement element, boolean ignoreErrors,
 			String contextId, IWorkspaceFinder finder) {
+		if (finder == null) {
+			finder = WorkspaceFinder.getInstance();
+		}
 		IContext[] context = finder.findContext(element, contextId);
 		IContext result = null;
 		if (context != null && context.length > 0) {
@@ -911,4 +914,8 @@ public static String getResourcePath(String id) {
 		}
 		return element.getResource().getFullPath().toString();
 	}
+	
+	private static <T> List<T> copy(List<T> input) {
+		return new ArrayList<>(input);
+	}
 }

core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/Q7ResourceInfo.java

@@ -25,8 +25,9 @@
 import org.eclipse.rcptt.core.persistence.plain.PlainTextPersistenceModel;
 import org.eclipse.rcptt.core.scenario.NamedElement;
 import org.eclipse.rcptt.internal.core.Q7LazyResource;
+import org.eclipse.rcptt.internal.core.model.cache.ILRUCacheable;
 
-public class Q7ResourceInfo extends OpenableElementInfo {
+public class Q7ResourceInfo extends OpenableElementInfo implements ILRUCacheable {
 	private final Resource resource;
 	private NamedElement element;
 	public long timestamp;
@@ -153,4 +154,14 @@ public Resource getResource() {
 	public void updatePersistenceModel(IPersistenceModel newModel) {
 		PersistenceManager.getInstance().replaceModelWith(resource, newModel);
 	}
+
+	@Override
+	public int getCacheFootprint() {
+		Resource res = getResource();
+		if (res == null) {
+			return 0;
+		}
+		
+		return PersistenceManager.getInstance().cachedSize(res);
+	}
 }

core/org.eclipse.rcptt.core/src/org/eclipse/rcptt/internal/core/model/cache/ModelCache.java

@@ -23,7 +23,7 @@ public class ModelCache {
 
 	// public static final int DEFAULT_PKG_SIZE = 500; // average 1782 bytes per
 
-	public static final int DEFAULT_OPENABLE_SIZE = 100; // average 6629
+	public static final int DEFAULT_OPENABLE_SIZE = 10000; // average 6629
 
 	public static final int DEFAULT_CHILDREN_SIZE = 100 * 20; // average 20