FirstInstance refactoring changes (refined)

commit-based-cipm/bundles/fi/cipm.consistency.commitintegration.diff.util/src/cipm/consistency/commitintegration/diff/util/HierarchicalMatchEngineFactoryGenerator.java

@@ -12,7 +12,7 @@
 import org.splevo.jamopp.diffing.match.JaMoPPEqualityStrategy;
 import org.splevo.jamopp.diffing.match.JaMoPPIgnoreStrategy;
 import org.splevo.jamopp.diffing.scope.PackageIgnoreChecker;
-import org.splevo.jamopp.diffing.similarity.SimilarityChecker;
+import org.splevo.jamopp.diffing.similarity.base.ISimilarityChecker;
 
 import com.google.common.cache.CacheBuilder;
 
@@ -32,7 +32,7 @@ private HierarchicalMatchEngineFactoryGenerator() {
 	 * @param key a key to identify the compared models.
 	 * @return the generated factory.
 	 */
-	public static HierarchicalMatchEngineFactory generateMatchEngineFactory(SimilarityChecker simChecker, String key) {
+	public static HierarchicalMatchEngineFactory generateMatchEngineFactory(ISimilarityChecker simChecker, String key) {
 		EqualityHelperExtensionProvider.Descriptor.Registry descRegistryImpl =
 				EqualityHelperExtensionProviderDescriptorRegistryImpl.createStandaloneInstance();
 		descRegistryImpl.put(key, new SimilarityCheckerBasedEqualityHelperExtensionProviderDescriptor(simChecker));

commit-based-cipm/bundles/fi/cipm.consistency.commitintegration.diff.util/src/cipm/consistency/commitintegration/diff/util/JavaMatchEngineFactoryGenerator.java

@@ -1,7 +1,9 @@
 package cipm.consistency.commitintegration.diff.util;
 
 import org.splevo.diffing.match.HierarchicalMatchEngineFactory;
-import org.splevo.jamopp.diffing.similarity.SimilarityChecker;
+import org.splevo.jamopp.diffing.similarity.JavaSimilarityChecker;
+import org.splevo.jamopp.diffing.similarity.JavaSimilarityToolboxBuilder;
+import org.splevo.jamopp.diffing.similarity.base.MapSimilarityToolboxFactory;
 
 /**
  * A generator for HierarchicalMatchEngineFactories specific to Java models.
@@ -18,6 +20,15 @@ private JavaMatchEngineFactoryGenerator() {
 	 * @return the generated factory.
 	 */
 	public static HierarchicalMatchEngineFactory generateMatchEngineFactory() {
-		return HierarchicalMatchEngineFactoryGenerator.generateMatchEngineFactory(new SimilarityChecker(), "javaxmi");
+        var builder = new JavaSimilarityToolboxBuilder();
+        builder.setSimilarityToolboxFactory(new MapSimilarityToolboxFactory());
+
+        var toolbox = builder.instantiate()
+        	.buildNewSimilaritySwitchHandler()
+        	.buildNormalizationHandlers()
+        	.buildComparisonHandlers()
+        	.build();
+
+		return HierarchicalMatchEngineFactoryGenerator.generateMatchEngineFactory(new JavaSimilarityChecker(toolbox), "javaxmi");
 	}
 }

commit-based-cipm/bundles/fi/cipm.consistency.commitintegration.diff.util/src/cipm/consistency/commitintegration/diff/util/SimilarityCheckerBasedEqualityHelperExtensionProviderDescriptor.java

@@ -5,7 +5,7 @@
 import org.eclipse.emf.compare.match.eobject.EqualityHelperExtensionProvider;
 import org.eclipse.emf.compare.utils.IEqualityHelper;
 import org.eclipse.emf.ecore.EObject;
-import org.splevo.jamopp.diffing.similarity.SimilarityChecker;
+import org.splevo.jamopp.diffing.similarity.base.ISimilarityChecker;
 
 /**
  * A descriptor for the provider of a EqualityHelperExtension which is based on the SimilarityChecker.
@@ -14,9 +14,9 @@
  */
 public class SimilarityCheckerBasedEqualityHelperExtensionProviderDescriptor
 		implements EqualityHelperExtensionProvider.Descriptor {
-	private SimilarityChecker checker;
+	private ISimilarityChecker checker;
 
-	public SimilarityCheckerBasedEqualityHelperExtensionProviderDescriptor(SimilarityChecker check) {
+	public SimilarityCheckerBasedEqualityHelperExtensionProviderDescriptor(ISimilarityChecker check) {
 		checker = check;
 	}
 

commit-based-cipm/bundles/fi/cipm.consistency.commitintegration.diff.util/src/cipm/consistency/commitintegration/diff/util/pcm/IPCMRepositorySimilaritySwitch.java

@@ -0,0 +1,13 @@
+package cipm.consistency.commitintegration.diff.util.pcm;
+
+import org.splevo.jamopp.diffing.similarity.base.ecore.IComposedSimilaritySwitch;
+
+/**
+ * An interface for switches that can be used to compute the similarity of
+ * Palladio Component Model (PCM) repositories.
+ * 
+ * @author atora
+ */
+public interface IPCMRepositorySimilaritySwitch extends IComposedSimilaritySwitch {
+
+}

commit-based-cipm/bundles/fi/cipm.consistency.commitintegration.diff.util/src/cipm/consistency/commitintegration/diff/util/pcm/PCMRepositoryMatchEngineFactoryGenerator.java

@@ -1,6 +1,7 @@
 package cipm.consistency.commitintegration.diff.util.pcm;
 
 import org.splevo.diffing.match.HierarchicalMatchEngineFactory;
+import org.splevo.jamopp.diffing.similarity.base.MapSimilarityToolboxFactory;
 
 import cipm.consistency.commitintegration.diff.util.HierarchicalMatchEngineFactoryGenerator;
 
@@ -21,7 +22,14 @@ private PCMRepositoryMatchEngineFactoryGenerator() {
 	 * @return the generated factory.
 	 */
 	public static HierarchicalMatchEngineFactory generateMatchEngineFactory() {
-		return HierarchicalMatchEngineFactoryGenerator.generateMatchEngineFactory(new PCMRepositorySimilarityChecker(),
+		var builder = new PCMRepositorySimilarityToolboxBuilder();
+		builder.setSimilarityToolboxFactory(new MapSimilarityToolboxFactory());
+
+		var toolbox = builder.instantiate()
+			.buildComparisonPairs()
+			.build();
+
+		return HierarchicalMatchEngineFactoryGenerator.generateMatchEngineFactory(new PCMRepositorySimilarityChecker(toolbox),
 				"repository");
 	}
 
@@ -32,7 +40,14 @@ public static HierarchicalMatchEngineFactory generateMatchEngineFactory() {
 	 * @return the generated factory.
 	 */
 	public static HierarchicalMatchEngineFactory generateIDBasedMatchEngineFactory() {
+		var builder = new PCMRepositorySimilarityToolboxBuilder();
+		builder.setSimilarityToolboxFactory(new MapSimilarityToolboxFactory());
+
+		var toolbox = builder.instantiate()
+			.buildIDBasedComparisonPairs()
+			.build();
+
 		return HierarchicalMatchEngineFactoryGenerator
-				.generateMatchEngineFactory(new PCMRepositoryIDBasedSimilarityChecker(), "repository");
+				.generateMatchEngineFactory(new PCMRepositorySimilarityChecker(toolbox), "repository");
 	}
 }