diff --git a/org.omg.kerml.xpect.tests/.classpath b/org.omg.kerml.xpect.tests/.classpath index fb1a31fc8f..b7f6980275 100644 --- a/org.omg.kerml.xpect.tests/.classpath +++ b/org.omg.kerml.xpect.tests/.classpath @@ -6,6 +6,8 @@ + + diff --git a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF index 5ac72f4f09..a6fea574a6 100644 --- a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF @@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.xbase;bundle-version="2.9.2", org.eclipse.xtext.ui.shared;bundle-version="2.14.0", org.omg.sysml;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.kerml.xtext;bundle-version="0.59.0", org.omg.kerml.xtext.ui;bundle-version="0.59.0", org.aopalliance;bundle-version="1.0.0" diff --git a/org.omg.kerml.xtext.ui/.classpath b/org.omg.kerml.xtext.ui/.classpath index e2895e7208..88542faf74 100644 --- a/org.omg.kerml.xtext.ui/.classpath +++ b/org.omg.kerml.xtext.ui/.classpath @@ -10,6 +10,7 @@ + diff --git a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF index ab0388dde6..358b937d70 100644 --- a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Require-Bundle: org.omg.kerml.xtext, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional, org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.omg.kerml.expressions.xtext;bundle-version="0.59.0", org.omg.kerml.expressions.xtext.ide;bundle-version="0.59.0", diff --git a/org.omg.kerml.xtext/.classpath b/org.omg.kerml.xtext/.classpath index e2895e7208..88542faf74 100644 --- a/org.omg.kerml.xtext/.classpath +++ b/org.omg.kerml.xtext/.classpath @@ -10,6 +10,7 @@ + diff --git a/org.omg.kerml.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.xtext/META-INF/MANIFEST.MF index 624998efdc..1a5da500a3 100644 --- a/org.omg.kerml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLRuntimeModule.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLRuntimeModule.xtend index b0a420d75e..cc5d6af309 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLRuntimeModule.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLRuntimeModule.xtend @@ -10,6 +10,7 @@ import org.eclipse.xtext.naming.IQualifiedNameConverter import org.eclipse.xtext.naming.IQualifiedNameProvider import org.eclipse.xtext.resource.XtextResource import org.eclipse.xtext.scoping.IGlobalScopeProvider +import org.eclipse.xtext.resource.IResourceServiceProvider import org.eclipse.xtext.validation.CompositeEValidator import org.eclipse.xtext.validation.IResourceValidator import org.omg.kerml.xtext.library.KerMLLibraryProvider @@ -20,17 +21,40 @@ import org.omg.kerml.xtext.naming.KerMLQualifiedNameProvider import org.omg.kerml.xtext.scoping.KerMLGlobalScopeProvider import org.omg.kerml.xtext.scoping.KerMLLinker import org.omg.kerml.xtext.validation.KerMLResourceValidator -import org.omg.sysml.lang.sysml.util.IModelLibraryProvider +import org.omg.sysml.logic.api.IModelLibraryProvider import org.omg.kerml.xtext.library.ILibraryIndexProvider import org.omg.kerml.xtext.library.PrecalculatedLibraryIndexProvider import com.google.inject.Provides import org.eclipse.xtext.conversion.IValueConverterService import org.omg.kerml.xtext.conversion.KerMLValueConverterService +import org.omg.sysml.util.SysMLLibraryUtil /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ class KerMLRuntimeModule extends AbstractKerMLRuntimeModule { + + /** + * Installs the library-provider lookup used by {@link SysMLLibraryUtil} for + * the KerML Xtext runtime. + * + *

The lookup resolves the {@link IModelLibraryProvider} from the + * {@link IResourceServiceProvider} associated with the current resource URI so + * library element resolution can use the KerML runtime's injector-backed + * services from static utility code. + */ + new() { + SysMLLibraryUtil.setProviderLookup([ + resource | + try { + val serviceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.URI) + if (serviceProvider === null) null else serviceProvider.get(IModelLibraryProvider) + } catch (Exception e) { + System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e) + null + } + ]) + } override Class bindIValueConverterService() { return KerMLValueConverterService; diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLStandaloneSetup.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLStandaloneSetup.xtend index 75ddf33bca..c3d72d1876 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLStandaloneSetup.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerMLStandaloneSetup.xtend @@ -3,11 +3,8 @@ */ package org.omg.kerml.xtext -import org.eclipse.emf.ecore.EStructuralFeature -import org.omg.sysml.delegate.setting.DerivedPropertySettingDelegateFactory; -import org.omg.sysml.delegate.invocation.OperationInvocationDelegateFactory; import com.google.inject.Injector -import org.eclipse.emf.ecore.EOperation +import org.omg.sysml.logic.SysMLLogicStandaloneSetup /** * Initialization support for running Xtext languages without Equinox extension registry. @@ -19,10 +16,7 @@ class KerMLStandaloneSetup extends KerMLStandaloneSetupGenerated { } override Injector createInjectorAndDoEMFRegistration() { - EStructuralFeature.Internal.SettingDelegate.Factory.Registry.INSTANCE. - put(DerivedPropertySettingDelegateFactory.SYSML_ANNOTATION, new DerivedPropertySettingDelegateFactory()); - EOperation.Internal.InvocationDelegate.Factory.Registry.INSTANCE. - put(OperationInvocationDelegateFactory.SYSML_ANNOTATION, new OperationInvocationDelegateFactory()); + SysMLLogicStandaloneSetup.doSetup() return super.createInjectorAndDoEMFRegistration(); } } diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/library/KerMLLibraryProvider.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/library/KerMLLibraryProvider.xtend index f39a12887a..ac8862c979 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/library/KerMLLibraryProvider.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/library/KerMLLibraryProvider.xtend @@ -30,7 +30,7 @@ import com.google.inject.Singleton import org.eclipse.xtext.naming.IQualifiedNameConverter import org.omg.sysml.lang.sysml.Element import org.eclipse.emf.ecore.util.EcoreUtil -import org.omg.sysml.lang.sysml.util.IModelLibraryProvider +import org.omg.sysml.logic.api.IModelLibraryProvider import org.eclipse.xtext.resource.impl.ResourceDescriptionsProvider import org.omg.sysml.lang.sysml.SysMLPackage @@ -55,4 +55,4 @@ class KerMLLibraryProvider implements IModelLibraryProvider { } } -} \ No newline at end of file +} diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend index 1ea6cbc878..9c019cdde9 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend @@ -51,7 +51,6 @@ import org.omg.sysml.lang.sysml.OwningMembership import org.omg.sysml.lang.sysml.NamespaceImport import org.omg.sysml.lang.sysml.MembershipImport import org.omg.sysml.lang.sysml.SysMLPackage -import org.omg.sysml.lang.sysml.util.ISysMLScope import com.google.inject.Inject import org.eclipse.xtext.naming.IQualifiedNameConverter import org.eclipse.emf.ecore.util.EcoreUtil @@ -59,7 +58,7 @@ import org.omg.sysml.util.NamespaceUtil import org.omg.kerml.xtext.naming.QualifiedNameUtil import org.omg.sysml.lang.sysml.Redefinition -class KerMLScope extends AbstractScope implements ISysMLScope { +class KerMLScope extends AbstractScope { @Inject IQualifiedNameConverter qualifiedNameConverter @@ -163,7 +162,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope { !resolveInScope(QualifiedName.create(input.name.firstSegment), true).isEmpty() } - override getElement(String name) { + def getElement(String name) { var obj = EcoreUtil.resolve(getSingleElement(qualifiedNameConverter.toQualifiedName(name)).EObjectOrProxy, element) if (obj instanceof Element) obj else null } diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2JSON.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2JSON.java index 278e137bf2..66520928e8 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2JSON.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2JSON.java @@ -28,7 +28,7 @@ import java.nio.file.Path; import java.util.Arrays; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.traversal.facade.impl.JsonElementProcessingFacade; /** diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2XMI.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2XMI.java index da89390b0f..5744cc079a 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2XMI.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerML2XMI.java @@ -37,8 +37,8 @@ import org.eclipse.emf.ecore.xmi.XMIResource; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; import org.omg.kerml.xtext.KerMLStandaloneSetup; +import org.omg.sysml.io.SysMLUtil; import org.omg.sysml.lang.sysml.Element; -import org.omg.sysml.util.SysMLUtil; /** * This is a utility program for reading one or more KerML source files and writing the corresponding KerML diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLIndexUtil.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLIndexUtil.java index 4102b568c2..e48559e931 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLIndexUtil.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLIndexUtil.java @@ -33,7 +33,7 @@ import org.omg.kerml.xtext.KerMLStandaloneSetup; import org.omg.sysml.lang.sysml.Membership; import org.omg.sysml.lang.sysml.Namespace; -import org.omg.sysml.util.SysMLUtil; +import org.omg.sysml.io.SysMLUtil; public class KerMLIndexUtil extends SysMLUtil { diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLRepositorySaveUtil.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLRepositorySaveUtil.java index 9e11c7266b..0a3cffe53c 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLRepositorySaveUtil.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLRepositorySaveUtil.java @@ -34,7 +34,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.traversal.facade.impl.ApiElementProcessingFacade; /** diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLTraversalUtil.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLTraversalUtil.java index 609c7006f0..672c662154 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLTraversalUtil.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLTraversalUtil.java @@ -26,8 +26,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.omg.kerml.xtext.KerMLStandaloneSetup; +import org.omg.sysml.io.SysMLUtil; import org.omg.sysml.lang.sysml.Element; -import org.omg.sysml.util.SysMLUtil; import org.omg.sysml.util.traversal.Traversal; import org.omg.sysml.util.traversal.facade.ElementProcessingFacade; import org.omg.sysml.util.traversal.facade.impl.DefaultElementProcessingFacadeImpl; diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend index 085e791a5f..18cd7cb4db 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend @@ -58,7 +58,7 @@ import org.omg.sysml.lang.sysml.LiteralInteger import org.omg.sysml.lang.sysml.Multiplicity import org.omg.sysml.lang.sysml.FeatureChainExpression import org.omg.sysml.lang.sysml.MetadataFeature -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil +import org.omg.sysml.util.SysMLLibraryUtil import org.omg.sysml.lang.sysml.OwningMembership import org.omg.sysml.lang.sysml.ReferenceSubsetting import org.omg.sysml.lang.sysml.LiteralBoolean diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend index d0b18e69bd..f6563cd693 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend @@ -23,15 +23,39 @@ import com.google.inject.Binder import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl import org.eclipse.xtext.naming.IQualifiedNameConverter +import org.eclipse.xtext.resource.IResourceServiceProvider import org.eclipse.xtext.resource.IResourceDescriptions import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule import org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions import org.omg.kerml.xtext.library.KerMLLibraryProvider import org.omg.kerml.xtext.naming.KerMLQualifiedNameConverter import org.omg.kerml.xtext.naming.KerMLQualifiedNameProvider -import org.omg.sysml.lang.sysml.util.IModelLibraryProvider +import org.omg.sysml.logic.api.IModelLibraryProvider +import org.omg.sysml.util.SysMLLibraryUtil class KerMLxRuntimeModule extends AbstractGenericResourceRuntimeModule{ + + /** + * Installs the library-provider lookup used by {@link SysMLLibraryUtil} for + * the generic KerML XMI runtime. + * + *

The lookup resolves the {@link IModelLibraryProvider} from the + * {@link IResourceServiceProvider} associated with the current resource URI so + * library element resolution works in this non-generated XMI-based runtime + * just as it does in the regular Xtext runtime modules. + */ + new() { + SysMLLibraryUtil.setProviderLookup([ + resource | + try { + val serviceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.URI) + if (serviceProvider === null) null else serviceProvider.get(IModelLibraryProvider) + } catch (Exception e) { + System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e) + null + } + ]) + } public static val KERMLX_LANGUAGE_NAME = 'org.omg.kerml.kermlx' diff --git a/org.omg.sysml.execution/.classpath b/org.omg.sysml.execution/.classpath index d738d922a3..9e6625519a 100644 --- a/org.omg.sysml.execution/.classpath +++ b/org.omg.sysml.execution/.classpath @@ -7,6 +7,7 @@ + diff --git a/org.omg.sysml.execution/META-INF/MANIFEST.MF b/org.omg.sysml.execution/META-INF/MANIFEST.MF index 7fa24edbb5..044e1393d8 100644 --- a/org.omg.sysml.execution/META-INF/MANIFEST.MF +++ b/org.omg.sysml.execution/META-INF/MANIFEST.MF @@ -9,4 +9,5 @@ Bundle-Vendor: SysML v2 Submission Team Bundle-ActivationPolicy: lazy Export-Package: org.omg.sysml.execution.expressions Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0" diff --git a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java index 247296c3e2..4c535f0644 100644 --- a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java +++ b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java @@ -28,7 +28,7 @@ import org.omg.sysml.lang.sysml.Expression; import org.omg.sysml.lang.sysml.InvocationExpression; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.EvaluationUtil; public class MaximizeFunction extends ReduceFunction { diff --git a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java index 8bce13ce37..f6164bd466 100644 --- a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java +++ b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java @@ -28,7 +28,7 @@ import org.omg.sysml.lang.sysml.Expression; import org.omg.sysml.lang.sysml.InvocationExpression; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.EvaluationUtil; public class MinimizeFunction extends ReduceFunction { diff --git a/org.omg.sysml.feature/feature.xml b/org.omg.sysml.feature/feature.xml index bfcc4a4ad4..bd11a977c0 100644 --- a/org.omg.sysml.feature/feature.xml +++ b/org.omg.sysml.feature/feature.xml @@ -69,6 +69,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES version="0.0.0" unpack="false"/> + + + diff --git a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF index 10a97e1bbc..36df966a4a 100644 --- a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF @@ -9,5 +9,6 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml.interactive;bundle-version="0.59.0", org.junit;bundle-version="4.12.0", org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.eclipse.xtext;bundle-version="2.22.0" diff --git a/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationSpecialTest.java b/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationSpecialTest.java index 840410790f..077c2a2a3e 100644 --- a/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationSpecialTest.java +++ b/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationSpecialTest.java @@ -39,7 +39,7 @@ import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.TransitionUsage; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.ElementUtil; import org.omg.sysml.util.FeatureUtil; import org.omg.sysml.util.NamespaceUtil; diff --git a/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationTest.java b/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationTest.java index 2d6f1619d6..04bfe7989c 100644 --- a/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationTest.java +++ b/org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLSpecializationTest.java @@ -47,7 +47,7 @@ import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; import org.omg.sysml.lang.sysml.Usage; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.ElementUtil; import org.omg.sysml.util.NamespaceUtil; diff --git a/org.omg.sysml.interactive/.classpath b/org.omg.sysml.interactive/.classpath index 946af967f9..9619f99040 100644 --- a/org.omg.sysml.interactive/.classpath +++ b/org.omg.sysml.interactive/.classpath @@ -7,6 +7,7 @@ + diff --git a/org.omg.sysml.interactive/META-INF/MANIFEST.MF b/org.omg.sysml.interactive/META-INF/MANIFEST.MF index c7bcc168e9..2c5832f831 100644 --- a/org.omg.sysml.interactive/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.emf.ecore, com.google.inject, org.eclipse.xtext, org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.omg.sysml.execution;bundle-version="0.59.0", org.omg.kerml.xtext;bundle-version="0.59.0", diff --git a/org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java b/org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java index 4bd8fbd77a..33d5a04a94 100644 --- a/org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java +++ b/org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java @@ -60,6 +60,7 @@ import org.omg.kerml.xtext.library.ILibraryIndexProvider; import org.omg.kerml.xtext.naming.KerMLQualifiedNameConverter; import org.omg.sysml.execution.expressions.ExpressionEvaluator; +import org.omg.sysml.io.SysMLUtil; import org.omg.sysml.lang.sysml.Element; import org.omg.sysml.lang.sysml.Expression; import org.omg.sysml.lang.sysml.Membership; @@ -70,10 +71,9 @@ import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; import org.omg.sysml.lang.sysml.ViewUsage; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.plantuml.SysML2PlantUMLLinkProvider; import org.omg.sysml.plantuml.SysML2PlantUMLSvc; -import org.omg.sysml.util.SysMLUtil; import org.omg.sysml.util.TypeUtil; import org.omg.sysml.util.repository.EObjectUUIDTracker; import org.omg.sysml.util.repository.APIModel; diff --git a/org.omg.sysml.logic.bundle/.classpath b/org.omg.sysml.logic.bundle/.classpath new file mode 100644 index 0000000000..ad1efc0273 --- /dev/null +++ b/org.omg.sysml.logic.bundle/.classpath @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/org.omg.sysml.logic.bundle/.gitignore b/org.omg.sysml.logic.bundle/.gitignore new file mode 100644 index 0000000000..5a8cd028b7 --- /dev/null +++ b/org.omg.sysml.logic.bundle/.gitignore @@ -0,0 +1,3 @@ +target/ +lib/ +model/ \ No newline at end of file diff --git a/org.omg.sysml.logic.bundle/.project b/org.omg.sysml.logic.bundle/.project new file mode 100644 index 0000000000..ab6a819701 --- /dev/null +++ b/org.omg.sysml.logic.bundle/.project @@ -0,0 +1,34 @@ + + + org.omg.sysml.logic.bundle + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/org.omg.sysml.logic.bundle/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.logic.bundle/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/org.omg.sysml.logic.bundle/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF b/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..eb2bedf301 --- /dev/null +++ b/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-Version: 0.59.0.qualifier +Export-Package: org.omg.sysml.adapter, + org.omg.sysml.delegate.invocation, + org.omg.sysml.delegate.setting, + org.omg.sysml.expressions, + org.omg.sysml.expressions.functions, + org.omg.sysml.expressions.functions.base, + org.omg.sysml.expressions.functions.bool, + org.omg.sysml.expressions.functions.control, + org.omg.sysml.expressions.functions.data, + org.omg.sysml.expressions.functions.trig, + org.omg.sysml.logic, + org.omg.sysml.logic.api, + org.omg.sysml.util +Require-Bundle: org.eclipse.emf.common;bundle-version="2.44.0", + org.eclipse.emf.ecore;bundle-version="2.41.0", + org.omg.sysml.model.bundle;bundle-version="0.59.0" +Bundle-ClassPath: ., + lib/org.omg.sysml.logic-0.59.0-SNAPSHOT.jar +Bundle-SymbolicName: org.omg.sysml.logic.bundle;singleton:=true +Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.omg.sysml.logic.bundle diff --git a/org.omg.sysml.logic.bundle/build.properties b/org.omg.sysml.logic.bundle/build.properties new file mode 100644 index 0000000000..4501590783 --- /dev/null +++ b/org.omg.sysml.logic.bundle/build.properties @@ -0,0 +1,5 @@ +# +bin.includes = META-INF/,\ + plugin.properties,\ + lib/org.omg.sysml.logic-0.59.0-SNAPSHOT.jar +jars.extra.classpath = lib/org.omg.sysml.logic-0.59.0-SNAPSHOT.jar diff --git a/org.omg.sysml.logic.bundle/plugin.properties b/org.omg.sysml.logic.bundle/plugin.properties new file mode 100644 index 0000000000..79633ad729 --- /dev/null +++ b/org.omg.sysml.logic.bundle/plugin.properties @@ -0,0 +1,4 @@ +# + +pluginName = SysML Logic Bundle +providerName = OMG diff --git a/org.omg.sysml.logic.bundle/pom.xml b/org.omg.sysml.logic.bundle/pom.xml new file mode 100644 index 0000000000..74be1d6a47 --- /dev/null +++ b/org.omg.sysml.logic.bundle/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + + org.omg.sysml + org.omg.sysml.parent + ${revision} + + + org.omg.sysml.logic.bundle + eclipse-plugin + + + UTF-8 + UTF-8 + + + + + org.omg.sysml + org.omg.sysml.logic + ${revision} + + + + + + + + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + copy-jar-org.omg.sysml.logic + initialize + + run + + + + + + + + + + + + + + + + eclipse-m2e + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + [0,) + + run + + + + + + + + + + + + + + + diff --git a/org.omg.sysml.logic/.classpath b/org.omg.sysml.logic/.classpath new file mode 100644 index 0000000000..29a9fa7494 --- /dev/null +++ b/org.omg.sysml.logic/.classpath @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.omg.sysml.logic/.gitignore b/org.omg.sysml.logic/.gitignore new file mode 100644 index 0000000000..b83d22266a --- /dev/null +++ b/org.omg.sysml.logic/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/org.omg.sysml.logic/.project b/org.omg.sysml.logic/.project new file mode 100644 index 0000000000..d8e2ba0322 --- /dev/null +++ b/org.omg.sysml.logic/.project @@ -0,0 +1,23 @@ + + + org.omg.sysml.logic + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/org.omg.sysml.logic/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.logic/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..abdea9ac03 --- /dev/null +++ b/org.omg.sysml.logic/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/org.omg.sysml.logic/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.logic/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..8b942392f1 --- /dev/null +++ b/org.omg.sysml.logic/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.logic/.settings/org.eclipse.m2e.core.prefs b/org.omg.sysml.logic/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000000..f897a7f1cb --- /dev/null +++ b/org.omg.sysml.logic/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/org.omg.sysml.logic/pom.xml b/org.omg.sysml.logic/pom.xml new file mode 100644 index 0000000000..129a3c2168 --- /dev/null +++ b/org.omg.sysml.logic/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + + org.omg.sysml + org.omg.sysml.parent + ${revision} + + + org.omg.sysml.logic + jar + + + UTF-8 + UTF-8 + + + + + org.omg.sysml + org.omg.sysml.model + ${revision} + + + junit + junit + 4.13.2 + test + + + diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AcceptActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AcceptActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AcceptActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AcceptActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ActionDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ActionDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ActionDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ActionDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AnnotatingElementAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnnotatingElementAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AnnotatingElementAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnnotatingElementAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AnnotationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnnotationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AnnotationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AnnotationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssociationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssociationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssociationStructureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssociationStructureAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AssociationStructureAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AssociationStructureAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AttributeDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AttributeDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AttributeDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AttributeDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AttributeUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AttributeUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/AttributeUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/AttributeUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/BehaviorAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BehaviorAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/BehaviorAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BehaviorAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/BindingConnectorAsUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BindingConnectorAsUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/BindingConnectorAsUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BindingConnectorAsUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/BooleanExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BooleanExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/BooleanExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/BooleanExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CalculationDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CalculationDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/CalculationDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CalculationDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CalculationUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CalculationUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CaseDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CaseDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/CaseDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CaseDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CaseUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CaseUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ClassAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ClassAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ClassAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ClassAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ClassifierAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ClassifierAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ClassifierAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ClassifierAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CommentAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CommentAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/CommentAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/CommentAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConcernUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConcernUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConjugationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConjugationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConjugationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConjugationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectorAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectorAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAsUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectorAsUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAsUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConnectorAsUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstraintUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstraintUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstructorExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ConstructorExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/DataTypeAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DataTypeAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/DataTypeAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DataTypeAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/DefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/DefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/DependencyAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DependencyAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/DependencyAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DependencyAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/DifferencingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DifferencingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/DifferencingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DifferencingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/DisjoiningAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DisjoiningAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/DisjoiningAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/DisjoiningAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ElementAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ElementAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ElementAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ElementAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ElementAdapterFactory.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ElementAdapterFactory.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ElementAdapterFactory.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ElementAdapterFactory.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/EndFeatureMembershipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/EndFeatureMembershipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/EndFeatureMembershipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/EndFeatureMembershipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureInvertingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureInvertingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureInvertingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureInvertingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureMembershipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureMembershipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureMembershipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureMembershipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureTypingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureTypingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FeatureTypingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureTypingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FlowAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FlowDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowEndAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowEndAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FlowEndAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowEndAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FlowUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FlowUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ForLoopActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ForLoopActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ForLoopActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ForLoopActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FunctionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FunctionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IfActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IfActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/IfActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IfActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ImportAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ImportAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ImportAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ImportAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IndexExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IndexExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InstantiationExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InstantiationExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/InstantiationExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InstantiationExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IntersectingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IntersectingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/IntersectingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/IntersectingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InvariantAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InvariantAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InvocationExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/InvocationExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ItemDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ItemDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ItemDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ItemUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ItemUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ItemUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/LibraryPackageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LibraryPackageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/LibraryPackageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LibraryPackageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/LiteralExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LiteralExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/LiteralExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LiteralExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/LiteralStringAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LiteralStringAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/LiteralStringAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LiteralStringAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/LoopActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LoopActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/LoopActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/LoopActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MembershipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MembershipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MembershipExposeAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipExposeAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MembershipExposeAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipExposeAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MembershipImportAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipImportAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MembershipImportAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MembershipImportAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MetadataDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MetadataDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MetadataFeatureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataFeatureAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MetadataFeatureAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataFeatureAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MetadataUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MetadataUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MetadataUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MultiplicityAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MultiplicityAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/MultiplicityAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/MultiplicityAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/NamespaceAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/NamespaceAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/NamespaceExposeAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceExposeAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/NamespaceExposeAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceExposeAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/NamespaceImportAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceImportAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/NamespaceImportAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/NamespaceImportAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OccurrenceUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OccurrenceUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OperatorExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OperatorExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/OperatorExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OperatorExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OwningMembershipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OwningMembershipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/OwningMembershipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/OwningMembershipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PackageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PackageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PackageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PackageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ParameterMembershipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ParameterMembershipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ParameterMembershipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ParameterMembershipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PartDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PartDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PartDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PartDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PartUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PartUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PayloadFeatureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PayloadFeatureAdapter.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/adapter/PayloadFeatureAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PayloadFeatureAdapter.java index af21c48e69..744e005a4d 100644 --- a/org.omg.sysml/src/org/omg/sysml/adapter/PayloadFeatureAdapter.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PayloadFeatureAdapter.java @@ -25,7 +25,7 @@ import org.omg.sysml.lang.sysml.Feature; import org.omg.sysml.lang.sysml.PayloadFeature; import org.omg.sysml.lang.sysml.SysMLPackage; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; public class PayloadFeatureAdapter extends FeatureAdapter { diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PerformActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PerformActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PortConjugationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortConjugationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PortConjugationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortConjugationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PortDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PortDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/PortUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RedefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RedefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/RedefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RedefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ReferenceSubsettingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ReferenceSubsettingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ReferenceSubsettingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ReferenceSubsettingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ReferenceUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ReferenceUsageAdapter.java similarity index 98% rename from org.omg.sysml/src/org/omg/sysml/adapter/ReferenceUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ReferenceUsageAdapter.java index 057f1e1921..ab78dacfa9 100644 --- a/org.omg.sysml/src/org/omg/sysml/adapter/ReferenceUsageAdapter.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ReferenceUsageAdapter.java @@ -29,7 +29,7 @@ import org.omg.sysml.lang.sysml.Type; import org.omg.sysml.lang.sysml.ReferenceUsage; import org.omg.sysml.lang.sysml.SuccessionAsUsage; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.FeatureUtil; import org.omg.sysml.util.TypeUtil; import org.omg.sysml.util.UsageUtil; diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RelationshipAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RelationshipAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/RelationshipAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RelationshipAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RenderingUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RenderingUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RequirementDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RequirementDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/RequirementDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RequirementDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RequirementUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/RequirementUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SelectExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SelectExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SelectExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SelectExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SendActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SendActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SendActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SendActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SpecializationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SpecializationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SpecializationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SpecializationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StateDefinitionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StateDefinitionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/StateDefinitionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StateDefinitionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StateUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StateUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StepAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StepAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StructureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StructureAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/StructureAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/StructureAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SubclassificationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SubclassificationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SubclassificationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SubclassificationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SubsettingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SubsettingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SubsettingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SubsettingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SuccessionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SuccessionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SuccessionAsUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionAsUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SuccessionAsUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionAsUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SuccessionFlowAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionFlowAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SuccessionFlowAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionFlowAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SuccessionFlowUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionFlowUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/SuccessionFlowUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/SuccessionFlowUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TerminateActionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TerminateActionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/TerminateActionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TerminateActionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TextualRepresentationAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TextualRepresentationAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/TextualRepresentationAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TextualRepresentationAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TransitionUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TransitionUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TypeAdapter.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TypeAdapter.java index 02a09eaf3e..d46cc0173b 100644 --- a/org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TypeAdapter.java @@ -53,7 +53,7 @@ import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; import org.omg.sysml.lang.sysml.VisibilityKind; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.ConnectorUtil; import org.omg.sysml.util.ElementUtil; import org.omg.sysml.util.EvaluationUtil; diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TypeFeaturingAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TypeFeaturingAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/TypeFeaturingAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/TypeFeaturingAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UnioningAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UnioningAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/UnioningAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UnioningAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UsageAdapter.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UsageAdapter.java index d4a05e9990..8a2d1012bc 100644 --- a/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UsageAdapter.java @@ -35,7 +35,7 @@ import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; import org.omg.sysml.lang.sysml.Usage; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.FeatureUtil; import org.omg.sysml.util.TypeUtil; import org.omg.sysml.util.UsageUtil; diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UseCaseUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/UseCaseUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ViewUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ViewUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ViewUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ViewUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ViewpointUsageAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ViewpointUsageAdapter.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/adapter/ViewpointUsageAdapter.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/ViewpointUsageAdapter.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/AcceptActionUsage_isTriggerAction_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/AcceptActionUsage_isTriggerAction_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/AcceptActionUsage_isTriggerAction_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/AcceptActionUsage_isTriggerAction_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_argument_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_argument_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_argument_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_argument_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_inputParameter_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_inputParameter_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_inputParameter_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_inputParameter_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_inputParameters_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_inputParameters_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_inputParameters_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_inputParameters_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_isSubactionUsage_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_isSubactionUsage_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ActionUsage_isSubactionUsage_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ActionUsage_isSubactionUsage_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_checkCondition_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_checkCondition_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_checkCondition_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_checkCondition_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/CalculationUsage_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/CalculationUsage_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConjugatedPortDefinition_effectiveName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConjugatedPortDefinition_effectiveName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConjugatedPortDefinition_effectiveName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConjugatedPortDefinition_effectiveName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_checkCondition_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_checkCondition_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_checkCondition_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_checkCondition_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstraintUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstraintUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstructorExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstructorExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ConstructorExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ConstructorExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ControlNode_multiplicityHasBounds_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ControlNode_multiplicityHasBounds_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ControlNode_multiplicityHasBounds_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ControlNode_multiplicityHasBounds_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_effectiveName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_effectiveName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_effectiveName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_effectiveName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_effectiveShortName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_effectiveShortName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_effectiveShortName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_effectiveShortName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_escapedName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_escapedName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_escapedName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_escapedName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_libraryNamespace_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_libraryNamespace_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_libraryNamespace_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_libraryNamespace_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_path_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_path_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Element_path_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Element_path_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ExhibitStateUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ExhibitStateUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ExhibitStateUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ExhibitStateUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_checkCondition_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_checkCondition_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_checkCondition_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_checkCondition_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Expression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Expression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureChainExpression_sourceTargetFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureChainExpression_sourceTargetFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureChainExpression_sourceTargetFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureChainExpression_sourceTargetFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FeatureReferenceExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_allRedefinedFeatures_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_allRedefinedFeatures_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_allRedefinedFeatures_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_allRedefinedFeatures_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_asCartesianProduct_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_asCartesianProduct_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_asCartesianProduct_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_asCartesianProduct_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_canAccess_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_canAccess_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_canAccess_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_canAccess_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_directionFor_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_directionFor_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_directionFor_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_directionFor_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_effectiveName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_effectiveName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveShortName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_effectiveShortName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_effectiveShortName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_effectiveShortName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isCartesianProduct_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isCartesianProduct_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isCartesianProduct_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isCartesianProduct_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isCompatibleWith_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isCompatibleWith_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isCompatibleWith_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isCompatibleWith_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java index 25cb51cd9f..ed29eae5da 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturedWithin_InvocationDelegate.java @@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.util.BasicInvocationDelegate; import org.omg.sysml.lang.sysml.Feature; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.FeatureUtil; import org.omg.sysml.util.TypeUtil; diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java index f9d38bb1b4..a240c4bd94 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isFeaturingType_InvocationDelegate.java @@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.util.BasicInvocationDelegate; import org.omg.sysml.lang.sysml.Feature; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; public class Feature_isFeaturingType_InvocationDelegate extends BasicInvocationDelegate { diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isOwnedCrossFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isOwnedCrossFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_isOwnedCrossFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_isOwnedCrossFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_ownedCrossFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_ownedCrossFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_ownedCrossFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_ownedCrossFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefinesFromLibrary_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_redefinesFromLibrary_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefinesFromLibrary_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_redefinesFromLibrary_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_subsetsChain_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_subsetsChain_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_subsetsChain_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_subsetsChain_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_supertypes_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_supertypes_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_supertypes_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_supertypes_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_typingFeatures_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_typingFeatures_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_typingFeatures_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Feature_typingFeatures_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_argument_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_argument_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_argument_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_argument_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameter_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameter_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameter_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameter_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameters_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameters_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameters_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_inputParameters_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_isSubactionUsage_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_isSubactionUsage_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/FlowConnectionUsage_isSubactionUsage_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/FlowConnectionUsage_isSubactionUsage_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Import_importedMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Import_importedMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Import_importedMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Import_importedMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/IncludeUseCaseUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/IncludeUseCaseUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/IncludeUseCaseUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/IncludeUseCaseUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/InvocationExpression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InvocationExpression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/InvocationExpression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InvocationExpression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/InvocationExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InvocationExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/InvocationExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InvocationExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/LibraryPackage_libraryNamespace_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LibraryPackage_libraryNamespace_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/LibraryPackage_libraryNamespace_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LibraryPackage_libraryNamespace_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/LifeClass_effectiveName_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LifeClass_effectiveName_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/LifeClass_effectiveName_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LifeClass_effectiveName_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/LiteralExpression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LiteralExpression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/LiteralExpression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LiteralExpression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/LiteralExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LiteralExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/LiteralExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/LiteralExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Membership_isDistinguishableFrom_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Membership_isDistinguishableFrom_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Membership_isDistinguishableFrom_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Membership_isDistinguishableFrom_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_metaclassFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_metaclassFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_metaclassFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_metaclassFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataAccessExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataAccessExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_evaluateFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_evaluateFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_evaluateFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_evaluateFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_isSemantic_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_isSemantic_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_isSemantic_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_isSemantic_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_isSyntactic_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_isSyntactic_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_isSyntactic_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_isSyntactic_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_syntaxElement_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_syntaxElement_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataFeature_syntaxElement_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataFeature_syntaxElement_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_evaluateFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_evaluateFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_evaluateFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_evaluateFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_isSemantic_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_isSemantic_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_isSemantic_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_isSemantic_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_isSyntactic_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_isSyntactic_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_isSyntactic_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_isSyntactic_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_syntaxElement_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_syntaxElement_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MetadataUsage_syntaxElement_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MetadataUsage_syntaxElement_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MultiplicityRange_hasBounds_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MultiplicityRange_hasBounds_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MultiplicityRange_hasBounds_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MultiplicityRange_hasBounds_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/MultiplicityRange_valueOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MultiplicityRange_valueOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/MultiplicityRange_valueOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/MultiplicityRange_valueOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_importedMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_importedMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_importedMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_importedMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_membershipsOfVisibility_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_membershipsOfVisibility_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_membershipsOfVisibility_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_membershipsOfVisibility_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_namesOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_namesOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_namesOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_namesOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_qualificationOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_qualificationOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_qualificationOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_qualificationOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java similarity index 94% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java index 1d88b3687e..e1ecdc9a20 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveGlobal_InvocationDelegate.java @@ -29,7 +29,7 @@ import org.eclipse.emf.ecore.util.BasicInvocationDelegate; import org.omg.sysml.lang.sysml.Element; import org.omg.sysml.lang.sysml.Namespace; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; public class Namespace_resolveGlobal_InvocationDelegate extends BasicInvocationDelegate { @@ -44,7 +44,7 @@ public Object dynamicInvoke(InternalEObject target, EList arguments) throws I // TODO: Resolve elements other than to owning membership. Element element = SysMLLibraryUtil.getLibraryElement(self, qualifiedName); - return element.getOwningMembership(); + return element == null ? null : element.getOwningMembership(); } } diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java similarity index 85% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java index 1756e1eb93..65e98dcec2 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveLocal_InvocationDelegate.java @@ -27,8 +27,8 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.BasicInvocationDelegate; +import org.omg.sysml.lang.sysml.Membership; import org.omg.sysml.lang.sysml.Namespace; -import org.omg.sysml.util.ElementUtil; import org.omg.sysml.util.NamespaceUtil; public class Namespace_resolveLocal_InvocationDelegate extends BasicInvocationDelegate { @@ -42,10 +42,11 @@ public Object dynamicInvoke(InternalEObject target, EList arguments) throws I Namespace self = (Namespace) target; String name = (String) arguments.get(0); - String escapedName = ElementUtil.escapeName(name); - return self.getOwningNamespace() == null? - self.resolveGlobal(escapedName): - NamespaceUtil.getNamedMembershipFor(self, escapedName); + if (self.getOwningNamespace() == null) { + return self.resolveGlobal(name); + } + Membership membership = NamespaceUtil.getNamedMembershipFor(self, name); + return membership != null ? membership : self.getOwningNamespace().resolveLocal(name); } } diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveVisible_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveVisible_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolveVisible_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolveVisible_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java similarity index 74% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java index 4ba3aca78c..e6bd2d251c 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_resolve_InvocationDelegate.java @@ -27,8 +27,8 @@ import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.BasicInvocationDelegate; +import org.omg.sysml.lang.sysml.Membership; import org.omg.sysml.lang.sysml.Namespace; -import org.omg.sysml.util.NamespaceUtil; public class Namespace_resolve_InvocationDelegate extends BasicInvocationDelegate { @@ -40,8 +40,20 @@ public Namespace_resolve_InvocationDelegate(EOperation operation) { public Object dynamicInvoke(InternalEObject target, EList arguments) throws InvocationTargetException { Namespace self = (Namespace) target; String qualifiedName = (String) arguments.get(0); - - return NamespaceUtil.getNamedMembershipFor(self, qualifiedName); + String qualification = self.qualificationOf(qualifiedName); + String name = self.unqualifiedNameOf(qualifiedName); + + if (qualification == null) { + return self.resolveLocal(name); + } else if ("$".equals(qualification)) { + return self.resolveGlobal(name); + } else { + Membership namespaceMembership = self.resolve(qualification); + if (namespaceMembership == null || !(namespaceMembership.getMemberElement() instanceof Namespace)) { + return null; + } + return ((Namespace) namespaceMembership.getMemberElement()).resolveVisible(name); + } } } diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_unqualifiedNameOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_unqualifiedNameOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_unqualifiedNameOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_unqualifiedNameOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_visibilityOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_visibilityOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_visibilityOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_visibilityOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_visibleMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_visibleMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_visibleMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Namespace_visibleMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/NullExpression_evaluate_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/NullExpression_evaluate_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/NullExpression_evaluate_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/NullExpression_evaluate_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/NullExpression_modelLevelEvaluable_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/NullExpression_modelLevelEvaluable_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/NullExpression_modelLevelEvaluable_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/NullExpression_modelLevelEvaluable_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperationInvocationDelegateFactory.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperationInvocationDelegateFactory.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperationInvocationDelegateFactory.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperationInvocationDelegateFactory.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperationInvocationDelegateSelector.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperationInvocationDelegateSelector.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperationInvocationDelegateSelector.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperationInvocationDelegateSelector.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java index ee94a51a87..9c01c1721c 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OperatorExpression_instantiatedType_InvocationDelegate.java @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.omg.sysml.lang.sysml.Function; import org.omg.sysml.lang.sysml.OperatorExpression; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.ExpressionUtil; public class OperatorExpression_instantiatedType_InvocationDelegate extends Expression_evaluate_InvocationDelegate { diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/OwningMembership_path_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OwningMembership_path_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/OwningMembership_path_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/OwningMembership_path_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Package_includeAsMember_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Package_includeAsMember_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Package_includeAsMember_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Package_includeAsMember_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ParameterMembership_parameterDirection_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ParameterMembership_parameterDirection_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ParameterMembership_parameterDirection_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ParameterMembership_parameterDirection_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/PerformActionUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/PerformActionUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/PerformActionUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/PerformActionUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ReferenceUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ReferenceUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ReferenceUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ReferenceUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Relationship_libraryNamespace_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Relationship_libraryNamespace_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Relationship_libraryNamespace_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Relationship_libraryNamespace_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Relationship_path_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Relationship_path_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Relationship_path_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Relationship_path_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/RenderingUsage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/RenderingUsage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/RenderingUsage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/RenderingUsage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ReturnParameterMembership_parameterDirection_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ReturnParameterMembership_parameterDirection_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ReturnParameterMembership_parameterDirection_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ReturnParameterMembership_parameterDirection_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/StateUsage_isSubstateUsage_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/StateUsage_isSubstateUsage_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/StateUsage_isSubstateUsage_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/StateUsage_isSubstateUsage_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/TransitionUsage_sourceFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TransitionUsage_sourceFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/TransitionUsage_sourceFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TransitionUsage_sourceFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/TransitionUsage_triggerPayloadParameter_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TransitionUsage_triggerPayloadParameter_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/TransitionUsage_triggerPayloadParameter_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TransitionUsage_triggerPayloadParameter_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java index fd56227779..439abaf79e 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/TriggerInvocationExpression_instantiatedType_InvocationDelegate.java @@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.omg.sysml.lang.sysml.TriggerInvocationExpression; import org.omg.sysml.lang.sysml.TriggerKind; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; +import org.omg.sysml.util.SysMLLibraryUtil; import org.omg.sysml.util.ImplicitGeneralizationMap; public class TriggerInvocationExpression_instantiatedType_InvocationDelegate extends Expression_evaluate_InvocationDelegate { diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_allRedefinedFeaturesOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_allRedefinedFeaturesOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_allRedefinedFeaturesOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_allRedefinedFeaturesOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_allSupertypes_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_allSupertypes_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_allSupertypes_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_allSupertypes_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_directionOfExcluding_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_directionOfExcluding_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_directionOfExcluding_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_directionOfExcluding_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_directionOf_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_directionOf_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_directionOf_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_directionOf_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_inheritableMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_inheritableMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_inheritableMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_inheritableMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_inheritedMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_inheritedMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_inheritedMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_inheritedMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_isCompatibleWith_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_isCompatibleWith_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_isCompatibleWith_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_isCompatibleWith_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_multiplicities_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_multiplicities_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_multiplicities_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_multiplicities_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_nonPrivateMemberships_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_nonPrivateMemberships_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_nonPrivateMemberships_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_nonPrivateMemberships_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_removeRedefinedFeatures_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_removeRedefinedFeatures_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_removeRedefinedFeatures_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_removeRedefinedFeatures_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_specializesFromLibrary_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_specializesFromLibrary_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_specializesFromLibrary_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_specializesFromLibrary_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_specializes_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_specializes_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_specializes_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_specializes_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_supertypes_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_supertypes_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Type_supertypes_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Type_supertypes_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Usage_namingFeature_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Usage_namingFeature_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Usage_namingFeature_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Usage_namingFeature_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Usage_referencedFeatureTarget_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Usage_referencedFeatureTarget_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/Usage_referencedFeatureTarget_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/Usage_referencedFeatureTarget_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/ViewUsage_includeAsExposed_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ViewUsage_includeAsExposed_InvocationDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/invocation/ViewUsage_includeAsExposed_InvocationDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/ViewUsage_includeAsExposed_InvocationDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_payloadParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_receiverArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_receiverArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AcceptActionUsage_receiverArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AcceptActionUsage_receiverArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionDefinition_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionDefinition_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionDefinition_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionDefinition_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionUsage_actionDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionUsage_actionDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionUsage_actionDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionUsage_actionDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionUsage_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionUsage_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ActionUsage_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActionUsage_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ActorMembership_ownedActorParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActorMembership_ownedActorParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ActorMembership_ownedActorParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ActorMembership_ownedActorParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AllocationUsage_allocationDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AllocationUsage_allocationDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AllocationUsage_allocationDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AllocationUsage_allocationDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseDefinition_resultExpression_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseDefinition_resultExpression_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseDefinition_resultExpression_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseDefinition_resultExpression_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseUsage_analysisCaseDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseUsage_analysisCaseDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseUsage_analysisCaseDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseUsage_analysisCaseDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseUsage_resultExpression_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseUsage_resultExpression_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnalysisCaseUsage_resultExpression_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnalysisCaseUsage_resultExpression_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_annotatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_annotatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_annotatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_annotatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_annotation_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_annotation_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_annotation_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_annotation_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_ownedAnnotatingRelationship_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_ownedAnnotatingRelationship_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_ownedAnnotatingRelationship_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_ownedAnnotatingRelationship_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_owningAnnotatingRelationship_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_owningAnnotatingRelationship_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AnnotatingElement_owningAnnotatingRelationship_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AnnotatingElement_owningAnnotatingRelationship_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_annotatingElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_annotatingElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_annotatingElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_annotatingElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_ownedAnnotatingElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_ownedAnnotatingElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_ownedAnnotatingElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_ownedAnnotatingElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_owningAnnotatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_owningAnnotatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_owningAnnotatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_owningAnnotatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_owningAnnotatingElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_owningAnnotatingElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Annotation_owningAnnotatingElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Annotation_owningAnnotatingElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AssertConstraintUsage_assertedConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssertConstraintUsage_assertedConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AssertConstraintUsage_assertedConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssertConstraintUsage_assertedConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_referent_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_referent_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_referent_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_referent_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_targetArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_targetArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_targetArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_targetArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_valueExpression_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_valueExpression_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AssignmentActionUsage_valueExpression_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AssignmentActionUsage_valueExpression_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_associationEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_associationEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_associationEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_associationEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_relatedType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_relatedType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_relatedType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_relatedType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_sourceType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_sourceType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_sourceType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_sourceType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_targetType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_targetType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Association_targetType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Association_targetType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/AttributeUsage_attributeDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AttributeUsage_attributeDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/AttributeUsage_attributeDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/AttributeUsage_attributeDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedListSettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedListSettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedListSettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedListSettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedObjectSettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedObjectSettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedObjectSettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedObjectSettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedPropertySettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedPropertySettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/BasicDerivedPropertySettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BasicDerivedPropertySettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Behavior_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Behavior_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Behavior_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Behavior_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/BooleanExpression_predicate_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BooleanExpression_predicate_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/BooleanExpression_predicate_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/BooleanExpression_predicate_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationDefinition_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationDefinition_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationDefinition_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationDefinition_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationDefinition_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationDefinition_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationDefinition_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationDefinition_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_calculationDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_calculationDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_calculationDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_calculationDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CalculationUsage_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CalculationUsage_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_actorParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_actorParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_actorParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_actorParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_objectiveRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_objectiveRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_objectiveRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_objectiveRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_subjectParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_subjectParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseDefinition_subjectParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseDefinition_subjectParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_actorParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_actorParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_actorParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_actorParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_caseDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_caseDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_caseDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_caseDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_objectiveRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_objectiveRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_objectiveRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_objectiveRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_subjectParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_subjectParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CaseUsage_subjectParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CaseUsage_subjectParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConcernUsage_concernDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConcernUsage_concernDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConcernUsage_concernDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConcernUsage_concernDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_originalPortDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_originalPortDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_originalPortDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_originalPortDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_ownedPortConjugator_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_ownedPortConjugator_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_ownedPortConjugator_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortDefinition_ownedPortConjugator_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortTyping_portDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortTyping_portDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConjugatedPortTyping_portDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConjugatedPortTyping_portDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Conjugation_owningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Conjugation_owningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Conjugation_owningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Conjugation_owningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_connectionEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_connectionEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_connectionEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_connectionEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_relatedType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_relatedType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_relatedType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_relatedType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_sourceType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_sourceType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_sourceType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_sourceType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_targetType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_targetType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionDefinition_targetType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionDefinition_targetType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionUsage_connectionDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionUsage_connectionDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionUsage_connectionDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionUsage_connectionDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionUsage_individualDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionUsage_individualDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectionUsage_individualDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectionUsage_individualDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_association_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_association_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_association_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_association_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_connectorEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_connectorEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_connectorEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_connectorEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_defaultFeaturingType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_defaultFeaturingType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_defaultFeaturingType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_defaultFeaturingType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_relatedFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_relatedFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_relatedFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_relatedFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_sourceFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_sourceFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_sourceFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_sourceFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_targetFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_targetFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConnectorAsUsage_targetFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConnectorAsUsage_targetFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_association_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_association_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_association_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_association_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_connectorEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_connectorEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_connectorEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_connectorEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_defaultFeaturingType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_defaultFeaturingType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_defaultFeaturingType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_defaultFeaturingType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_relatedFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_relatedFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_relatedFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_relatedFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_sourceFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_sourceFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_sourceFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_sourceFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_targetFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_targetFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Connector_targetFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Connector_targetFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintDefinition_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintDefinition_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_constraintDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_constraintDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_constraintDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_constraintDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ConstraintUsage_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ConstraintUsage_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/CrossSubsetting_crossingFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CrossSubsetting_crossingFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/CrossSubsetting_crossingFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/CrossSubsetting_crossingFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java similarity index 97% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java index 1e7b4e2e1d..a6530d2181 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/DefaultDerivedPropertySettingDelegate.java @@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.uml2.common.util.DerivedEObjectEList; +import org.omg.sysml.lang.sysml.util.DerivedEObjectEList; public class DefaultDerivedPropertySettingDelegate extends BasicDerivedListSettingDelegate { diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Definition_directedUsage_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_variant_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Definition_variant_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Definition_variant_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Definition_variant_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/DerivedPropertySettingDelegateFactory.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/DerivedPropertySettingDelegateFactory.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/DerivedPropertySettingDelegateFactory.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/DerivedPropertySettingDelegateFactory.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Differencing_typeDifferenced_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Differencing_typeDifferenced_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Differencing_typeDifferenced_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Differencing_typeDifferenced_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Disjoining_owningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Disjoining_owningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Disjoining_owningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Disjoining_owningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Documentation_documentedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Documentation_documentedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Documentation_documentedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Documentation_documentedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ElementFilterMembership_condition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ElementFilterMembership_condition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ElementFilterMembership_condition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ElementFilterMembership_condition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_elementId_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_elementId_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_elementId_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_elementId_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_isLibraryElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_isLibraryElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_isLibraryElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_isLibraryElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_name_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_name_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_name_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_name_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_ownedAnnotation_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_ownedAnnotation_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_ownedAnnotation_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_ownedAnnotation_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_ownedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_ownedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_ownedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_ownedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owner_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owner_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owner_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owner_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owningMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owningMembership_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owningMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owningMembership_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owningNamespace_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owningNamespace_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_owningNamespace_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_owningNamespace_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_qualifiedName_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_qualifiedName_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_qualifiedName_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_qualifiedName_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_shortName_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_shortName_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Element_shortName_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Element_shortName_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/EnumerationDefinition_enumeratedValue_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EnumerationDefinition_enumeratedValue_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/EnumerationDefinition_enumeratedValue_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EnumerationDefinition_enumeratedValue_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/EnumerationUsage_enumerationDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EnumerationUsage_enumerationDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/EnumerationUsage_enumerationDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EnumerationUsage_enumerationDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/EventOccurrenceUsage_eventOccurrence_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EventOccurrenceUsage_eventOccurrence_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/EventOccurrenceUsage_eventOccurrence_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/EventOccurrenceUsage_eventOccurrence_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ExhibitStateUsage_exhibitedState_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ExhibitStateUsage_exhibitedState_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ExhibitStateUsage_exhibitedState_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ExhibitStateUsage_exhibitedState_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_function_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_function_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_function_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_function_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Expression_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Expression_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureChainExpression_targetFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureChainExpression_targetFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureChainExpression_targetFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureChainExpression_targetFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureChaining_featureChained_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureChaining_featureChained_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureChaining_featureChained_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureChaining_featureChained_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureInverting_owningFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureInverting_owningFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureInverting_owningFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureInverting_owningFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureMembership_ownedMemberFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureMembership_ownedMemberFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureMembership_ownedMemberFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureMembership_ownedMemberFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureMembership_owningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureMembership_owningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureMembership_owningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureMembership_owningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureReferenceExpression_referent_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureReferenceExpression_referent_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureReferenceExpression_referent_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureReferenceExpression_referent_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureTyping_owningFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureTyping_owningFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureTyping_owningFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureTyping_owningFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureValue_featureWithValue_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureValue_featureWithValue_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureValue_featureWithValue_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureValue_featureWithValue_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureValue_value_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureValue_value_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FeatureValue_value_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FeatureValue_value_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_chainingFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_chainingFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_chainingFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_chainingFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_crossFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_crossFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_crossFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_crossFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_endOwningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_endOwningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_endOwningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_endOwningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_featureTarget_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_featureTarget_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_featureTarget_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_featureTarget_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_featuringType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_featuringType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_featuringType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_featuringType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedCrossSubsetting_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedCrossSubsetting_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedCrossSubsetting_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedCrossSubsetting_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedFeatureInverting_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedFeatureInverting_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedFeatureInverting_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedFeatureInverting_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedReferenceSubsetting_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedReferenceSubsetting_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedReferenceSubsetting_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedReferenceSubsetting_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedTypeFeaturing_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedTypeFeaturing_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_ownedTypeFeaturing_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_ownedTypeFeaturing_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_owningFeatureMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_owningFeatureMembership_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_owningFeatureMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_owningFeatureMembership_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_owningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_owningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_owningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_owningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_type_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_type_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_type_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Feature_type_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_flowEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_flowEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_flowEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_flowEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_relatedType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_relatedType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_relatedType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_relatedType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_sourceType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_sourceType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_sourceType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_sourceType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_targetType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_targetType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowDefinition_targetType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowDefinition_targetType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_connectorEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_connectorEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_connectorEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_connectorEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_flowDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_flowDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_flowDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_flowDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_flowEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_flowEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_flowEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_flowEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_payloadFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_payloadFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_payloadFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_payloadFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_payloadType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_payloadType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_payloadType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_payloadType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_sourceOutputFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_sourceOutputFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_sourceOutputFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_sourceOutputFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_targetInputFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_targetInputFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FlowUsage_targetInputFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FlowUsage_targetInputFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_flowEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_flowEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_flowEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_flowEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_interaction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_interaction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_interaction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_interaction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_payloadFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_payloadFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_payloadFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_payloadFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_payloadType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_payloadType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_payloadType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_payloadType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_sourceOutputFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_sourceOutputFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_sourceOutputFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_sourceOutputFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_targetInputFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_targetInputFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Flow_targetInputFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Flow_targetInputFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ForLoopActionUsage_loopVariable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ForLoopActionUsage_loopVariable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ForLoopActionUsage_loopVariable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ForLoopActionUsage_loopVariable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ForLoopActionUsage_seqArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ForLoopActionUsage_seqArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ForLoopActionUsage_seqArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ForLoopActionUsage_seqArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FramedConcernMembership_ownedConcern_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FramedConcernMembership_ownedConcern_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FramedConcernMembership_ownedConcern_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FramedConcernMembership_ownedConcern_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/FramedConcernMembership_referencedConcern_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FramedConcernMembership_referencedConcern_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/FramedConcernMembership_referencedConcern_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/FramedConcernMembership_referencedConcern_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Function_isModelLevelEvaluable_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Function_isModelLevelEvaluable_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Function_isModelLevelEvaluable_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Function_isModelLevelEvaluable_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Function_result_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Function_result_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Function_result_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Function_result_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_elseAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_elseAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_elseAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_elseAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_ifArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_ifArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_ifArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_ifArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_thenAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_thenAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/IfActionUsage_thenAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IfActionUsage_thenAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Import_importOwningNamespace_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Import_importOwningNamespace_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Import_importOwningNamespace_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Import_importOwningNamespace_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Import_importedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Import_importedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Import_importedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Import_importedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/IncludeUseCaseUsage_useCaseIncluded_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IncludeUseCaseUsage_useCaseIncluded_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/IncludeUseCaseUsage_useCaseIncluded_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/IncludeUseCaseUsage_useCaseIncluded_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/InstantiationExpression_argument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InstantiationExpression_argument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/InstantiationExpression_argument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InstantiationExpression_argument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/InstantiationExpression_instantiatedType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InstantiationExpression_instantiatedType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/InstantiationExpression_instantiatedType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InstantiationExpression_instantiatedType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Interaction_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Interaction_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Interaction_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Interaction_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/InterfaceDefinition_interfaceEnd_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InterfaceDefinition_interfaceEnd_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/InterfaceDefinition_interfaceEnd_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InterfaceDefinition_interfaceEnd_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/InterfaceUsage_interfaceDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InterfaceUsage_interfaceDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/InterfaceUsage_interfaceDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InterfaceUsage_interfaceDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Intersecting_typeIntersected_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Intersecting_typeIntersected_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Intersecting_typeIntersected_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Intersecting_typeIntersected_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/InvocationExpression_operand_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InvocationExpression_operand_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/InvocationExpression_operand_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/InvocationExpression_operand_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ItemUsage_itemDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ItemUsage_itemDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ItemUsage_itemDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ItemUsage_itemDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/LoopActionUsage_bodyAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/LoopActionUsage_bodyAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/LoopActionUsage_bodyAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/LoopActionUsage_bodyAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Membership_memberElementId_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Membership_memberElementId_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Membership_memberElementId_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Membership_memberElementId_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Membership_membershipOwningNamespace_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Membership_membershipOwningNamespace_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Membership_membershipOwningNamespace_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Membership_membershipOwningNamespace_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataAccessExpression_referencedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataAccessExpression_referencedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataAccessExpression_referencedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataAccessExpression_referencedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataFeature_annotatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataFeature_annotatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataFeature_annotatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataFeature_annotatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataFeature_metaclass_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataFeature_metaclass_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataFeature_metaclass_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataFeature_metaclass_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataUsage_annotatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataUsage_annotatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataUsage_annotatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataUsage_annotatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataUsage_metadataDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataUsage_metadataDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MetadataUsage_metadataDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MetadataUsage_metadataDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_bound_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_bound_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_bound_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_bound_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_lowerBound_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_lowerBound_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_lowerBound_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_lowerBound_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_upperBound_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_upperBound_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/MultiplicityRange_upperBound_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/MultiplicityRange_upperBound_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_importedMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_importedMembership_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_importedMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_importedMembership_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_member_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_member_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_member_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_member_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_ownedMember_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_ownedMember_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_ownedMember_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_ownedMember_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java similarity index 96% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java index f8e8651f22..45d9dfb794 100644 --- a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Namespace_ownedMembership_SettingDelegate.java @@ -24,9 +24,9 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.uml2.common.util.DerivedEObjectEList; import org.omg.sysml.lang.sysml.Membership; import org.omg.sysml.lang.sysml.SysMLPackage; +import org.omg.sysml.lang.sysml.util.DerivedEObjectEList; public class Namespace_ownedMembership_SettingDelegate extends BasicDerivedListSettingDelegate { diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ObjectiveMembership_ownedObjectiveRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ObjectiveMembership_ownedObjectiveRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ObjectiveMembership_ownedObjectiveRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ObjectiveMembership_ownedObjectiveRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OccurrenceUsage_individualDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OccurrenceUsage_individualDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OccurrenceUsage_individualDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OccurrenceUsage_individualDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OccurrenceUsage_occurrenceDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OccurrenceUsage_occurrenceDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OccurrenceUsage_occurrenceDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OccurrenceUsage_occurrenceDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElementId_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElementId_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElementId_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElementId_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberName_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberName_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberName_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberName_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberShortName_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberShortName_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberShortName_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/OwningMembership_ownedMemberShortName_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Package_filterCondition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Package_filterCondition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Package_filterCondition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Package_filterCondition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ParameterMembership_ownedMemberParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ParameterMembership_ownedMemberParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ParameterMembership_ownedMemberParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ParameterMembership_ownedMemberParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/PartUsage_partDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PartUsage_partDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/PartUsage_partDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PartUsage_partDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/PerformActionUsage_performedAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PerformActionUsage_performedAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/PerformActionUsage_performedAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PerformActionUsage_performedAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/PortConjugation_conjugatedPortDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortConjugation_conjugatedPortDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/PortConjugation_conjugatedPortDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortConjugation_conjugatedPortDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/PortDefinition_conjugatedPortDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortDefinition_conjugatedPortDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/PortDefinition_conjugatedPortDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortDefinition_conjugatedPortDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/PortUsage_portDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortUsage_portDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/PortUsage_portDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/PortUsage_portDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ReferenceSubsetting_referencingFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ReferenceSubsetting_referencingFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ReferenceSubsetting_referencingFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ReferenceSubsetting_referencingFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Relationship_owningRelatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Relationship_owningRelatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Relationship_owningRelatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Relationship_owningRelatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Relationship_relatedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Relationship_relatedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Relationship_relatedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Relationship_relatedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RenderingUsage_renderingDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RenderingUsage_renderingDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RenderingUsage_renderingDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RenderingUsage_renderingDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementConstraintMembership_ownedConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementConstraintMembership_ownedConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementConstraintMembership_ownedConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementConstraintMembership_ownedConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementConstraintMembership_referencedConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementConstraintMembership_referencedConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementConstraintMembership_referencedConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementConstraintMembership_referencedConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_actorParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_actorParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_actorParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_actorParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_assumedConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_assumedConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_assumedConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_assumedConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_framedConcern_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_framedConcern_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_framedConcern_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_framedConcern_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_requiredConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_requiredConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_requiredConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_requiredConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_stakeholderParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_stakeholderParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_stakeholderParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_stakeholderParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_subjectParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_subjectParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_subjectParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_subjectParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_text_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_text_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementDefinition_text_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementDefinition_text_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_actorParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_actorParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_actorParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_actorParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_assumedConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_assumedConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_assumedConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_assumedConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_framedConcern_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_framedConcern_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_framedConcern_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_framedConcern_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_requiredConstraint_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_requiredConstraint_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_requiredConstraint_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_requiredConstraint_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_requirementDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_requirementDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_requirementDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_requirementDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_stakeholderParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_stakeholderParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_stakeholderParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_stakeholderParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_subjectParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_subjectParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_subjectParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_subjectParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_text_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_text_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementUsage_text_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementUsage_text_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementVerificationMembership_ownedRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementVerificationMembership_ownedRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementVerificationMembership_ownedRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementVerificationMembership_ownedRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementVerificationMembership_verifiedRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementVerificationMembership_verifiedRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/RequirementVerificationMembership_verifiedRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/RequirementVerificationMembership_verifiedRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ResultExpressionMembership_ownedResultExpression_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ResultExpressionMembership_ownedResultExpression_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ResultExpressionMembership_ownedResultExpression_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ResultExpressionMembership_ownedResultExpression_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfiedRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfiedRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfiedRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfiedRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfyingFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfyingFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfyingFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SatisfyRequirementUsage_satisfyingFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_payloadArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_payloadArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_payloadArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_payloadArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_receiverArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_receiverArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_receiverArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_receiverArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_senderArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_senderArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SendActionUsage_senderArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SendActionUsage_senderArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Specialization_owningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Specialization_owningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Specialization_owningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Specialization_owningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StakeholderMembership_ownedStakeholderParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StakeholderMembership_ownedStakeholderParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StakeholderMembership_ownedStakeholderParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StakeholderMembership_ownedStakeholderParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_doAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_doAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_doAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_doAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_entryAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_entryAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_entryAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_entryAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_exitAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_exitAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateDefinition_exitAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateDefinition_exitAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateSubactionMembership_action_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateSubactionMembership_action_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateSubactionMembership_action_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateSubactionMembership_action_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_doAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_doAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_doAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_doAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_entryAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_entryAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_entryAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_entryAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_exitAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_exitAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_exitAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_exitAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_stateDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_stateDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/StateUsage_stateDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/StateUsage_stateDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Step_behavior_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Step_behavior_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Step_behavior_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Step_behavior_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Step_parameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Step_parameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Step_parameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Step_parameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Subclassification_owningClassifier_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Subclassification_owningClassifier_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Subclassification_owningClassifier_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Subclassification_owningClassifier_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/SubjectMembership_ownedSubjectParameter_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SubjectMembership_ownedSubjectParameter_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/SubjectMembership_ownedSubjectParameter_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/SubjectMembership_ownedSubjectParameter_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Subsetting_owningFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Subsetting_owningFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Subsetting_owningFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Subsetting_owningFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TerminateActionUsage_terminatedOccurrenceArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TerminateActionUsage_terminatedOccurrenceArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TerminateActionUsage_terminatedOccurrenceArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TerminateActionUsage_terminatedOccurrenceArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TextualRepresentation_representedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TextualRepresentation_representedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TextualRepresentation_representedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TextualRepresentation_representedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionFeatureMembership_transitionFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionFeatureMembership_transitionFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionFeatureMembership_transitionFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionFeatureMembership_transitionFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_effectAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_effectAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_effectAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_effectAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_guardExpression_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_guardExpression_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_guardExpression_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_guardExpression_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_source_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_source_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_source_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_source_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_succession_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_succession_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_succession_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_succession_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_target_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_target_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_target_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_target_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_triggerAction_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_triggerAction_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_triggerAction_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TransitionUsage_triggerAction_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/TypeFeaturing_owningFeatureOfType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TypeFeaturing_owningFeatureOfType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/TypeFeaturing_owningFeatureOfType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/TypeFeaturing_owningFeatureOfType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_differencingType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_differencingType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_differencingType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_differencingType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_directedFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_directedFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_directedFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_directedFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_endFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_endFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_endFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_endFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_featureMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_featureMembership_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_featureMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_featureMembership_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_feature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_feature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_feature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_feature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_inheritedFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_inheritedFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_inheritedFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_inheritedFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_inheritedMembership_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_inheritedMembership_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_inheritedMembership_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_inheritedMembership_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_input_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_input_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_input_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_input_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_intersectingType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_intersectingType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_intersectingType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_intersectingType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_isConjugated_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_isConjugated_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_isConjugated_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_isConjugated_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_multiplicity_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_multiplicity_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_multiplicity_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_multiplicity_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_output_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_output_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_output_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_output_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedConjugator_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedConjugator_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedConjugator_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedConjugator_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedDisjoining_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedDisjoining_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedDisjoining_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedDisjoining_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedEndFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedEndFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedEndFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedEndFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedFeature_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedFeature_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedFeature_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedFeature_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedSpecialization_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedSpecialization_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_ownedSpecialization_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_ownedSpecialization_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_unioningType_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_unioningType_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_unioningType_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Type_unioningType_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Unioning_typeUnioned_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Unioning_typeUnioned_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Unioning_typeUnioned_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Unioning_typeUnioned_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_definition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_definition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_definition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_definition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_directedUsage_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_directedUsage_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_directedUsage_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_directedUsage_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_isReference_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_isReference_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_isReference_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_isReference_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_mayTimeVary_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_mayTimeVary_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_mayTimeVary_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_mayTimeVary_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_owningDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_owningDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_owningDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_owningDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_owningUsage_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_owningUsage_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_owningUsage_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_owningUsage_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_variant_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_variant_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/Usage_variant_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/Usage_variant_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseDefinition_includedUseCase_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseDefinition_includedUseCase_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseDefinition_includedUseCase_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseDefinition_includedUseCase_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseUsage_includedUseCase_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseUsage_includedUseCase_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseUsage_includedUseCase_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseUsage_includedUseCase_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseUsage_useCaseDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseUsage_useCaseDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/UseCaseUsage_useCaseDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/UseCaseUsage_useCaseDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/VariantMembership_ownedVariantUsage_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VariantMembership_ownedVariantUsage_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/VariantMembership_ownedVariantUsage_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VariantMembership_ownedVariantUsage_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseDefinition_verifiedRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseDefinition_verifiedRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseDefinition_verifiedRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseDefinition_verifiedRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseUsage_verificationCaseDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseUsage_verificationCaseDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseUsage_verificationCaseDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseUsage_verificationCaseDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseUsage_verifiedRequirement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseUsage_verifiedRequirement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/VerificationCaseUsage_verifiedRequirement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/VerificationCaseUsage_verifiedRequirement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewDefinition_viewCondition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewDefinition_viewCondition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewDefinition_viewCondition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewDefinition_viewCondition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewDefinition_viewRendering_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewDefinition_viewRendering_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewDefinition_viewRendering_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewDefinition_viewRendering_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewRenderingMembership_ownedRendering_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewRenderingMembership_ownedRendering_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewRenderingMembership_ownedRendering_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewRenderingMembership_ownedRendering_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewRenderingMembership_referencedRendering_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewRenderingMembership_referencedRendering_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewRenderingMembership_referencedRendering_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewRenderingMembership_referencedRendering_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_exposedElement_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_exposedElement_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_exposedElement_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_exposedElement_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewCondition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewCondition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewCondition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewCondition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewRendering_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewRendering_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewUsage_viewRendering_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewUsage_viewRendering_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointDefinition_viewpointStakeholder_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointDefinition_viewpointStakeholder_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointDefinition_viewpointStakeholder_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointDefinition_viewpointStakeholder_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointDefinition_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointDefinition_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointDefinition_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointDefinition_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointStakeholder_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointStakeholder_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointStakeholder_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/ViewpointUsage_viewpointStakeholder_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/WhileLoopActionUsage_untilArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/WhileLoopActionUsage_untilArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/WhileLoopActionUsage_untilArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/WhileLoopActionUsage_untilArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/setting/WhileLoopActionUsage_whileArgument_SettingDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/WhileLoopActionUsage_whileArgument_SettingDelegate.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/delegate/setting/WhileLoopActionUsage_whileArgument_SettingDelegate.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/setting/WhileLoopActionUsage_whileArgument_SettingDelegate.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/ExpressionEvaluator.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ExpressionEvaluator.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/ExpressionEvaluator.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ExpressionEvaluator.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/ModelLevelExpressionEvaluator.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ModelLevelExpressionEvaluator.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/ModelLevelExpressionEvaluator.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ModelLevelExpressionEvaluator.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/ModelLevelLibraryFunctionFactory.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ModelLevelLibraryFunctionFactory.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/ModelLevelLibraryFunctionFactory.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/ModelLevelLibraryFunctionFactory.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/LibraryFeature.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/LibraryFeature.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/LibraryFeature.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/LibraryFeature.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/LibraryFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/LibraryFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/LibraryFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/LibraryFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AsFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AsFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AsFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AsFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AtAtFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AtAtFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AtAtFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AtAtFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AtFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AtFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/AtFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/AtFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/BaseFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/BaseFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/BaseFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/BaseFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/EqualsFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/EqualsFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/EqualsFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/EqualsFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/HasTypeFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/HasTypeFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/HasTypeFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/HasTypeFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/IndexFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/IndexFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/IndexFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/IndexFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/IsTypeFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/IsTypeFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/IsTypeFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/IsTypeFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/ListConcatFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/ListConcatFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/ListConcatFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/ListConcatFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/MetaFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/MetaFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/MetaFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/MetaFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/NotEqualsFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/NotEqualsFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/NotEqualsFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/NotEqualsFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/NotSameFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/NotSameFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/NotSameFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/NotSameFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/base/SameFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/SameFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/base/SameFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/base/SameFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/AndFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/AndFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/AndFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/AndFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/BooleanFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/BooleanFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/BooleanFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/BooleanFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/NotFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/NotFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/NotFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/NotFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/OrFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/OrFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/OrFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/OrFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/XorFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/XorFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/bool/XorFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/bool/XorFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/CollectFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/CollectFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/CollectFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/CollectFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalAndFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalAndFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalAndFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalAndFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalImpliesFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalImpliesFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalImpliesFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalImpliesFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalLogicalFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalLogicalFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalLogicalFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalLogicalFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalOrFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalOrFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ConditionalOrFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ConditionalOrFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ControlFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ControlFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/ControlFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/ControlFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/DotFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/DotFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/DotFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/DotFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/NullCoalescingFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/NullCoalescingFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/NullCoalescingFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/NullCoalescingFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/control/SelectFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/SelectFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/control/SelectFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/control/SelectFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/ArithmeticFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/ArithmeticFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/ArithmeticFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/ArithmeticFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/DataFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/DataFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/DataFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/DataFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/DivideFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/DivideFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/DivideFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/DivideFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/GreaterThanFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/GreaterThanFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/GreaterThanFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/GreaterThanFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/GreaterThanOrEqualFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/GreaterThanOrEqualFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/GreaterThanOrEqualFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/GreaterThanOrEqualFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/LessThanFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/LessThanFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/LessThanFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/LessThanFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/LessThanOrEqualFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/LessThanOrEqualFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/LessThanOrEqualFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/LessThanOrEqualFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/ListRangeFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/ListRangeFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/ListRangeFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/ListRangeFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/MinusFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/MinusFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/MinusFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/MinusFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/PlusFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/PlusFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/PlusFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/PlusFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/PowerFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/PowerFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/PowerFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/PowerFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/RemainderFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/RemainderFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/RemainderFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/RemainderFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/data/TimesFunction.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/TimesFunction.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/data/TimesFunction.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/data/TimesFunction.java diff --git a/org.omg.sysml/src/org/omg/sysml/expressions/functions/trig/PiFeature.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/trig/PiFeature.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/expressions/functions/trig/PiFeature.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/expressions/functions/trig/PiFeature.java diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/ResourceSetModelLibraryProvider.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/ResourceSetModelLibraryProvider.java new file mode 100644 index 0000000000..77e6f3a348 --- /dev/null +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/ResourceSetModelLibraryProvider.java @@ -0,0 +1,224 @@ +/******************************************************************************* + * SysML 2 Pilot Implementation + * Copyright (c) 2026 Model Driven Solutions, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + * + *******************************************************************************/ + +package org.omg.sysml.logic; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.omg.sysml.lang.sysml.Element; +import org.omg.sysml.lang.sysml.Membership; +import org.omg.sysml.lang.sysml.Namespace; +import org.omg.sysml.lang.sysml.OwningMembership; +import org.omg.sysml.logic.api.IModelLibraryProvider; +import org.omg.sysml.util.SysMLLibraryUtil; + +/** + * Plain-EMF library lookup for standalone applications. + * + *

