Skip to content

Commit 1dae64f

Browse files
committed
ST6RI-682 Renamed some packages relating to pull from repo in Xtext.
- org.omg.kerml.xmi -> org.omg.kerml.xtext.xmi - org.omg.sysml.xmi -> org.omg.sysml.xtext.xmi - org.omg.sysml.xtext.ui.utilities -> org.omg.sysml.xtext.ui.util
1 parent 7f1d0fe commit 1dae64f

14 files changed

Lines changed: 23 additions & 21 deletions

File tree

org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/KerMLActivator.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package org.omg.kerml.xtext.ui
2424

2525
import org.omg.kerml.xtext.ui.internal.XtextActivator
2626
import org.omg.kerml.xtext.KerMLRuntimeModule
27-
import org.omg.kerml.xmi.KerMLxRuntimeModule
27+
import org.omg.kerml.xtext.xmi.KerMLxRuntimeModule
2828
import org.omg.kerml.xtext.ui.xmi.KerMLxUIModule
2929

3030
class KerMLActivator extends XtextActivator {

org.omg.kerml.xtext.ui/src/org/omg/kerml/xtext/ui/xmi/KerMLxExecutableExtensionFactory.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package org.omg.kerml.xtext.ui.xmi
2424

2525
import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory
26-
import org.omg.kerml.xmi.KerMLxRuntimeModule
26+
import org.omg.kerml.xtext.xmi.KerMLxRuntimeModule
2727
import org.omg.kerml.xtext.ui.KerMLActivator
2828
import org.osgi.framework.FrameworkUtil
2929

org.omg.kerml.xtext/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Export-Package: org.omg.kerml.xmi,
3131
org.omg.kerml.xtext.serializer,
3232
org.omg.kerml.xtext.services,
3333
org.omg.kerml.xtext.util,
34-
org.omg.kerml.xtext.validation
34+
org.omg.kerml.xtext.validation,
35+
org.omg.kerml.xtext.xmi
3536
Import-Package: org.apache.log4j
3637
Bundle-Vendor: SysML v2 Submission Team

org.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxRuntimeModule.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxRuntimeModule.xtend

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* SysML 2 Pilot Implementation
3-
* Copyright (C) 2020 California Institute of Technology ("Caltech")
3+
* Copyright (C) 2025 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
1717
*
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*/
20-
package org.omg.kerml.xmi
20+
package org.omg.kerml.xtext.xmi
2121

2222
import com.google.inject.Binder
2323
import org.eclipse.emf.ecore.resource.Resource
@@ -60,4 +60,4 @@ class KerMLxRuntimeModule extends AbstractGenericResourceRuntimeModule{
6060
def Class<? extends IModelLibraryProvider> bindIModelLLibraryProvider() {
6161
KerMLLibraryProvider
6262
}
63-
}
63+
}

org.omg.kerml.xtext/src/org/omg/kerml/xmi/KerMLxStandaloneSetup.xtend renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/xmi/KerMLxStandaloneSetup.xtend

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* SysML 2 Pilot Implementation
3-
* Copyright (C) 2020 California Institute of Technology ("Caltech")
3+
* Copyright (C) 2025 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -17,7 +17,7 @@
1717
*
1818
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
1919
*/
20-
package org.omg.kerml.xmi
20+
package org.omg.kerml.xtext.xmi
2121

2222
import com.google.inject.Guice
2323
import com.google.inject.Inject
@@ -57,4 +57,4 @@ class KerMLxStandaloneSetup implements ISetup {
5757
def Injector createInjector(){
5858
Guice.createInjector(new KerMLxRuntimeModule)
5959
}
60-
}
60+
}

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
import org.eclipse.xtext.validation.CheckMode;
5656
import org.eclipse.xtext.validation.IResourceValidator;
5757
import org.eclipse.xtext.validation.Issue;
58-
import org.omg.kerml.xmi.KerMLxStandaloneSetup;
5958
import org.omg.kerml.xtext.KerMLStandaloneSetup;
59+
import org.omg.kerml.xtext.xmi.KerMLxStandaloneSetup;
6060
import org.omg.kerml.xtext.library.ILibraryIndexProvider;
6161
import org.omg.kerml.xtext.naming.KerMLQualifiedNameConverter;
6262
import org.omg.sysml.execution.expressions.ExpressionEvaluator;
@@ -86,7 +86,7 @@
8686
import org.omg.sysml.util.traversal.Traversal;
8787
import org.omg.sysml.util.traversal.facade.impl.ApiElementProcessingFacade;
8888
import org.omg.sysml.util.traversal.facade.impl.JsonElementProcessingFacade;
89-
import org.omg.sysml.xmi.SysMLxStandaloneSetup;
89+
import org.omg.sysml.xtext.xmi.SysMLxStandaloneSetup;
9090
import org.omg.sysml.xtext.SysMLStandaloneSetup;
9191

9292
import com.google.common.base.Predicates;

org.omg.sysml.xtext.ui/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@
441441
<extension
442442
point="org.eclipse.core.expressions.propertyTesters">
443443
<propertyTester
444-
class="org.omg.sysml.xtext.ui.utilities.RemoteRepositoryPropertyTester"
444+
class="org.omg.sysml.xtext.ui.util.RemoteRepositoryPropertyTester"
445445
id="org.omg.sysml.xtext.ui.remoterepositoryproperties"
446446
namespace="org.omg.sysml.xtext.ui"
447447
properties="repository_descriptor"

org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/SysMLActivator.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package org.omg.sysml.xtext.ui
2424

2525
import org.omg.sysml.xtext.SysMLRuntimeModule
2626
import org.omg.sysml.xtext.ui.internal.XtextActivator
27-
import org.omg.sysml.xmi.SysMLxRuntimeModule
2827
import org.omg.sysml.xtext.ui.xmi.SysMLxUIModule
28+
import org.omg.sysml.xtext.xmi.SysMLxRuntimeModule
2929

3030
class SysMLActivator extends XtextActivator {
3131

org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/utilities/RemoteRepositoryPropertyTester.java renamed to org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/util/RemoteRepositoryPropertyTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Laszlo Gati, MDS
2222
* Zoltan Ujhelyi, MDS
2323
*/
24-
package org.omg.sysml.xtext.ui.utilities;
24+
package org.omg.sysml.xtext.ui.util;
2525

2626
import java.util.Objects;
2727

org.omg.sysml.xtext.ui/src/org/omg/sysml/xtext/ui/xmi/SysMLxExecutableExtensionFactory.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package org.omg.sysml.xtext.ui.xmi
2525
import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory
2626
import org.osgi.framework.FrameworkUtil
2727
import org.omg.sysml.xtext.ui.SysMLActivator
28-
import org.omg.sysml.xmi.SysMLxRuntimeModule
28+
import org.omg.sysml.xtext.xmi.SysMLxRuntimeModule
2929

3030
class SysMLxExecutableExtensionFactory extends AbstractGuiceAwareExecutableExtensionFactory {
3131

0 commit comments

Comments
 (0)