-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
101 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 27 additions & 26 deletions
53
kim/org.integratedmodelling.kim.ui.tests/META-INF/MANIFEST.MF
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,27 @@ | ||
| Manifest-Version: 1.0 | ||
| Bundle-ManifestVersion: 2 | ||
| Bundle-Name: org.integratedmodelling.kim.ui.tests | ||
| Bundle-Vendor: org.integratedmodelling | ||
| Bundle-Version: 0.11.0.qualifier | ||
| Bundle-SymbolicName: org.integratedmodelling.kim.ui.tests; singleton:=true | ||
| Bundle-ActivationPolicy: lazy | ||
| Require-Bundle: org.integratedmodelling.kim.ui, | ||
| org.junit;bundle-version="4.7.0", | ||
| org.eclipse.xtext.junit4, | ||
| org.eclipse.xtext.xbase.junit, | ||
| org.eclipse.core.runtime, | ||
| org.eclipse.ui.workbench;resolution:=optional, | ||
| org.eclipse.xtext.testing, | ||
| org.eclipse.xtext.xbase.testing, | ||
| org.eclipse.xtext.ui.testing | ||
| Bundle-RequiredExecutionEnvironment: JavaSE-11 | ||
| Export-Package: org.integratedmodelling.kim.ui.tests;x-internal=true | ||
| Import-Package: org.hamcrest.core, | ||
| org.junit;version="4.5.0", | ||
| org.junit.runners.model;version="4.5.0", | ||
| org.junit.runner;version="4.5.0", | ||
| org.junit.runners;version="4.5.0", | ||
| org.junit.runner.manipulation;version="4.5.0", | ||
| org.junit.runner.notification;version="4.5.0" | ||
| Automatic-Module-Name: org.integratedmodelling.kim.ui.tests | ||
| Manifest-Version: 1.0 | ||
| Bundle-ManifestVersion: 2 | ||
| Bundle-Name: org.integratedmodelling.kim.ui.tests | ||
| Bundle-Vendor: org.integratedmodelling | ||
| Bundle-Version: 0.11.0.qualifier | ||
| Bundle-SymbolicName: org.integratedmodelling.kim.ui.tests; singleton:=true | ||
| Bundle-ActivationPolicy: lazy | ||
| Require-Bundle: org.integratedmodelling.kim.ui, | ||
| org.junit;bundle-version="4.7.0", | ||
| org.eclipse.xtext.junit4, | ||
| org.eclipse.xtext.xbase.junit, | ||
| org.eclipse.core.runtime, | ||
| org.eclipse.ui.workbench;resolution:=optional, | ||
| org.eclipse.xtext.testing, | ||
| org.eclipse.xtext.xbase.testing, | ||
| org.eclipse.xtext.ui.testing, | ||
| org.eclipse.xtext.xbase.ui.testing | ||
| Bundle-RequiredExecutionEnvironment: JavaSE-11 | ||
| Export-Package: org.integratedmodelling.kim.ui.tests;x-internal=true | ||
| Import-Package: org.hamcrest.core, | ||
| org.junit;version="4.5.0", | ||
| org.junit.runners.model;version="4.5.0", | ||
| org.junit.runner;version="4.5.0", | ||
| org.junit.runners;version="4.5.0", | ||
| org.junit.runner.manipulation;version="4.5.0", | ||
| org.junit.runner.notification;version="4.5.0" | ||
| Automatic-Module-Name: org.integratedmodelling.kim.ui.tests |
70 changes: 35 additions & 35 deletions
70
kim/org.integratedmodelling.kim.web/WebRoot/xtext-resources/generated/mode-k.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,35 @@ | ||
| define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { | ||
| var HighlightRules = function() { | ||
| var keywords = "AD|BC|CE|E|abstract|acceleration|according|adjacent|affects|agent|aggregated|all|amount|and|angle|any|applies|area|as|at|attribute|authority|averaged|away|between|bond|boolean|by|causant|caused|causing|change|changed|charge|children|class|classified|classifies|column|compresent|confers|configuration|contained|container|containing|contains|context|cooccurrent|core|count|covering|creates|decreases|define|defines|definition|deliberative|deniable|describes|discretized|discretizes|disjoint|distance|do|domain|down|duration|during|e|each|emerges|energy|entropy|equals|event|exactly|exclusive|extends|extent|false|finally|follows|for|from|functional|has|identified|identity|if|implies|imports|in|inclusive|increases|inherent|inherits|initialization|instantiation|integrate|interactive|into|is|l|language|learn|least|length|level|linking|links|lookup|magnitude|marks|mass|match|metadata|minus|model|monetary|money|more|most|move|named|namespace|no|not|nothing|number|object|observability|observe|observed|observing|occurrence|of|on|only|optional|or|ordering|otherwise|outside|over|parameters|per|percentage|plus|presence|pressure|priority|private|probability|process|project|proportion|purpose|quality|quantity|rate|ratio|reactive|realm|related|relationship|required|requires|rescaling|resistance|resistivity|resolve|role|root|row|scenario|set|structural|subjective|summed|targeting|temperature|termination|text|then|thing|times|to|total|transition|true|type|uncertainty|unknown|unless|uses|using|value|velocity|version|viscosity|void|volume|weight|where|with|within|without|worldview"; | ||
| this.$rules = { | ||
| "start": [ | ||
| {token: "comment", regex: "\\/\\/.*$"}, | ||
| {token: "comment", regex: "\\/\\*", next : "comment"}, | ||
| {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, | ||
| {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, | ||
| {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, | ||
| {token: "lparen", regex: "[({]"}, | ||
| {token: "rparen", regex: "[)}]"}, | ||
| {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} | ||
| ], | ||
| "comment": [ | ||
| {token: "comment", regex: ".*?\\*\\/", next : "start"}, | ||
| {token: "comment", regex: ".+"} | ||
| ] | ||
| }; | ||
| }; | ||
| oop.inherits(HighlightRules, mTextHighlightRules.TextHighlightRules); | ||
|
|
||
| var Mode = function() { | ||
| this.HighlightRules = HighlightRules; | ||
| }; | ||
| oop.inherits(Mode, mText.Mode); | ||
| Mode.prototype.$id = "xtext/k"; | ||
| Mode.prototype.getCompletions = function(state, session, pos, prefix) { | ||
| return []; | ||
| } | ||
|
|
||
| return { | ||
| Mode: Mode | ||
| }; | ||
| }); | ||
| define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { | ||
| var HighlightRules = function() { | ||
| var keywords = "AD|BC|CE|E|abstract|acceleration|according|adjacent|affects|agent|aggregated|all|amount|and|angle|any|applies|area|as|at|attribute|authority|averaged|away|between|bond|boolean|by|causant|caused|causing|change|changed|charge|children|class|classified|classifies|column|compresent|confers|configuration|contained|container|containing|contains|context|cooccurrent|core|count|covering|creates|decreases|define|defines|definition|deliberative|deniable|describes|discretized|discretizes|disjoint|distance|do|domain|down|duration|during|e|each|emerges|energy|entropy|equals|event|exactly|exclusive|extends|extent|false|finally|follows|for|from|functional|has|identified|identity|if|implies|imports|in|inclusive|increases|inherent|inherits|initialization|instantiation|integrate|interactive|into|is|l|language|learn|least|length|level|linking|links|lookup|magnitude|marks|mass|match|metadata|minus|model|monetary|money|more|most|move|named|namespace|no|not|nothing|number|object|observability|observe|observed|observing|occurrence|of|on|only|optional|or|ordering|otherwise|outside|over|parameters|per|percentage|plus|presence|pressure|priority|private|probability|process|project|proportion|purpose|quality|quantity|rate|ratio|reactive|realm|related|relationship|required|requires|rescaling|resistance|resistivity|resolve|role|root|row|scenario|set|structural|subjective|summed|targeting|temperature|termination|text|then|thing|times|to|total|transition|true|type|uncertainty|unknown|unless|uses|using|value|velocity|version|viscosity|void|volume|weight|where|with|within|without|worldview"; | ||
| this.$rules = { | ||
| "start": [ | ||
| {token: "comment", regex: "\\/\\/.*$"}, | ||
| {token: "comment", regex: "\\/\\*", next : "comment"}, | ||
| {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, | ||
| {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, | ||
| {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, | ||
| {token: "lparen", regex: "[({]"}, | ||
| {token: "rparen", regex: "[)}]"}, | ||
| {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} | ||
| ], | ||
| "comment": [ | ||
| {token: "comment", regex: ".*?\\*\\/", next : "start"}, | ||
| {token: "comment", regex: ".+"} | ||
| ] | ||
| }; | ||
| }; | ||
| oop.inherits(HighlightRules, mTextHighlightRules.TextHighlightRules); | ||
|
|
||
| var Mode = function() { | ||
| this.HighlightRules = HighlightRules; | ||
| }; | ||
| oop.inherits(Mode, mText.Mode); | ||
| Mode.prototype.$id = "xtext/k"; | ||
| Mode.prototype.getCompletions = function(state, session, pos, prefix) { | ||
| return []; | ||
| } | ||
|
|
||
| return { | ||
| Mode: Mode | ||
| }; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters