diff options
Diffstat (limited to 'plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend')
| -rw-r--r-- | plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend index 75e5dfab8c7..a27c54810fa 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/internal/architecture/merger/InternalArchitectureDomainMerger.xtend @@ -1,5 +1,5 @@ /***************************************************************************** - * Copyright (c) 2021 Christian W. Damus, CEA LIST, and others. + * Copyright (c) 2021, 2023 Christian W. Damus, CEA LIST, and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * Christian W. Damus - Initial API and implementation + * Ansgar Radermacher - bug 582492, move to com.google.inject * *****************************************************************************/ @@ -17,9 +18,12 @@ package org.eclipse.papyrus.infra.core.internal.architecture.merger import com.google.inject.AbstractModule import com.google.inject.Guice +import com.google.inject.Inject +import com.google.inject.Singleton +import java.util.Formatter import java.util.Map -import javax.inject.Inject -import javax.inject.Singleton +import org.eclipse.emf.common.util.URI +import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl @@ -39,9 +43,6 @@ import org.eclipse.papyrus.infra.emf.utils.ResourceUtils import static extension org.eclipse.papyrus.infra.core.internal.architecture.merger.ArchitectureExtensions.logf import static extension org.eclipse.papyrus.infra.emf.utils.EMFHelper.* -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.EObject -import java.util.Formatter /** * Model-to-model transformation that generates merged <em>Architecture Description</em> model instances |