diff options
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application.ui')
6 files changed, 63 insertions, 45 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF index df5caadc..c3d4c18b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF | |||
@@ -15,8 +15,8 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.application, | |||
15 | org.eclipse.ui, | 15 | org.eclipse.ui, |
16 | org.eclipse.compare, | 16 | org.eclipse.compare, |
17 | org.eclipse.xtext.builder, | 17 | org.eclipse.xtext.builder, |
18 | org.eclipse.xtend.lib;resolution:=optional, | 18 | org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional, |
19 | org.eclipse.xtext.xbase.lib, | 19 | org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", |
20 | org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0" | 20 | org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0" |
21 | Import-Package: org.apache.log4j | 21 | Import-Package: org.apache.log4j |
22 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 22 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml_gen b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml_gen index fd03c81e..9cb8f3d2 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml_gen +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml_gen | |||
@@ -26,11 +26,11 @@ | |||
26 | <handler | 26 | <handler |
27 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler" | 27 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler" |
28 | commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate"> | 28 | commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate"> |
29 | <activeWhen> | 29 | <activeWhen> |
30 | <reference | 30 | <reference |
31 | definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened"> | 31 | definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened"> |
32 | </reference> | 32 | </reference> |
33 | </activeWhen> | 33 | </activeWhen> |
34 | </handler> | 34 | </handler> |
35 | <!-- copy qualified name --> | 35 | <!-- copy qualified name --> |
36 | <handler | 36 | <handler |
@@ -119,38 +119,38 @@ | |||
119 | </extension> | 119 | </extension> |
120 | <extension | 120 | <extension |
121 | point="org.eclipse.ui.commands"> | 121 | point="org.eclipse.ui.commands"> |
122 | <command | 122 | <command |
123 | description="Trigger expensive validation" | 123 | description="Trigger expensive validation" |
124 | id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate" | 124 | id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate" |
125 | name="Validate"> | 125 | name="Validate"> |
126 | </command> | 126 | </command> |
127 | <!-- copy qualified name --> | 127 | <!-- copy qualified name --> |
128 | <command | 128 | <command |
129 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" | 129 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName" |
130 | categoryId="org.eclipse.ui.category.edit" | 130 | categoryId="org.eclipse.ui.category.edit" |
131 | description="Copy the qualified name for the selected element" | 131 | description="Copy the qualified name for the selected element" |
132 | name="Copy Qualified Name"> | 132 | name="Copy Qualified Name"> |
133 | </command> | 133 | </command> |
134 | <command | 134 | <command |
135 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" | 135 | id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName" |
136 | categoryId="org.eclipse.ui.category.edit" | 136 | categoryId="org.eclipse.ui.category.edit" |
137 | description="Copy the qualified name for the selected element" | 137 | description="Copy the qualified name for the selected element" |
138 | name="Copy Qualified Name"> | 138 | name="Copy Qualified Name"> |
139 | </command> | 139 | </command> |
140 | </extension> | 140 | </extension> |
141 | <extension point="org.eclipse.ui.menus"> | 141 | <extension point="org.eclipse.ui.menus"> |
142 | <menuContribution | 142 | <menuContribution |
143 | locationURI="popup:#TextEditorContext?after=group.edit"> | 143 | locationURI="popup:#TextEditorContext?after=group.edit"> |
144 | <command | 144 | <command |
145 | commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate" | 145 | commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate" |
146 | style="push" | 146 | style="push" |
147 | tooltip="Trigger expensive validation"> | 147 | tooltip="Trigger expensive validation"> |
148 | <visibleWhen checkEnabled="false"> | 148 | <visibleWhen checkEnabled="false"> |
149 | <reference | 149 | <reference |
150 | definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened"> | 150 | definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened"> |
151 | </reference> | 151 | </reference> |
152 | </visibleWhen> | 152 | </visibleWhen> |
153 | </command> | 153 | </command> |
154 | </menuContribution> | 154 | </menuContribution> |
155 | <!-- copy qualified name --> | 155 | <!-- copy qualified name --> |
156 | <menuContribution locationURI="popup:#TextEditorContext?after=copy"> | 156 | <menuContribution locationURI="popup:#TextEditorContext?after=copy"> |
@@ -204,6 +204,15 @@ | |||
204 | </activeWhen> | 204 | </activeWhen> |
205 | </handler> | 205 | </handler> |
206 | </extension> | 206 | </extension> |
207 | <extension point="org.eclipse.core.contenttype.contentTypes"> | ||
208 | <content-type | ||
209 | base-type="org.eclipse.core.runtime.text" | ||
210 | file-extensions="vsconfig" | ||
211 | id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype" | ||
212 | name="ApplicationConfiguration File" | ||
213 | priority="normal"> | ||
214 | </content-type> | ||
215 | </extension> | ||
207 | <!-- adding resource factories --> | 216 | <!-- adding resource factories --> |
208 | <extension | 217 | <extension |
209 | point="org.eclipse.emf.ecore.extension_parser"> | 218 | point="org.eclipse.emf.ecore.extension_parser"> |
@@ -388,12 +397,18 @@ | |||
388 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | 397 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" |
389 | extensions="vsconfig"> | 398 | extensions="vsconfig"> |
390 | </viewer> | 399 | </viewer> |
400 | <contentTypeBinding | ||
401 | contentTypeId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype" | ||
402 | contentViewerId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentViewers" /> | ||
391 | </extension> | 403 | </extension> |
392 | <extension point="org.eclipse.compare.contentMergeViewers"> | 404 | <extension point="org.eclipse.compare.contentMergeViewers"> |
393 | <viewer id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentMergeViewers" | 405 | <viewer id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentMergeViewers" |
394 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" | 406 | class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator" |
395 | extensions="vsconfig" label="ApplicationConfiguration Compare"> | 407 | extensions="vsconfig" label="ApplicationConfiguration Compare"> |
396 | </viewer> | 408 | </viewer> |
409 | <contentTypeBinding | ||
410 | contentTypeId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype" | ||
411 | contentMergeViewerId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentMergeViewers" /> | ||
397 | </extension> | 412 | </extension> |
398 | <extension point="org.eclipse.ui.editors.documentProviders"> | 413 | <extension point="org.eclipse.ui.editors.documentProviders"> |
399 | <provider id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.editors.documentProviders" | 414 | <provider id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.editors.documentProviders" |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/AbstractApplicationConfigurationUiModule.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/AbstractApplicationConfigurationUiModule.java index 15fa1ba3..0774e7a8 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/AbstractApplicationConfigurationUiModule.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/AbstractApplicationConfigurationUiModule.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.21.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ui; | 4 | package hu.bme.mit.inf.dslreasoner.application.ui; |
5 | 5 | ||
@@ -216,6 +216,13 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi | |||
216 | } | 216 | } |
217 | 217 | ||
218 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 218 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
219 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
220 | binder.bind(IPreferenceStoreInitializer.class) | ||
221 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
222 | .to(RefactoringPreferences.Initializer.class); | ||
223 | } | ||
224 | |||
225 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
219 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { | 226 | public Class<? extends IRenameStrategy> bindIRenameStrategy() { |
220 | return DefaultRenameStrategy.class; | 227 | return DefaultRenameStrategy.class; |
221 | } | 228 | } |
@@ -226,13 +233,6 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi | |||
226 | } | 233 | } |
227 | 234 | ||
228 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | 235 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 |
229 | public void configureIPreferenceStoreInitializer(Binder binder) { | ||
230 | binder.bind(IPreferenceStoreInitializer.class) | ||
231 | .annotatedWith(Names.named("RefactoringPreferences")) | ||
232 | .to(RefactoringPreferences.Initializer.class); | ||
233 | } | ||
234 | |||
235 | // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 | ||
236 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { | 236 | public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() { |
237 | return DefaultRenameRefactoringProvider.class; | 237 | return DefaultRenameRefactoringProvider.class; |
238 | } | 238 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/ApplicationConfigurationExecutableExtensionFactory.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/ApplicationConfigurationExecutableExtensionFactory.java index ae8454b8..3c6d0c6c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/ApplicationConfigurationExecutableExtensionFactory.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/ApplicationConfigurationExecutableExtensionFactory.java | |||
@@ -1,10 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.21.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ui; | 4 | package hu.bme.mit.inf.dslreasoner.application.ui; |
5 | 5 | ||
6 | import com.google.inject.Injector; | 6 | import com.google.inject.Injector; |
7 | import hu.bme.mit.inf.dslreasoner.application.ui.internal.ApplicationActivator; | 7 | import hu.bme.mit.inf.dslreasoner.application.ui.internal.ApplicationActivator; |
8 | import org.eclipse.core.runtime.Platform; | ||
8 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; | 9 | import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory; |
9 | import org.osgi.framework.Bundle; | 10 | import org.osgi.framework.Bundle; |
10 | 11 | ||
@@ -16,12 +17,13 @@ public class ApplicationConfigurationExecutableExtensionFactory extends Abstract | |||
16 | 17 | ||
17 | @Override | 18 | @Override |
18 | protected Bundle getBundle() { | 19 | protected Bundle getBundle() { |
19 | return ApplicationActivator.getInstance().getBundle(); | 20 | return Platform.getBundle(ApplicationActivator.PLUGIN_ID); |
20 | } | 21 | } |
21 | 22 | ||
22 | @Override | 23 | @Override |
23 | protected Injector getInjector() { | 24 | protected Injector getInjector() { |
24 | return ApplicationActivator.getInstance().getInjector(ApplicationActivator.HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION); | 25 | ApplicationActivator activator = ApplicationActivator.getInstance(); |
26 | return activator != null ? activator.getInjector(ApplicationActivator.HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION) : null; | ||
25 | } | 27 | } |
26 | 28 | ||
27 | } | 29 | } |
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/contentassist/AbstractApplicationConfigurationProposalProvider.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/contentassist/AbstractApplicationConfigurationProposalProvider.java index 514abf35..1f1aea9f 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/contentassist/AbstractApplicationConfigurationProposalProvider.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/contentassist/AbstractApplicationConfigurationProposalProvider.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.21.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ui.contentassist; | 4 | package hu.bme.mit.inf.dslreasoner.application.ui.contentassist; |
5 | 5 | ||
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/internal/ApplicationActivator.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/internal/ApplicationActivator.java index fb4f4cc0..cc015c7b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/internal/ApplicationActivator.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application/ui/internal/ApplicationActivator.java | |||
@@ -1,12 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * generated by Xtext 2.12.0 | 2 | * generated by Xtext 2.21.0 |
3 | */ | 3 | */ |
4 | package hu.bme.mit.inf.dslreasoner.application.ui.internal; | 4 | package hu.bme.mit.inf.dslreasoner.application.ui.internal; |
5 | 5 | ||
6 | import com.google.common.collect.Maps; | 6 | import com.google.common.collect.Maps; |
7 | import com.google.inject.Guice; | 7 | import com.google.inject.Guice; |
8 | import com.google.inject.Injector; | 8 | import com.google.inject.Injector; |
9 | import com.google.inject.Module; | ||
10 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule; | 9 | import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule; |
11 | import hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationUiModule; | 10 | import hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationUiModule; |
12 | import java.util.Collections; | 11 | import java.util.Collections; |
@@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext; | |||
23 | */ | 22 | */ |
24 | public class ApplicationActivator extends AbstractUIPlugin { | 23 | public class ApplicationActivator extends AbstractUIPlugin { |
25 | 24 | ||
25 | public static final String PLUGIN_ID = "hu.bme.mit.inf.dslreasoner.application.ui"; | ||
26 | public static final String HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration"; | 26 | public static final String HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration"; |
27 | 27 | ||
28 | private static final Logger logger = Logger.getLogger(ApplicationActivator.class); | 28 | private static final Logger logger = Logger.getLogger(ApplicationActivator.class); |
@@ -60,10 +60,10 @@ public class ApplicationActivator extends AbstractUIPlugin { | |||
60 | 60 | ||
61 | protected Injector createInjector(String language) { | 61 | protected Injector createInjector(String language) { |
62 | try { | 62 | try { |
63 | Module runtimeModule = getRuntimeModule(language); | 63 | com.google.inject.Module runtimeModule = getRuntimeModule(language); |
64 | Module sharedStateModule = getSharedStateModule(); | 64 | com.google.inject.Module sharedStateModule = getSharedStateModule(); |
65 | Module uiModule = getUiModule(language); | 65 | com.google.inject.Module uiModule = getUiModule(language); |
66 | Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); | 66 | com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule); |
67 | return Guice.createInjector(mergedModule); | 67 | return Guice.createInjector(mergedModule); |
68 | } catch (Exception e) { | 68 | } catch (Exception e) { |
69 | logger.error("Failed to create injector for " + language); | 69 | logger.error("Failed to create injector for " + language); |
@@ -72,22 +72,23 @@ public class ApplicationActivator extends AbstractUIPlugin { | |||
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | protected Module getRuntimeModule(String grammar) { | 75 | protected com.google.inject.Module getRuntimeModule(String grammar) { |
76 | if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) { | 76 | if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) { |
77 | return new ApplicationConfigurationRuntimeModule(); | 77 | return new ApplicationConfigurationRuntimeModule(); |
78 | } | 78 | } |
79 | throw new IllegalArgumentException(grammar); | 79 | throw new IllegalArgumentException(grammar); |
80 | } | 80 | } |
81 | 81 | ||
82 | protected Module getUiModule(String grammar) { | 82 | protected com.google.inject.Module getUiModule(String grammar) { |
83 | if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) { | 83 | if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) { |
84 | return new ApplicationConfigurationUiModule(this); | 84 | return new ApplicationConfigurationUiModule(this); |
85 | } | 85 | } |
86 | throw new IllegalArgumentException(grammar); | 86 | throw new IllegalArgumentException(grammar); |
87 | } | 87 | } |
88 | 88 | ||
89 | protected Module getSharedStateModule() { | 89 | protected com.google.inject.Module getSharedStateModule() { |
90 | return new SharedStateModule(); | 90 | return new SharedStateModule(); |
91 | } | 91 | } |
92 | 92 | ||
93 | |||
93 | } | 94 | } |