Refactor for shorter model synchronization code.

tools.descartes.prisma.core/src/tools/descartes/prisma/core/scopes/ApplicationScope.java

@@ -244,26 +244,11 @@ public class ApplicationScope extends AgentScope {
 			ModelSkeleton skeleton) {
 		List<ModelSkeletonAdapter> synchronizedAdapters = super.synchronizeModelSkeletonTree(agent, transaction,
 				skeleton);
-		if (skeleton.getRepository() != null) {
-			ModelSkeletonAdapter adapter = agent.adapt(skeleton.getRepository(),
-					ModelSkeletonAdapter.class);
-			adapter.startTransaction(transaction);
-			adapter.synchronizeRoot(getComponentRepository());
-			synchronizedAdapters.add(adapter);
-		}
-		if (skeleton.getDeployment() != null) {
-			ModelSkeletonAdapter adapter = agent.adapt(skeleton.getDeployment(),
-					ModelSkeletonAdapter.class);
-			adapter.startTransaction(transaction);
-			adapter.synchronizeRoot(getDeployment());
-			synchronizedAdapters.add(adapter);
-		}
-		if (skeleton.getSystem() != null) {
-			ModelSkeletonAdapter adapter = agent.adapt(skeleton.getSystem(), ModelSkeletonAdapter.class);
-			adapter.startTransaction(transaction);
-			adapter.synchronizeRoot(getApplication());
-			synchronizedAdapters.add(adapter);
-		}
+
+		synchronizeModelRoot(agent, transaction, skeleton.getRepository(), getComponentRepository(),
+				synchronizedAdapters);
+		synchronizeModelRoot(agent, transaction, skeleton.getDeployment(), getDeployment(), synchronizedAdapters);
+		synchronizeModelRoot(agent, transaction, skeleton.getSystem(), getApplication(), synchronizedAdapters);
 		return synchronizedAdapters;
 	}
 

tools.descartes.prisma.core/src/tools/descartes/prisma/core/scopes/LogicalInfrastructureScope.java

@@ -168,12 +168,13 @@ public class LogicalInfrastructureScope extends AgentScope {
 		List<ModelSkeletonAdapter> synchronizedAdapters = super.synchronizeModelSkeletonTree(agent, transaction,
 				skeleton);
 	
-		// TODO: correctly implement the container matching
 		for (Container curContainer : skeleton.getContainers()) {
-			ModelSkeletonAdapter adapter = agent.adapt(curContainer, ModelSkeletonAdapter.class);
-			adapter.startTransaction(transaction);
-			adapter.synchronizeRoot(curContainer);
-			synchronizedAdapters.add(adapter);
+			for (Container curRepoContainer : getContainer()) {
+				if (ObjectMatcher.matches(curContainer, curRepoContainer)) {
+					synchronizeModelRoot(agent, transaction, curContainer, curRepoContainer, synchronizedAdapters);
+					break;
+				}
+			}
 		}
 		return synchronizedAdapters;
 	}