This provider resolves qualified names using the containment hierarchy and + * membership names already loaded in a {@link ResourceSet}. It intentionally + * does not depend on Xtext indexing or alias-based lookup. + */ +public class ResourceSetModelLibraryProvider implements IModelLibraryProvider { + + private static final String MODEL_LIBRARY_FOLDER = "sysml.library"; + + /** + * Resolves a qualified library name against the resources already loaded in + * the context element's resource set. + */ + @Override + public Element getElement(Element context, String name) { + if (context == null || name == null || name.isBlank()) { + return null; + } + + Resource resource = context.eResource(); + ResourceSet resourceSet = resource == null ? null : resource.getResourceSet(); + if (resourceSet == null) { + return null; + } + + String[] segments = name.split("::"); + if (segments.length == 0) { + return null; + } + + List candidates = getCandidateResources(resourceSet); + for (Resource candidate : candidates) { + Element element = getElement(candidate, segments); + if (element != null) { + return element; + } + } + + return null; + } + + /** + * Prioritizes resources that appear to belong to the model library and falls + * back to all other loaded resources when no library resource is detected. + */ + private List getCandidateResources(ResourceSet resourceSet) { + List libraryResources = new ArrayList<>(); + List otherResources = new ArrayList<>(); + + for (Resource resource : resourceSet.getResources()) { + if (isLibraryResource(resource)) { + libraryResources.add(resource); + } else { + otherResources.add(resource); + } + } + + return libraryResources.isEmpty() ? otherResources : libraryResources; + } + + /** + * Identifies resources that should be treated as library candidates based on + * the configured model library path or the conventional {@code sysml.library} + * folder name in the URI. + */ + private boolean isLibraryResource(Resource resource) { + if (resource == null || resource.getURI() == null) { + return false; + } + + String modelLibraryPath = SysMLLibraryUtil.getModelLibraryPath(); + String uriString = resource.getURI().toString(); + String fileString = resource.getURI().toFileString(); + if (modelLibraryPath != null && !modelLibraryPath.isBlank()) { + if (uriString.contains(modelLibraryPath)) { + return true; + } + if (fileString != null && fileString.contains(modelLibraryPath)) { + return true; + } + } + + return resource.getURI().segmentsList().contains(MODEL_LIBRARY_FOLDER); + } + + /** + * Attempts to resolve the qualified-name segments against each root element + * contained by a resource. + */ + private Element getElement(Resource resource, String[] segments) { + for (EObject object : resource.getContents()) { + if (object instanceof Element element) { + Element match = resolveElement(element, segments, 0); + if (match != null) { + return match; + } + } + } + return null; + } + + /** + * Resolves one qualified-name segment at a time by matching the current + * element and then descending through namespace memberships. + */ + private Element resolveElement(Element element, String[] segments, int index) { + if (!matchesElementName(element, segments[index])) { + return null; + } + + if (index == segments.length - 1) { + return element; + } + + if (!(element instanceof Namespace namespace)) { + return null; + } + + String nextSegment = segments[index + 1]; + for (Membership membership : getOwnedMemberships(namespace)) { + Element member = membership.getMemberElement(); + if (member == null || !matchesMembershipName(membership, member, nextSegment)) { + continue; + } + + if (index + 1 == segments.length - 1) { + return member; + } + + Element nested = resolveElement(member, segments, index + 1); + if (nested != null) { + return nested; + } + } + + return null; + } + + /** + * Returns the memberships owned directly by a namespace using only EMF model + * state, avoiding any Xtext-specific scoping infrastructure. + */ + private List getOwnedMemberships(Namespace namespace) { + List memberships = new ArrayList<>(); + for (EObject relationship : namespace.getOwnedRelationship()) { + if (relationship instanceof Membership membership) { + memberships.add(membership); + } + } + return memberships; + } + + /** + * Matches a qualified-name segment against an element's declared name or + * declared short name. + */ + private boolean matchesElementName(Element element, String segment) { + return matches(segment, element.getDeclaredName()) || matches(segment, element.getDeclaredShortName()); + } + + /** + * Matches a qualified-name segment against membership naming first and then + * falls back to the member element's declared names. + */ + private boolean matchesMembershipName(Membership membership, Element member, String segment) { + if (matches(segment, membership.getMemberName()) || matches(segment, membership.getMemberShortName())) { + return true; + } + + if (membership instanceof OwningMembership owningMembership) { + Element ownedMember = owningMembership.getOwnedMemberElement(); + if (ownedMember != null) { + return matchesElementName(ownedMember, segment); + } + } + + return matchesElementName(member, segment); + } + + /** + * Performs an exact name comparison while tolerating missing values. + */ + private boolean matches(String expected, String actual) { + return expected != null && actual != null && expected.equals(actual); + } +} diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/SysMLLogicStandaloneSetup.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/SysMLLogicStandaloneSetup.java new file mode 100644 index 0000000000..d623d72421 --- /dev/null +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/SysMLLogicStandaloneSetup.java @@ -0,0 +1,78 @@ +/******************************************************************************* + * SysML 2 Pilot Implementation + * Copyright (c) 2026 Model Driven Solutions, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + * + *******************************************************************************/ + +package org.omg.sysml.logic; + +import org.eclipse.emf.ecore.EOperation; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.omg.sysml.delegate.invocation.OperationInvocationDelegateFactory; +import org.omg.sysml.delegate.setting.DerivedPropertySettingDelegateFactory; +import org.omg.sysml.logic.api.IModelLibraryProvider; +import org.omg.sysml.util.SysMLLibraryUtil; + +/** + * Standalone bootstrap for applications using {@code org.omg.sysml.logic} + * without Xtext or Eclipse. + * + *

Call this before creating SysML model instances so generated EMF classes + * cache the SysML-specific setting and invocation delegates. + */ +public final class SysMLLogicStandaloneSetup { + + private static final IModelLibraryProvider DEFAULT_LIBRARY_PROVIDER = new ResourceSetModelLibraryProvider(); + + /** + * Utility class; not meant to be instantiated. + */ + private SysMLLogicStandaloneSetup() { + } + + /** + * Installs the default standalone logic bootstrap using a plain-EMF library + * provider. + * + *

Call this before creating or loading SysML model instances that rely on + * SysML setting or invocation delegates. + */ + public static void doSetup() { + doSetup(DEFAULT_LIBRARY_PROVIDER); + } + + /** + * Installs the standalone logic bootstrap using the given library provider. + * + *

This registers the SysML derived-property setting delegate factory and + * operation invocation delegate factory in the global EMF registries, then + * installs the supplied provider for library element lookup. + * + * @param libraryProvider the provider used to resolve SysML/KerML library + * elements in standalone mode + */ + public static void doSetup(IModelLibraryProvider libraryProvider) { + EStructuralFeature.Internal.SettingDelegate.Factory.Registry.INSTANCE.put( + DerivedPropertySettingDelegateFactory.SYSML_ANNOTATION, + new DerivedPropertySettingDelegateFactory()); + EOperation.Internal.InvocationDelegate.Factory.Registry.INSTANCE.put( + OperationInvocationDelegateFactory.SYSML_ANNOTATION, + new OperationInvocationDelegateFactory()); + SysMLLibraryUtil.setProviderLookup(resource -> libraryProvider); + } +} diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/api/IModelLibraryProvider.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/api/IModelLibraryProvider.java new file mode 100644 index 0000000000..ca0864cc3c --- /dev/null +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/logic/api/IModelLibraryProvider.java @@ -0,0 +1,48 @@ +package org.omg.sysml.logic.api; + +import org.omg.sysml.lang.sysml.Element; +import org.omg.sysml.util.SysMLLibraryUtil; + +/** + * Strategy interface for resolving elements from the SysML/KerML model + * libraries. + * + *

{@link SysMLLibraryUtil} delegates library lookup to an implementation of + * this interface so the resolution mechanism can vary by runtime environment. + * For example, an Eclipse/Xtext-based implementation may resolve library + * elements through indexing and scoping services, while a standalone + * implementation may resolve them from resources that are already loaded in an + * EMF resource set. + * + *

The contract of this interface is intentionally small: given a context + * element and a library-qualified name, return the matching library element if + * it can be resolved in the current environment. Implementations are expected + * to be read-only and should not mutate the passed context, its resource set, + * or any global model state as part of a normal lookup. + * + *

The {@code context} parameter provides the resolution environment. It may + * be used to determine which resource set, scope, library location, or + * configuration should be consulted. The {@code name} parameter is expected to + * be a qualified library name in the canonical SysML form using + * {@code "::"} separators, for example {@code "Base::Anything"}. + * + *

If an implementation cannot resolve the requested name, it should return + * {@code null} rather than throwing an exception for ordinary "not found" + * cases. Exceptions should be reserved for truly exceptional situations such as + * invalid runtime configuration or unrecoverable infrastructure failures. + */ +public interface IModelLibraryProvider { + + /** + * Resolves a library element by qualified name relative to the given + * resolution context. + * + * @param context the element providing the lookup context, typically used to + * determine the relevant resource set, scope, or library environment + * @param name the qualified library name to resolve, usually using + * {@code "::"} separators + * @return the resolved library element, or {@code null} if no matching + * element can be found + */ + Element getElement(Element context, String name); +} diff --git a/org.omg.sysml/src/org/omg/sysml/util/ConnectorUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/util/ConnectorUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java index a0e36174c7..d2feb99333 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/ConnectorUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java @@ -37,7 +37,6 @@ import org.omg.sysml.lang.sysml.SysMLFactory; import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; public class ConnectorUtil { diff --git a/org.omg.sysml/src/org/omg/sysml/util/ElementUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ElementUtil.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/util/ElementUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ElementUtil.java index 1a2f6cf3ed..4c49bce5d9 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/ElementUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ElementUtil.java @@ -47,7 +47,6 @@ import org.omg.sysml.lang.sysml.Namespace; import org.omg.sysml.lang.sysml.Relationship; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; public class ElementUtil { diff --git a/org.omg.sysml/src/org/omg/sysml/util/EvaluationUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/EvaluationUtil.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/util/EvaluationUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/EvaluationUtil.java index 98fed8bc21..993f312096 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/EvaluationUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/EvaluationUtil.java @@ -50,7 +50,6 @@ import org.omg.sysml.lang.sysml.SysMLFactory; import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; public class EvaluationUtil { diff --git a/org.omg.sysml/src/org/omg/sysml/util/ExpressionUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ExpressionUtil.java similarity index 99% rename from org.omg.sysml/src/org/omg/sysml/util/ExpressionUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ExpressionUtil.java index b5838b9976..33a4ad9740 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/ExpressionUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ExpressionUtil.java @@ -45,7 +45,6 @@ import org.omg.sysml.lang.sysml.TransitionFeatureKind; import org.omg.sysml.lang.sysml.TransitionFeatureMembership; import org.omg.sysml.lang.sysml.Type; -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil; public class ExpressionUtil { diff --git a/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java diff --git a/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ImplicitGeneralizationMap.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ImplicitGeneralizationMap.java diff --git a/org.omg.sysml/src/org/omg/sysml/util/NamespaceUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/NamespaceUtil.java similarity index 89% rename from org.omg.sysml/src/org/omg/sysml/util/NamespaceUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/NamespaceUtil.java index 3a8773251b..9eec4a025e 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/NamespaceUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/NamespaceUtil.java @@ -26,7 +26,7 @@ import java.util.stream.Stream; import org.eclipse.emf.common.util.EList; -import org.eclipse.xtext.EcoreUtil2; +import org.eclipse.emf.ecore.EObject; import org.omg.sysml.adapter.ImportAdapter; import org.omg.sysml.adapter.NamespaceAdapter; import org.omg.sysml.lang.sysml.AssignmentActionUsage; @@ -42,9 +42,7 @@ import org.omg.sysml.lang.sysml.OwningMembership; import org.omg.sysml.lang.sysml.Relationship; import org.omg.sysml.lang.sysml.SysMLFactory; -import org.omg.sysml.lang.sysml.SysMLPackage; import org.omg.sysml.lang.sysml.VisibilityKind; -import org.omg.sysml.lang.sysml.util.SysMLScopeUtil; public class NamespaceUtil { @@ -98,8 +96,19 @@ public static Stream getMembersByMembershipIn(Names map(type::cast); } - public static Membership getNamedMembershipFor(Namespace namespace, String name) { - return (Membership)SysMLScopeUtil.getElementFor(namespace, SysMLPackage.eINSTANCE.getNamespace_Membership(), name); + /** + * Performs a direct lookup in the current namespace membership list by member + * short name or member name. This is a low-level helper only and does not + * implement the lexical or qualified-name semantics of {@code resolve} or + * {@code resolveLocal}. + */ + public static Membership getNamedMembershipFor(Namespace namespace, String qualifiedOrSimpleName) { + if (namespace == null || qualifiedOrSimpleName == null) { + return null; + } + return namespace.getMembership().stream(). + filter(mem -> qualifiedOrSimpleName.equals(mem.getMemberShortName()) || qualifiedOrSimpleName.equals(mem.getMemberName())). + findFirst().orElse(null); } public static EList cacheImportedMembershipOf(Namespace namespace, Supplier> supplier) { @@ -129,8 +138,11 @@ public static void importMembershipsFor(Import _import, EList import // Related Namespaces public static Namespace getParentNamespaceOf(Element element) { - return element == null? null: - EcoreUtil2.getContainerOfType(element.eContainer(), Namespace.class); + EObject current = element == null ? null : element.eContainer(); + while (current != null && !(current instanceof Namespace)) { + current = current.eContainer(); + } + return (Namespace) current; } public static Namespace getExpressionNamespaceOf(Element element) { diff --git a/org.omg.sysml/src/org/omg/sysml/util/NonNotifyingEObjectEList.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/NonNotifyingEObjectEList.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/NonNotifyingEObjectEList.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/NonNotifyingEObjectEList.java diff --git a/org.omg.sysml/src/org/omg/sysml/util/OperandEList.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/OperandEList.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/OperandEList.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/OperandEList.java diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/SysMLLibraryUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/SysMLLibraryUtil.java new file mode 100644 index 0000000000..f2eb4fccac --- /dev/null +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/SysMLLibraryUtil.java @@ -0,0 +1,159 @@ +package org.omg.sysml.util; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.omg.sysml.lang.sysml.Element; +import org.omg.sysml.lang.sysml.Type; +import org.omg.sysml.logic.api.IModelLibraryProvider; + +/** + * Static entry point for resolving elements from the SysML/KerML model + * libraries. + * + *

This utility centralizes two pieces of state used by library lookup: + * a configured model-library location and a pluggable provider lookup. The + * provider lookup supplies an {@link IModelLibraryProvider} appropriate for the + * current runtime environment, such as an Eclipse/Xtext-based implementation or + * a standalone EMF-based implementation. + * + *

The class itself does not perform library resolution logic directly. + * Instead, it delegates lookups to the provider returned for the context + * element's {@link Resource}. If no provider has been installed, library lookup + * methods return {@code null}. + * + *

The configured model-library path is primarily advisory state shared with + * provider implementations. For example, a standalone provider may use it to + * identify which loaded resources should be treated as library resources. + */ +public class SysMLLibraryUtil { + + /** + * Functional strategy used to obtain a library provider for a given EMF + * resource. + */ + @FunctionalInterface + public interface ProviderLookup { + + /** + * Returns the provider that should resolve library elements for the given + * resource. + * + * @param resource the resource from which a lookup originates, or + * {@code null} if no context resource is available + * @return the library provider to use, or {@code null} if none is available + */ + IModelLibraryProvider get(Resource resource); + } + + /** + * Default logical location of the model library when no explicit directory has + * been configured. + */ + public static final String DEFAULT_MODEL_LIBRARY_PATH = "/resource/sysml.library"; + + private static String modelLibraryPath = DEFAULT_MODEL_LIBRARY_PATH; + private static volatile ProviderLookup providerLookup; + + /** + * Utility class; not meant to be instantiated. + */ + private SysMLLibraryUtil() { + } + + /** + * Sets the filesystem directory that should be treated as the model-library + * location. + * + *

The given directory is normalized through an EMF file {@link URI} so the + * stored path is suitable for comparison with resource URIs across different + * environments. + * + * @param dir the directory containing SysML/KerML library resources + */ + public static void setModelLibraryDirectory(String dir) { + URI uri = URI.createFileURI(dir); + modelLibraryPath = uri.devicePath() != null ? uri.devicePath() : uri.path(); + } + + /** + * Returns the currently configured model-library path. + * + * @return the configured library path, or the default path if none has been + * set explicitly + */ + public static String getModelLibraryPath() { + return modelLibraryPath; + } + + /** + * Installs the runtime-specific provider lookup used for subsequent library + * resolution requests. + * + * @param lookup the lookup strategy to install, or {@code null} to clear the + * current provider lookup + */ + public static void setProviderLookup(ProviderLookup lookup) { + providerLookup = lookup; + } + + /** + * Resolves a library element by qualified name relative to the given context + * element. + * + *

The context element is used to locate the originating resource and obtain + * the appropriate {@link IModelLibraryProvider}. If no provider is available + * or the provider cannot resolve the name, this method returns {@code null}. + * + * @param context the lookup context + * @param name the qualified library name to resolve + * @return the resolved library element, or {@code null} if it cannot be + * resolved + */ + public static Element getLibraryElement(Element context, String name) { + Resource resource = context == null ? null : context.eResource(); + IModelLibraryProvider provider = getInstance(resource); + return provider == null ? null : provider.getElement(context, name); + } + + /** + * Resolves the first matching library element that is also a {@link Type}. + * + *

The provided names are tried in order until one resolves to a library + * element that is a type. Names that resolve to non-type elements are ignored. + * + * @param context the lookup context + * @param defaultNames candidate qualified library names to try in order + * @return the first resolved library type, or {@code null} if none of the + * given names resolves to a type + */ + public static Type getLibraryType(Element context, String... defaultNames) { + for (String defaultName : defaultNames) { + Element element = getLibraryElement(context, defaultName); + if (element instanceof Type type) { + return type; + } + } + return null; + } + + /** + * Obtains the library provider for a resource through the installed provider + * lookup. + * + *

Failures in provider acquisition are treated as lookup failures and + * reported to standard output rather than propagated. + * + * @param resource the originating resource for the lookup + * @return the provider to use, or {@code null} if none is available or if + * provider acquisition fails + */ + private static IModelLibraryProvider getInstance(Resource resource) { + try { + ProviderLookup lookup = providerLookup; + return lookup == null ? null : lookup.get(resource); + } catch (Exception e) { + System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e); + return null; + } + } +} diff --git a/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java diff --git a/org.omg.sysml/src/org/omg/sysml/util/UUIDDigest.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/UUIDDigest.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/UUIDDigest.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/UUIDDigest.java diff --git a/org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/UsageUtil.java similarity index 100% rename from org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java rename to org.omg.sysml.logic/src/main/java/org/omg/sysml/util/UsageUtil.java diff --git a/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/NamespaceResolutionDelegateTest.java b/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/NamespaceResolutionDelegateTest.java new file mode 100644 index 0000000000..b4db68467e --- /dev/null +++ b/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/NamespaceResolutionDelegateTest.java @@ -0,0 +1,276 @@ +/******************************************************************************* + * SysML 2 Pilot Implementation + * Copyright (c) 2026 Model Driven Solutions, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + * + *******************************************************************************/ + +package org.omg.sysml.logic; + +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + +import org.junit.Test; +import org.omg.sysml.lang.sysml.Comment; +import org.omg.sysml.lang.sysml.Membership; +import org.omg.sysml.lang.sysml.Namespace; +import org.omg.sysml.lang.sysml.OwningMembership; +import org.omg.sysml.lang.sysml.SysMLFactory; +import org.omg.sysml.lang.sysml.SysMLPackage; +import org.omg.sysml.lang.sysml.Type; +import org.omg.sysml.util.SysMLLibraryUtil; + +public class NamespaceResolutionDelegateTest { + + private final SysMLFactory factory = SysMLFactory.eINSTANCE; + + /** + * Verifies that lexical resolution stops at the innermost namespace when both + * the current scope and an outer scope provide a membership with the same + * name. + */ + @Test + public void resolveLocalPrefersTheCurrentNamespace() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Type inner = createType("Inner"); + addOwnedElement(outer, inner); + + Membership outerMember = addNamedMembership(outer, createType("shared"), "shared"); + Membership innerMember = addNamedMembership(inner, createType("shared"), "shared"); + + assertSame(innerMember, inner.resolveLocal("shared")); + assertSame(outerMember, outer.resolveLocal("shared")); + } + + /** + * Verifies that lexical resolution continues with the owning namespace when + * the current namespace does not define the requested membership. + */ + @Test + public void resolveLocalFallsBackToContainingNamespace() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Type inner = createType("Inner"); + addOwnedElement(outer, inner); + + Membership outerMember = addNamedMembership(outer, createType("outerOnly"), "outerOnly"); + + assertSame(outerMember, inner.resolveLocal("outerOnly")); + } + + /** + * Verifies the spec rule for root namespaces: simple-name resolution from a + * root namespace defers directly to global lookup rather than searching local + * memberships first. + */ + @Test + public void resolveUsesGlobalLookupFromARootNamespace() { + initializeStandalone(); + + Namespace library = createNamespace("Library"); + Type anything = createType("Anything"); + OwningMembership anythingMembership = addOwnedElement(library, anything); + Namespace root = createNamespace("Root"); + + SysMLLibraryUtil.setProviderLookup(resource -> (context, name) -> "Anything".equals(name) ? anything : null); + + assertSame(anythingMembership, root.resolveLocal("Anything")); + assertSame(anythingMembership, root.resolve("Anything")); + } + + /** + * Verifies that {@code resolve(simpleName)} follows the same lexical search + * path as {@code resolveLocal(simpleName)} for a non-root namespace. + */ + @Test + public void resolveSimpleNameMatchesResolveLocal() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Type inner = createType("Inner"); + addOwnedElement(outer, inner); + Membership outerMember = addNamedMembership(outer, createType("outerOnly"), "outerOnly"); + + assertSame(outerMember, inner.resolve("outerOnly")); + assertSame(inner.resolveLocal("outerOnly"), inner.resolve("outerOnly")); + } + + /** + * Verifies that qualified-name resolution first resolves the qualifier to a + * namespace membership, then resolves the final segment against that + * namespace's visible memberships. + */ + @Test + public void resolveQualifiedNameUsesResolvedNamespaceVisibility() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Type inner = createType("Inner"); + addOwnedElement(outer, inner); + addNamedMembership(outer, inner, "Inner"); + Membership leafMembership = addNamedMembership(inner, createType("leaf"), "leaf"); + + assertSame(leafMembership, outer.resolve("Inner::leaf")); + } + + /** + * Verifies that qualified-name resolution returns {@code null} when an + * intermediate qualifier resolves to a membership whose member element is not + * a namespace. + */ + @Test + public void resolveReturnsNullForNonNamespaceQualifier() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Comment comment = factory.createComment(); + Membership commentMembership = addAliasedMember(outer, comment, "NotNs"); + + assertSame(commentMembership, outer.resolve("NotNs")); + assertNull(outer.resolve("NotNs::leaf")); + } + + /** + * Verifies that a missing library lookup produces {@code null} rather than an + * exception when {@code resolveGlobal} cannot resolve a requested name. + */ + @Test + public void resolveGlobalReturnsNullOnMiss() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + SysMLLibraryUtil.setProviderLookup(resource -> (context, name) -> null); + + assertNull(root.resolveGlobal("Missing")); + assertNull(root.resolveLocal("Missing")); + } + + /** + * Verifies that both simple-name and qualified-name resolution handle names + * that require KerML escaping in concrete syntax, such as names containing + * spaces. + */ + @Test + public void resolveHandlesNamesThatRequireEscaping() { + initializeStandalone(); + + Namespace root = createNamespace("Root"); + Namespace outer = createNamespace("Outer"); + addOwnedElement(root, outer); + Type inner = createType("Inner"); + addOwnedElement(outer, inner); + addNamedMembership(outer, inner, "Inner"); + Membership spacedMembership = addNamedMembership(inner, createType("name with space"), "name with space"); + + assertSame(spacedMembership, inner.resolveLocal("name with space")); + assertSame(spacedMembership, outer.resolve("Inner::'name with space'")); + } + + /** + * Installs the standalone delegate and library-resolution bootstrap used by + * these direct EMF tests, while resetting any provider lookup state left by a + * previous test. + */ + private void initializeStandalone() { + SysMLLibraryUtil.setProviderLookup(null); + SysMLLogicStandaloneSetup.doSetup(); + SysMLPackage.eINSTANCE.eClass(); + } + + /** + * Creates a namespace with the given declared name. + * + * @param name the declared namespace name used in the test fixture + * @return a new namespace instance + */ + private Namespace createNamespace(String name) { + Namespace namespace = factory.createNamespace(); + namespace.setDeclaredName(name); + return namespace; + } + + /** + * Creates a type with the given declared name. + * + * @param name the declared type name used in the test fixture + * @return a new type instance + */ + private Type createType(String name) { + Type type = factory.createType(); + type.setDeclaredName(name); + return type; + } + + /** + * Adds an owning membership so that the given element is contained by the + * owner namespace and participates in the owning-namespace chain used by + * lexical resolution. + * + * @param owner the namespace that should own the element + * @param element the contained element + * @return the created owning membership + */ + private OwningMembership addOwnedElement(Namespace owner, org.omg.sysml.lang.sysml.Element element) { + OwningMembership membership = factory.createOwningMembership(); + membership.setOwnedMemberElement(element); + owner.getOwnedRelationship().add(membership); + return membership; + } + + /** + * Adds a named membership alias in the given namespace without changing the + * containment of the member element. + * + * @param owner the namespace in which the alias is visible + * @param element the referenced member element + * @param name the membership name used for lookup + * @return the created membership alias + */ + private Membership addNamedMembership(Namespace owner, org.omg.sysml.lang.sysml.Element element, String name) { + Membership membership = factory.createMembership(); + membership.setMemberElement(element); + membership.setMemberName(name); + owner.getOwnedRelationship().add(membership); + return membership; + } + + /** + * Adds a non-owning named membership alias used when the concrete member type + * under test is not itself a namespace. + * + * @param owner the namespace in which the alias is visible + * @param element the referenced member element + * @param name the membership name used for lookup + * @return the created alias membership + */ + private Membership addAliasedMember(Namespace owner, org.omg.sysml.lang.sysml.Element element, String name) { + return addNamedMembership(owner, element, name); + } +} diff --git a/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/SysMLLogicStandaloneSetupTest.java b/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/SysMLLogicStandaloneSetupTest.java new file mode 100644 index 0000000000..ff2ace9911 --- /dev/null +++ b/org.omg.sysml.logic/src/test/java/org/omg/sysml/logic/SysMLLogicStandaloneSetupTest.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * SysML 2 Pilot Implementation + * Copyright (c) 2026 Model Driven Solutions, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + * + *******************************************************************************/ + +package org.omg.sysml.logic; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.impl.ResourceImpl; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.junit.Test; +import org.omg.sysml.lang.sysml.Namespace; +import org.omg.sysml.lang.sysml.OwningMembership; +import org.omg.sysml.lang.sysml.SysMLFactory; +import org.omg.sysml.lang.sysml.SysMLPackage; +import org.omg.sysml.lang.sysml.Type; +import org.omg.sysml.util.SysMLLibraryUtil; + +/** + * Verifies the plain-EMF standalone bootstrap for {@link SysMLLogicStandaloneSetup}. + */ +public class SysMLLogicStandaloneSetupTest { + + /** + * Checks that the standalone setup installs library lookup and delegate + * support without requiring any Xtext runtime bootstrap, and that invoking + * the setup multiple times remains safe for subsequent lookups. + */ + @Test + public void standaloneSetupResolvesLibraryElementsWithoutXtext() { + SysMLLibraryUtil.setProviderLookup(null); + SysMLLibraryUtil.setModelLibraryDirectory("/tmp/sysml.library"); + SysMLLogicStandaloneSetup.doSetup(); + SysMLPackage.eINSTANCE.eClass(); + + ResourceSetImpl resourceSet = new ResourceSetImpl(); + ResourceImpl libraryResource = new ResourceImpl(URI.createFileURI("/tmp/sysml.library/Base.sysml")); + ResourceImpl modelResource = new ResourceImpl(URI.createFileURI("/tmp/model/Test.sysml")); + resourceSet.getResources().add(libraryResource); + resourceSet.getResources().add(modelResource); + + SysMLFactory factory = SysMLFactory.eINSTANCE; + + Namespace library = factory.createNamespace(); + library.setDeclaredName("Base"); + libraryResource.getContents().add(library); + + Type anything = factory.createType(); + anything.setDeclaredName("Anything"); + OwningMembership anythingMembership = factory.createOwningMembership(); + anythingMembership.setOwnedMemberElement(anything); + library.getOwnedRelationship().add(anythingMembership); + + Namespace context = factory.createNamespace(); + context.setDeclaredName("UserModel"); + modelResource.getContents().add(context); + + assertEquals("Anything", anything.effectiveName()); + assertEquals("Anything", anything.getName()); + assertNotNull(SysMLLibraryUtil.getLibraryElement(context, "Base::Anything")); + assertSame(anything, SysMLLibraryUtil.getLibraryType(context, "Base::Anything")); + + SysMLLogicStandaloneSetup.doSetup(); + assertSame(anything, SysMLLibraryUtil.getLibraryType(context, "Base::Anything")); + } +} diff --git a/org.omg.sysml.plantuml/.classpath b/org.omg.sysml.plantuml/.classpath index d738d922a3..9e6625519a 100644 --- a/org.omg.sysml.plantuml/.classpath +++ b/org.omg.sysml.plantuml/.classpath @@ -7,6 +7,7 @@ + diff --git a/org.omg.sysml.xtext.ui/.classpath b/org.omg.sysml.xtext.ui/.classpath index 5570ff40e3..9e5eefbd7f 100644 --- a/org.omg.sysml.xtext.ui/.classpath +++ b/org.omg.sysml.xtext.ui/.classpath @@ -10,6 +10,7 @@ + diff --git a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF index 8557e98e37..9b610a205c 100644 --- a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Bundle-Version: 0.59.0.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.omg.sysml.xtext, org.omg.sysml.xtext.ide, diff --git a/org.omg.sysml.xtext/.classpath b/org.omg.sysml.xtext/.classpath index 676af026a0..964489e030 100644 --- a/org.omg.sysml.xtext/.classpath +++ b/org.omg.sysml.xtext/.classpath @@ -10,6 +10,7 @@ + diff --git a/org.omg.sysml.xtext/META-INF/MANIFEST.MF b/org.omg.sysml.xtext/META-INF/MANIFEST.MF index 1bbf9feae8..36e1183109 100644 --- a/org.omg.sysml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", org.omg.sysml.model.bundle;bundle-version="0.59.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml;bundle-version="0.59.0", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, diff --git a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysMLRuntimeModule.xtend b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysMLRuntimeModule.xtend index e865d46dfc..eb937ca74b 100644 --- a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysMLRuntimeModule.xtend +++ b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysMLRuntimeModule.xtend @@ -10,6 +10,7 @@ import org.eclipse.xtext.naming.IQualifiedNameConverter import org.eclipse.xtext.naming.IQualifiedNameProvider import org.eclipse.xtext.resource.XtextResource import org.eclipse.xtext.scoping.IGlobalScopeProvider +import org.eclipse.xtext.resource.IResourceServiceProvider import org.eclipse.xtext.validation.CompositeEValidator import org.eclipse.xtext.validation.IResourceValidator import org.omg.kerml.xtext.linking.KerMLLazyLinkingResource @@ -17,7 +18,7 @@ import org.omg.kerml.xtext.conversion.KerMLValueConverterService import org.omg.kerml.xtext.naming.KerMLQualifiedNameProvider import org.omg.kerml.xtext.scoping.KerMLLinker import org.omg.kerml.xtext.validation.KerMLResourceValidator -import org.omg.sysml.lang.sysml.util.IModelLibraryProvider +import org.omg.sysml.logic.api.IModelLibraryProvider import org.omg.sysml.xtext.library.SysMLLibraryProvider import org.omg.sysml.xtext.naming.SysMLQualifiedNameConverter import org.omg.sysml.xtext.scoping.SysMLGlobalScopeProvider @@ -25,11 +26,25 @@ import org.omg.kerml.xtext.library.ILibraryIndexProvider import org.omg.kerml.xtext.library.PrecalculatedLibraryIndexProvider import com.google.inject.Provides import org.eclipse.xtext.conversion.IValueConverterService +import org.omg.sysml.util.SysMLLibraryUtil /** * Use this class to register components to be used at runtime / without the Equinox extension registry. */ class SysMLRuntimeModule extends AbstractSysMLRuntimeModule { + + new() { + SysMLLibraryUtil.setProviderLookup([ + resource | + try { + val serviceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.URI) + if (serviceProvider === null) null else serviceProvider.get(IModelLibraryProvider) + } catch (Exception e) { + System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e) + null + } + ]) + } override Class bindIValueConverterService() { return KerMLValueConverterService; diff --git a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java index a5953972fb..6e33d0976d 100644 --- a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java +++ b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java @@ -32,12 +32,12 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.omg.kerml.xtext.KerMLStandaloneSetup; -import org.omg.sysml.ApiException; -import org.omg.sysml.util.SysMLUtil; -import org.omg.sysml.util.repository.EObjectUUIDTracker; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.omg.kerml.xtext.KerMLStandaloneSetup; +import org.omg.sysml.ApiException; +import org.omg.sysml.io.SysMLUtil; +import org.omg.sysml.util.repository.EObjectUUIDTracker; import org.omg.sysml.util.repository.APIModel; import org.omg.sysml.util.repository.EMFModelDelta; import org.omg.sysml.util.repository.ProjectRepository; diff --git a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend index 76f9f9c493..a05322066f 100644 --- a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend +++ b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend @@ -128,7 +128,7 @@ import org.omg.sysml.lang.sysml.ViewUsage import org.omg.sysml.lang.sysml.ViewpointDefinition import org.omg.sysml.lang.sysml.ViewpointUsage import org.omg.sysml.lang.sysml.WhileLoopActionUsage -import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil +import org.omg.sysml.util.SysMLLibraryUtil import org.omg.sysml.util.FeatureUtil import org.omg.sysml.util.UsageUtil diff --git a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/xmi/SysMLxRuntimeModule.xtend b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/xmi/SysMLxRuntimeModule.xtend index 2616ebd95d..ba9fc8f1ce 100644 --- a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/xmi/SysMLxRuntimeModule.xtend +++ b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/xmi/SysMLxRuntimeModule.xtend @@ -24,15 +24,39 @@ import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl import org.eclipse.xtext.naming.IQualifiedNameConverter import org.eclipse.xtext.naming.IQualifiedNameProvider +import org.eclipse.xtext.resource.IResourceServiceProvider import org.eclipse.xtext.resource.IResourceDescriptions import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule import org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions import org.omg.kerml.xtext.naming.KerMLQualifiedNameConverter import org.omg.kerml.xtext.naming.KerMLQualifiedNameProvider -import org.omg.sysml.lang.sysml.util.IModelLibraryProvider +import org.omg.sysml.logic.api.IModelLibraryProvider +import org.omg.sysml.util.SysMLLibraryUtil import org.omg.sysml.xtext.library.SysMLLibraryProvider class SysMLxRuntimeModule extends AbstractGenericResourceRuntimeModule { + + /** + * Installs the library-provider lookup used by {@link SysMLLibraryUtil} for + * the generic SysML XMI runtime. + * + *

The lookup resolves the {@link IModelLibraryProvider} from the + * {@link IResourceServiceProvider} associated with the current resource URI so + * SysML library resolution works in this non-generated XMI-based runtime just + * as it does in the regular Xtext runtime modules. + */ + new() { + SysMLLibraryUtil.setProviderLookup([ + resource | + try { + val serviceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.URI) + if (serviceProvider === null) null else serviceProvider.get(IModelLibraryProvider) + } catch (Exception e) { + System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e) + null + } + ]) + } public val EXTENSION = 'sysmlx' public static val SYSMLX_LANGUAGE_NAME = 'org.omg.sysml.sysmlx' @@ -62,4 +86,4 @@ class SysMLxRuntimeModule extends AbstractGenericResourceRuntimeModule { def Class bindIModelLLibraryProvider() { SysMLLibraryProvider } -} \ No newline at end of file +} diff --git a/org.omg.sysml/.classpath b/org.omg.sysml/.classpath index e358bebcb4..92765cd9b6 100644 --- a/org.omg.sysml/.classpath +++ b/org.omg.sysml/.classpath @@ -7,6 +7,7 @@ + diff --git a/org.omg.sysml/META-INF/MANIFEST.MF b/org.omg.sysml/META-INF/MANIFEST.MF index efa245cb1e..d2ebc538b3 100644 --- a/org.omg.sysml/META-INF/MANIFEST.MF +++ b/org.omg.sysml/META-INF/MANIFEST.MF @@ -25,21 +25,13 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.m2m.qvt.oml, org.eclipse.uml2.uml.resources, org.eclipse.equinox.common;bundle-version="3.5.0", + org.omg.sysml.logic.bundle;bundle-version="0.59.0", org.omg.sysml.model.bundle;bundle-version="0.59.0" Export-Package: org.omg.sysml, - org.omg.sysml.adapter, org.omg.sysml.api, - org.omg.sysml.delegate.invocation, - org.omg.sysml.delegate.setting, - org.omg.sysml.expressions, - org.omg.sysml.expressions.functions, - org.omg.sysml.expressions.functions.base, - org.omg.sysml.expressions.functions.control, - org.omg.sysml.expressions.functions.data, - org.omg.sysml.lang.sysml.util, + org.omg.sysml.io, org.omg.sysml.model, org.omg.sysml.qvt, - org.omg.sysml.util, org.omg.sysml.util.repository, org.omg.sysml.util.traversal, org.omg.sysml.util.traversal.facade, diff --git a/org.omg.sysml/src/org/omg/sysml/util/SysMLUtil.java b/org.omg.sysml/src/org/omg/sysml/io/SysMLUtil.java similarity index 59% rename from org.omg.sysml/src/org/omg/sysml/util/SysMLUtil.java rename to org.omg.sysml/src/org/omg/sysml/io/SysMLUtil.java index 82b2f2bd73..3662022e30 100644 --- a/org.omg.sysml/src/org/omg/sysml/util/SysMLUtil.java +++ b/org.omg.sysml/src/org/omg/sysml/io/SysMLUtil.java @@ -1,315 +1,199 @@ -/***************************************************************************** - * SysML 2 Pilot Implementation - * Copyright (c) 2019-2022 Model Driven Solutions, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of theGNU Lesser General Public License - * along with this program. If not, see . - * - * @license LGPL-3.0-or-later - * - * Contributors: - * Ed Seidewitz - * Zoltan Ujhelyi - * - *****************************************************************************/ - -package org.omg.sysml.util; - -import java.io.File; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.xtext.resource.IResourceDescription.Manager; -import org.eclipse.xtext.resource.IResourceServiceProvider; -import org.eclipse.xtext.resource.XtextResource; -import org.eclipse.xtext.resource.impl.ResourceDescriptionsData; -import org.omg.sysml.lang.sysml.SysMLPackage; - -import com.google.common.base.Predicates; - - -/** - * This is a utility base class for reading SysML v2 files into an EMF resource set. - * Files can be read either as "input resources" or "library resources", if that distinction - * is important for subsequent processing. Files can be read individually, or all files - * (as limited to a certain set of extensions) can be read by traversing a directory - * hierarchy recursively from a given root directory. - * - * @author Ed Seidewitz - * - */ -public abstract class SysMLUtil { - - private final ResourceSet resourceSet; - private final List inputResources = new LinkedList<>(); - private final List extensions = new ArrayList(); - private final ResourceDescriptionsData index; - - private boolean isVerbose = true; - - protected SysMLUtil() { - this(new ResourceDescriptionsData(new ArrayList<>())); - } - - protected SysMLUtil(ResourceDescriptionsData resourceDescriptionData) { - SysMLPackage.eINSTANCE.getName(); - this.resourceSet = new ResourceSetImpl(); - this.resourceSet.getLoadOptions().put(XtextResource.OPTION_ENCODING, "UTF-8"); - this.index = resourceDescriptionData; - ResourceDescriptionsData.ResourceSetAdapter.installResourceDescriptionsData(this.resourceSet, this.index); - } - - /** - * Add an extension to the list of allowed file extensions. The extension string must start with a dot. - * - * @param extension the extension to be added (including the initial dot) - */ - protected void addExtension(String extension) { - this.extensions.add(extension); - } - - /** - * Print the given line only if verbose mode is on. - * - * @param line the line to be printed - */ - protected void println(String line) { - if (isVerbose) { - System.out.println(line); - } - } - - /** - * Get the managed resource set. - * - * @return the resource set - */ - public ResourceSet getResourceSet() { - return resourceSet; - } - - /** - * Add a resource to the Xtext index. - * - * @param resource the resource to be added - */ - public void addResourceToIndex(Resource resource) { - URI uri = resource.getURI(); - IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(uri); - Manager manager = resourceServiceProvider.getResourceDescriptionManager(); - this.index.addDescription(uri, manager.getResourceDescription(resource)); - } - - /** - * Return whether verbose mode is on or off. - * - * @return whether verbose mode is on or off - */ - public boolean isVerbose() { - return this.isVerbose; - } - - /** - * Set verbose mode on or off. - * - * @param isverbose whether verbose mode is on or off - */ - public void setVerbose(boolean isVerbose) { - this.isVerbose = isVerbose; - } - - /** - * Check whether the given resource is considered an input resource or a library resource. - * - * @param resource the resource to check. - * @return true if the resource is an input resource and false otherwise (including if - * the given resource has not been read - */ - public boolean isInputResource(Resource resource) { - return inputResources.contains(resource); - } - - /** - * If the given resource is in the resource set, then add it to the set of input resources. - * - * @param resource the resource to be considered an input resource - */ - public void addInputResource(Resource resource) { - if (resource.getResourceSet() == this.resourceSet) { - this.inputResources.add(resource); - } - } - - /** - * Return all the input resources. - * - * @return the input resources. - */ - public List getInputResources() { - return this.inputResources; - } - - /** - * Return all the library resources, that is, resources that are not input resources. - * - * @return the library resources - */ - public Set getLibraryResources() { - return this.getResourceSet().getResources().stream(). - filter(Predicates.not(this::isInputResource)). - collect(Collectors.toSet()); - } - - /** - * Create a resource using the given path and add it to the resource set. Throws a runtime - * exception if the resource cannot be created. - * - * @param path the path to be used for the new resource. - * @return the newly created resource - */ - public Resource createResource(final String path) { - final Resource resource = this.resourceSet.createResource(URI.createFileURI(path)); - if (resource == null) { - throw new RuntimeException("Error creating resource: " + path); - } else { - return resource; - } - } - - /** - * Get an existing resource in the resource set with the given path or, if there is no - * such resource in the resource set, attempt to load it. Throws a runtime exception if - * the resource cannot be opened. - * - * @param path the path of the resource - * @return the opened resource - */ - public Resource getResource(final String path) { - URI uri = URI.createFileURI(path); - final Resource resource = this.resourceSet.getResource(uri, true); - if (resource == null) { - throw new RuntimeException("Error opening resource: " + path); - } else { - this.addResourceToIndex(resource); - return resource; - } - } - - /** - * Read the existing resource at the given path while logging this to the console. - * - * @param path the path of the resource - * @return the opened resource - */ - public Resource readResource(final String path) { - println("Reading " + path + "..."); - return this.getResource(path); - } - - /** - * If the given file has an allowable extension, then read it. Or, if the file is a directory, then - * recursively read all the allowable files in it, directly or indirectly. - * - * @param file the file from which the resources are be read - * @param isInput whether the resources read are to be considered input resources - */ - public void readAll(final File file, boolean isInput) { - if (file.isDirectory()) { - for (File nestedFile: file.listFiles()) { - this.readAll(nestedFile, isInput); - } - } else { - final String path = file.getPath(); - if (extensions.stream().anyMatch(path::endsWith)) { - Resource resource = this.readResource(file.getPath()); - if (isInput) { - this.addInputResource(resource); - } - } - } - } - - /** - * If the given path identifies a file with an allowable extension, then read it. - * If the given path is for a directory, then recursively read all the allowable files in it, - * directly or indirectly. - * - * @param path the path from which resources are to be read - * @param isInput whether the resources read are to be considered input resources - */ - public void readAll(final String path, boolean isInput) { - this.readAll(new File(path), isInput); - } - - /** - * If the given path identifies an file with the given extension, then read it. - * If the given path is for a directory, then recursively read all the allowable files in it, - * directly or indirectly. - * - * @param path the path from which resources are to be read - * @param isInput whether the resources read are to be considered input resources - * @param extension the allowed file extension - */ - public void readAll(final String path, boolean isInput, String extension) { - this.extensions.clear(); - this.addExtension(extension); - this.readAll(new File(path), isInput); - } - - /** - * Read files recursively from the directories given by each of the paths. All the resources read - * from the first path are considered to be input resources. All the resources read from the - * other paths are considered to be library resources. - * - * @param paths the paths from which resources are to be read - */ - public void read(final String... paths) { - if (paths.length > 0) { - for (int i = 1; i < paths.length; i++) { - this.readAll(paths[i], false); - } - this.readAll(paths[0], true); - } - } - - /** - * Transform elements in all resources. If isAddImplicitElements is true, then also generate - * implicit elements in input resources. - * - * @param isAddImplicitElements whether to add implicit elements to input resources - */ - public void transformAll(boolean isAddImplicitElements) { - for (Resource resource: this.resourceSet.getResources()) { - ElementUtil.transformAll(resource, - isAddImplicitElements && this.isInputResource(resource)); - } - } - - /** - * Resolve proxies in all input resources. - */ - public void resolveAllInputResources() { - for (Resource resource: this.inputResources) { - EcoreUtil.resolveAll(resource); - } - } - -} +/***************************************************************************** + * SysML 2 Pilot Implementation + * Copyright (c) 2019-2022 Model Driven Solutions, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of theGNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + * + * Contributors: + * Ed Seidewitz + * Zoltan Ujhelyi + * + *****************************************************************************/ + +package org.omg.sysml.io; + +import java.io.File; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.xtext.resource.IResourceDescription.Manager; +import org.eclipse.xtext.resource.IResourceServiceProvider; +import org.eclipse.xtext.resource.XtextResource; +import org.eclipse.xtext.resource.impl.ResourceDescriptionsData; +import org.omg.sysml.lang.sysml.SysMLPackage; +import org.omg.sysml.util.ElementUtil; + +import com.google.common.base.Predicates; + +/** + * This is a utility base class for reading SysML v2 files into an EMF resource set. + * Files can be read either as "input resources" or "library resources", if that distinction + * is important for subsequent processing. Files can be read individually, or all files + * (as limited to a certain set of extensions) can be read by traversing a directory + * hierarchy recursively from a given root directory. + */ +public abstract class SysMLUtil { + + private final ResourceSet resourceSet; + private final List inputResources = new LinkedList<>(); + private final List extensions = new ArrayList(); + private final ResourceDescriptionsData index; + + private boolean isVerbose = true; + + protected SysMLUtil() { + this(new ResourceDescriptionsData(new ArrayList<>())); + } + + protected SysMLUtil(ResourceDescriptionsData resourceDescriptionData) { + SysMLPackage.eINSTANCE.getName(); + this.resourceSet = new ResourceSetImpl(); + this.resourceSet.getLoadOptions().put(XtextResource.OPTION_ENCODING, "UTF-8"); + this.index = resourceDescriptionData; + ResourceDescriptionsData.ResourceSetAdapter.installResourceDescriptionsData(this.resourceSet, this.index); + } + + protected void addExtension(String extension) { + this.extensions.add(extension); + } + + protected void println(String line) { + if (isVerbose) { + System.out.println(line); + } + } + + public ResourceSet getResourceSet() { + return resourceSet; + } + + public void addResourceToIndex(Resource resource) { + URI uri = resource.getURI(); + IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(uri); + Manager manager = resourceServiceProvider.getResourceDescriptionManager(); + this.index.addDescription(uri, manager.getResourceDescription(resource)); + } + + public boolean isVerbose() { + return this.isVerbose; + } + + public void setVerbose(boolean isVerbose) { + this.isVerbose = isVerbose; + } + + public boolean isInputResource(Resource resource) { + return inputResources.contains(resource); + } + + public void addInputResource(Resource resource) { + if (resource.getResourceSet() == this.resourceSet) { + this.inputResources.add(resource); + } + } + + public List getInputResources() { + return this.inputResources; + } + + public Set getLibraryResources() { + return this.getResourceSet().getResources().stream(). + filter(Predicates.not(this::isInputResource)). + collect(Collectors.toSet()); + } + + public Resource createResource(final String path) { + final Resource resource = this.resourceSet.createResource(URI.createFileURI(path)); + if (resource == null) { + throw new RuntimeException("Error creating resource: " + path); + } else { + return resource; + } + } + + public Resource getResource(final String path) { + URI uri = URI.createFileURI(path); + final Resource resource = this.resourceSet.getResource(uri, true); + if (resource == null) { + throw new RuntimeException("Error opening resource: " + path); + } else { + this.addResourceToIndex(resource); + return resource; + } + } + + public Resource readResource(final String path) { + println("Reading " + path + "..."); + return this.getResource(path); + } + + public void readAll(final File file, boolean isInput) { + if (file.isDirectory()) { + for (File nestedFile: file.listFiles()) { + this.readAll(nestedFile, isInput); + } + } else { + final String path = file.getPath(); + if (extensions.stream().anyMatch(path::endsWith)) { + Resource resource = this.readResource(file.getPath()); + if (isInput) { + this.addInputResource(resource); + } + } + } + } + + public void readAll(final String path, boolean isInput) { + this.readAll(new File(path), isInput); + } + + public void readAll(final String path, boolean isInput, String extension) { + this.extensions.clear(); + this.addExtension(extension); + this.readAll(new File(path), isInput); + } + + public void read(final String... paths) { + if (paths.length > 0) { + for (int i = 1; i < paths.length; i++) { + this.readAll(paths[i], false); + } + this.readAll(paths[0], true); + } + } + + public void transformAll(boolean isAddImplicitElements) { + for (Resource resource: this.resourceSet.getResources()) { + ElementUtil.transformAll(resource, + isAddImplicitElements && this.isInputResource(resource)); + } + } + + public void resolveAllInputResources() { + for (Resource resource: this.inputResources) { + EcoreUtil.resolveAll(resource); + } + } + +} diff --git a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/IModelLibraryProvider.xtend b/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/IModelLibraryProvider.xtend deleted file mode 100644 index 05ece30490..0000000000 --- a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/IModelLibraryProvider.xtend +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * SysML 2 Pilot Implementation - * Copyright (c) 2019-2020 Model Driven Solutions, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of theGNU Lesser General Public License - * along with this program. If not, see . - * - * @license LGPL-3.0-or-later - * - * Contributors: - * Ed Seidewitz, MDS - * - *****************************************************************************/ - -package org.omg.sysml.lang.sysml.util - -import org.omg.sysml.lang.sysml.Element - -interface IModelLibraryProvider { - - /** - * Returns a model element with the given qualified name, - * using the given parameter element as a context for - * the search, e.g. to identify where to look for library model elements. - * - *

- * Important: the implementation does only consider qualified - * names calculated from the containment hierarchy. Querying for alternate - * names like relying on generalizations or aliases is not supported here. - */ - def Element getElement(Element context, String name) - -} \ No newline at end of file diff --git a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/ISysMLScope.java b/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/ISysMLScope.java deleted file mode 100644 index 4109a17bc5..0000000000 --- a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/ISysMLScope.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * SysML 2 Pilot Implementation - * Copyright (c) 2021-2022 Model Driven Solutions, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of theGNU Lesser General Public License - * along with this program. If not, see . - * - * @license LGPL-3.0-or-later - * - * Contributors: - * Ed Seidewitz, MDS - * - *******************************************************************************/ - -package org.omg.sysml.lang.sysml.util; - -import org.eclipse.xtext.scoping.IScope; -import org.omg.sysml.lang.sysml.Element; - -public interface ISysMLScope extends IScope { - Element getElement(String name); -} diff --git a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLLibraryUtil.xtend b/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLLibraryUtil.xtend deleted file mode 100644 index 6f1a3f53fd..0000000000 --- a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLLibraryUtil.xtend +++ /dev/null @@ -1,70 +0,0 @@ -/***************************************************************************** - * SysML 2 Pilot Implementation - * Copyright (c) 2019-2020 Model Driven Solutions, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of theGNU Lesser General Public License - * along with this program. If not, see . - * - * @license LGPL-3.0-or-later - * - * Contributors: - * Ed Seidewitz, MDS - * - *****************************************************************************/ - -package org.omg.sysml.lang.sysml.util - -import org.eclipse.xtext.resource.IResourceServiceProvider -import org.eclipse.emf.ecore.resource.Resource -import org.omg.sysml.lang.sysml.Element -import org.omg.sysml.lang.sysml.Type -import org.eclipse.emf.common.util.URI - -class SysMLLibraryUtil { - - public static final String DEFAULT_MODEL_LIBRARY_PATH = "/resource/sysml.library"; - - static String modelLibraryPath = DEFAULT_MODEL_LIBRARY_PATH; - - def static setModelLibraryDirectory(String dir) { - val uri = URI.createFileURI(dir); - modelLibraryPath = uri.devicePath ?: uri.path; - } - - def static getModelLibraryPath() { - modelLibraryPath - } - - def static IModelLibraryProvider getInstance(Resource resource) { - try { - IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.getURI)?.get(IModelLibraryProvider) - } catch (Exception e) { - System.out.println("[SysMLLibraryUtil] Cannot get library provider: " + e) - null - } - } - - def static Element getLibraryElement(Element context, String name) { - return getInstance(context.eResource)?.getElement(context, name) - } - - def static Type getLibraryType(Element context, String... defaultNames) { - for (String defaultName: defaultNames) { - val element = getLibraryElement(context, defaultName); - if (element instanceof Type) { - return element; - } - } - return null; - } -} \ No newline at end of file diff --git a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLScopeUtil.xtend b/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLScopeUtil.xtend deleted file mode 100644 index 46281bf74c..0000000000 --- a/org.omg.sysml/src/org/omg/sysml/lang/sysml/util/SysMLScopeUtil.xtend +++ /dev/null @@ -1,53 +0,0 @@ -/***************************************************************************** - * SysML 2 Pilot Implementation - * Copyright (c) 2021-2022 Model Driven Solutions, Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of theGNU Lesser General Public License - * along with this program. If not, see . - * - * @license LGPL-3.0-or-later - * - * Contributors: - * Ed Seidewitz, MDS - * - *****************************************************************************/ - -package org.omg.sysml.lang.sysml.util - -import org.eclipse.emf.ecore.EObject -import org.eclipse.emf.ecore.EReference -import org.eclipse.emf.ecore.resource.Resource -import org.eclipse.xtext.resource.IResourceServiceProvider -import org.eclipse.xtext.scoping.IScopeProvider -import org.omg.sysml.lang.sysml.Element - -class SysMLScopeUtil { - - def static IScopeProvider getScopeProvider(Resource resource) { - try { - IResourceServiceProvider.Registry.INSTANCE.getResourceServiceProvider(resource?.getURI)?.get(IScopeProvider) - } catch (Exception e) { - System.out.println("[SysMLScopeUtil] Cannot get scope provider: " + e) - null - } - } - - def static ISysMLScope getScopeFor(Resource resource, EObject context, EReference reference) { - return getScopeProvider(resource).getScope(context, reference) as ISysMLScope - } - - def static Element getElementFor(EObject context, EReference reference, String name) { - return getScopeFor(context.eResource(), context, reference).getElement(name) - } - -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7d83b1543d..7ef104278e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,8 @@ org.omg.sysml.model org.omg.sysml.model.bundle + org.omg.sysml.logic + org.omg.sysml.logic.bundle org.omg.sysml org.omg.sysml.edit org.omg.sysml.editor @@ -214,6 +216,15 @@ + + + + + + + + +