Skip to content

Commit 9ec7a05

Browse files
seidewitzseidewitz
authored
Merge pull request #384 from Systems-Modeling/ST6RI-563
ST6RI-563 Organize Kernel Model Library text files into subdirectories
2 parents b4de601 + d0b7491 commit 9ec7a05

47 files changed

Lines changed: 17 additions & 17 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎org.omg.kerml.xtext/.launch/Save KerML with Library.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.kerml.xtext.util.KerMLRepositorySaveUtil"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.kerml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2-dev.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2-dev.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.kerml.xtext"/>
1818
</launchConfiguration>

‎org.omg.kerml.xtext/.launch/Save KerML2JSON.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.kerml.xtext.util.KerML2JSON"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.kerml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.kerml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.interactive.tests/.launch/Model Level Evaluation Test.launch‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
1111
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
1212
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
13+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
14+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
1315
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1416
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
1517
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.interactive.tests.ModelLevelEvaluationTest"/>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2019-2021 Model Driven Solutions, Inc.
3+
* Copyright (c) 2019-2022 Model Driven Solutions, Inc.
44
* Copyright (c) 2020 Mgnite Inc.
55
* Copyright (c) 2021 Twingineer LLC
66
*
@@ -23,7 +23,7 @@
2323
* Ed Seidewitz, MDS
2424
* Hisashi Miyashita, Mgnite
2525
* Zoltan Ujhelyi, MDS
26-
* Ivan Gomes
26+
* Ivan Gomes, Twingineer
2727
*
2828
*****************************************************************************/
2929
package org.omg.sysml.interactive;
@@ -75,12 +75,10 @@
7575

7676
public class SysMLInteractive extends SysMLUtil {
7777

78-
public static final String KERNEL_LIBRARY_DIRECTORY = "Kernel Library";
78+
public static final String KERNEL_LIBRARIES_DIRECTORY = "Kernel Libraries";
7979
public static final String SYSTEMS_LIBRARY_DIRECTORY = "Systems Library";
8080
public static final String DOMAIN_LIBRARIES_DIRECTORY = "Domain Libraries";
81-
public static final String QUANTITIES_AND_UNITS_DIRECTORY = DOMAIN_LIBRARIES_DIRECTORY + "/Quantities and Units";
82-
public static final String GEOMETRY_DIRECTORY = DOMAIN_LIBRARIES_DIRECTORY + "/Geometry";
83-
public static final String ANALYSIS_DIRECTORY = DOMAIN_LIBRARIES_DIRECTORY + "/Analysis";
81+
8482
public static final String KERML_EXTENSION = ".kerml";
8583
public static final String SYSML_EXTENSION = ".sysml";
8684

@@ -116,7 +114,7 @@ public void loadLibrary(String path) {
116114
path += "/";
117115
}
118116
SysMLLibraryUtil.setModelLibraryDirectory(path);
119-
this.readAll(path + KERNEL_LIBRARY_DIRECTORY, false, KERML_EXTENSION);
117+
this.readAll(path + KERNEL_LIBRARIES_DIRECTORY, false, KERML_EXTENSION);
120118
this.readAll(path + SYSTEMS_LIBRARY_DIRECTORY, false, SYSML_EXTENSION);
121119
this.readAll(path + DOMAIN_LIBRARIES_DIRECTORY, false, SYSML_EXTENSION);
122120
}

‎org.omg.sysml.xtext/.launch/Save SysML Test.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysMLRepositorySaveTest"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.sysml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml/src/validation}&quot;&#10;&quot;Kernel Library&quot; &#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml/src/validation}&quot;&#10;&quot;Kernel Libraries&quot; &#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.xtext/.launch/Save SysML with Library.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysMLRepositorySaveUtil"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.sysml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2-dev.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot;&#10;&quot;Domain Library&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-b http://sysml2-dev.intercax.com:9000 -d&#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot; &#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot;&#10;&quot;Domain Library&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.xtext/.launch/Save SysML2JSON with Derived.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysML2JSON"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.kerml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d &#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d &#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.xtext/.launch/Save SysML2JSON with Implicit.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysML2JSON"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.kerml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d -g &#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d -g &#10;-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.xtext/.launch/Save SysML2JSON.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1414
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysML2JSON"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.kerml.xtext"/>
16-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Library&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
16+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-l &quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;Kernel Libraries&quot;&#10;&quot;Systems Library&quot; &#10;&quot;Domain Libraries&quot;"/>
1717
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1818
</launchConfiguration>

‎org.omg.sysml.xtext/.launch/Save SysML2XMI with Implicit.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
1212
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.omg.sysml.xtext.util.SysML2XMI"/>
1313
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.omg.sysml.xtext"/>
14-
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-g&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Kernel Library&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Systems Library&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Domain Libraries&quot;"/>
14+
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-g&#10;&quot;${selected_resource_loc}&quot;&#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Kernel Libraries&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Systems Library&quot; &#10;&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}/Domain Libraries&quot;"/>
1515
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.xtext"/>
1616
</launchConfiguration>

0 commit comments

Comments
 (0)