diff options
author | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
---|---|---|
committer | 20001LastOrder <boqi.chen@mail.mcgill.ca> | 2020-11-04 01:33:58 -0500 |
commit | a20af4d0dbf5eab84ee271d426528aabb5a8ac3b (patch) | |
tree | a9ab772ee313125aaf3a941d66e131b408d949ba /Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide | |
parent | changes in settings of measurements (diff) | |
parent | merge with current master, comment numerical solver related logging (diff) | |
download | VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.gz VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.tar.zst VIATRA-Generator-a20af4d0dbf5eab84ee271d426528aabb5a8ac3b.zip |
fix merging issue
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide')
5 files changed, 41 insertions, 37 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin index d888605f..2db7ed24 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin index 093b7865..e89404f0 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin | |||
Binary files differ | |||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore index 1089c736..c41377d5 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.gitignore | |||
@@ -1,2 +1,6 @@ | |||
1 | /.ApplicationConfigurationIdeModule.java._trace | 1 | /.ApplicationConfigurationIdeModule.java._trace |
2 | /.ApplicationConfigurationIdeSetup.java._trace | 2 | /.ApplicationConfigurationIdeSetup.java._trace |
3 | /.ApplicationConfigurationIdeModule.xtendbin | ||
4 | /.ApplicationConfigurationIdeSetup.xtendbin | ||
5 | /ApplicationConfigurationIdeModule.java | ||
6 | /ApplicationConfigurationIdeSetup.java | ||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java index 34f65780..f4d40594 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeModule.java | |||
@@ -1,13 +1,13 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.12.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ide; | 4 | package hu.bme.mit.inf.dslreasoner.application.ide; |
5 | 5 | ||
6 | import hu.bme.mit.inf.dslreasoner.application.ide.AbstractApplicationConfigurationIdeModule; | 6 | import hu.bme.mit.inf.dslreasoner.application.ide.AbstractApplicationConfigurationIdeModule; |
7 | 7 | ||
8 | /** | 8 | /** |
9 | * Use this class to register ide components. | 9 | * Use this class to register ide components. |
10 | */ | 10 | */ |
11 | @SuppressWarnings("all") | 11 | @SuppressWarnings("all") |
12 | public class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule { | 12 | public class ApplicationConfigurationIdeModule extends AbstractApplicationConfigurationIdeModule { |
13 | } | 13 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java index a73d3f1f..2281147c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/ApplicationConfigurationIdeSetup.java | |||
@@ -1,24 +1,24 @@ | |||
1 | /** | 1 | /** |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.12.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ide; | 4 | package hu.bme.mit.inf.dslreasoner.application.ide; |
5 | 5 | ||
6 | import com.google.inject.Guice; | 6 | import com.google.inject.Guice; |
7 | import com.google.inject.Injector; | 7 | import com.google.inject.Injector; |
8 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule; | 8 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule; |
9 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup; | 9 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationStandaloneSetup; |
10 | import hu.bme.mit.inf.dslreasoner.application.ide.ApplicationConfigurationIdeModule; | 10 | import hu.bme.mit.inf.dslreasoner.application.ide.ApplicationConfigurationIdeModule; |
11 | import org.eclipse.xtext.util.Modules2; | 11 | import org.eclipse.xtext.util.Modules2; |
12 | 12 | ||
13 | /** | 13 | /** |
14 | * Initialization support for running Xtext languages as language servers. | 14 | * Initialization support for running Xtext languages as language servers. |
15 | */ | 15 | */ |
16 | @SuppressWarnings("all") | 16 | @SuppressWarnings("all") |
17 | public class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup { | 17 | public class ApplicationConfigurationIdeSetup extends ApplicationConfigurationStandaloneSetup { |
18 | @Override | 18 | @Override |
19 | public Injector createInjector() { | 19 | public Injector createInjector() { |
20 | ApplicationConfigurationRuntimeModule _applicationConfigurationRuntimeModule = new ApplicationConfigurationRuntimeModule(); | 20 | ApplicationConfigurationRuntimeModule _applicationConfigurationRuntimeModule = new ApplicationConfigurationRuntimeModule(); |
21 | ApplicationConfigurationIdeModule _applicationConfigurationIdeModule = new ApplicationConfigurationIdeModule(); | 21 | ApplicationConfigurationIdeModule _applicationConfigurationIdeModule = new ApplicationConfigurationIdeModule(); |
22 | return Guice.createInjector(Modules2.mixin(_applicationConfigurationRuntimeModule, _applicationConfigurationIdeModule)); | 22 | return Guice.createInjector(Modules2.mixin(_applicationConfigurationRuntimeModule, _applicationConfigurationIdeModule)); |
23 | } | 23 | } |
24 | } | 24 | } |