This branch is ready to be merged into masterVampire-New

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,
  org.eclipse.ui,

  org.eclipse.compare,

  org.eclipse.xtext.builder,

- org.eclipse.xtend.lib;resolution:=optional,

- org.eclipse.xtext.xbase.lib,

+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,

+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",

  org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0"

 Import-Package: org.apache.log4j

 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 @@
                 <handler

                         class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"

                         commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate">

-                <activeWhen>

-                        <reference

+                        <activeWhen>

+                                <reference

                                         definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened">

-                        </reference>

-                </activeWhen>

+                                </reference>

+                        </activeWhen>

                 </handler>

                 <!-- copy qualified name -->

                 <handler

@@ -119,38 +119,38 @@
         </extension>

         <extension

                 point="org.eclipse.ui.commands">

-        <command

+                <command

                         description="Trigger expensive validation"

                         id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate"

                         name="Validate">

-        </command>

-        <!-- copy qualified name -->

-        <command

+                </command>

+                <!-- copy qualified name -->

+                <command

                         id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"

                         categoryId="org.eclipse.ui.category.edit"

                         description="Copy the qualified name for the selected element"

                         name="Copy Qualified Name">

-        </command>

-        <command

+                </command>

+                <command

                         id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"

                         categoryId="org.eclipse.ui.category.edit"

                         description="Copy the qualified name for the selected element"

                         name="Copy Qualified Name">

-        </command>

+                </command>

         </extension>

         <extension point="org.eclipse.ui.menus">

                 <menuContribution

                         locationURI="popup:#TextEditorContext?after=group.edit">

-                         <command

-                                 commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate"

-                                 style="push"

-                                 tooltip="Trigger expensive validation">

-                        <visibleWhen checkEnabled="false">

-                                <reference

-                                        definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened">

-                                </reference>

-                        </visibleWhen>

-                </command>

+                        <command

+                                commandId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.validate"

+                                style="push"

+                                tooltip="Trigger expensive validation">

+                                <visibleWhen checkEnabled="false">

+                                        <reference

+                                                definitionId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.Editor.opened">

+                                        </reference>

+                                </visibleWhen>

+                        </command>

                 </menuContribution>

                 <!-- copy qualified name -->

                 <menuContribution locationURI="popup:#TextEditorContext?after=copy">

@@ -204,6 +204,15 @@
                         </activeWhen>

                 </handler>

         </extension>

+        <extension point="org.eclipse.core.contenttype.contentTypes">

+                <content-type

+                        base-type="org.eclipse.core.runtime.text"

+                        file-extensions="vsconfig"

+                        id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype"

+                        name="ApplicationConfiguration File"

+                        priority="normal">

+                </content-type>

+        </extension>

         <!-- adding resource factories -->

         <extension

                 point="org.eclipse.emf.ecore.extension_parser">

@@ -388,12 +397,18 @@
                         class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

                         extensions="vsconfig">

                 </viewer>

+                <contentTypeBinding

+                        contentTypeId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype"

+                        contentViewerId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentViewers" />

         </extension>

         <extension point="org.eclipse.compare.contentMergeViewers">

                 <viewer id="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentMergeViewers"

                         class="hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"

                         extensions="vsconfig" label="ApplicationConfiguration Compare">

                 </viewer>

+                <contentTypeBinding

+                        contentTypeId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.contenttype"

+                        contentMergeViewerId="hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration.compare.contentMergeViewers" />

         </extension>

         <extension point="org.eclipse.ui.editors.documentProviders">

                 <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 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.21.0

  */

 package hu.bme.mit.inf.dslreasoner.application.ui;

 

@@ -216,6 +216,13 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

+        public void configureIPreferenceStoreInitializer(Binder binder) {

+                binder.bind(IPreferenceStoreInitializer.class)

+                        .annotatedWith(Names.named("RefactoringPreferences"))

+                        .to(RefactoringPreferences.Initializer.class);

+        }

+        

+        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameStrategy> bindIRenameStrategy() {

                 return DefaultRenameStrategy.class;

         }

@@ -226,13 +233,6 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi
         }

         

         // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

-        public void configureIPreferenceStoreInitializer(Binder binder) {

-                binder.bind(IPreferenceStoreInitializer.class)

-                        .annotatedWith(Names.named("RefactoringPreferences"))

-                        .to(RefactoringPreferences.Initializer.class);

-        }

-        

-        // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2

         public Class<? extends IRenameRefactoringProvider> bindIRenameRefactoringProvider() {

                 return DefaultRenameRefactoringProvider.class;

         }

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 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.21.0

  */

 package hu.bme.mit.inf.dslreasoner.application.ui;

 

 import com.google.inject.Injector;

 import hu.bme.mit.inf.dslreasoner.application.ui.internal.ApplicationActivator;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

 import org.osgi.framework.Bundle;

 

@@ -16,12 +17,13 @@ public class ApplicationConfigurationExecutableExtensionFactory extends Abstract
 

         @Override

         protected Bundle getBundle() {

-                return ApplicationActivator.getInstance().getBundle();

+                return Platform.getBundle(ApplicationActivator.PLUGIN_ID);

         }

         

         @Override

         protected Injector getInjector() {

-                return ApplicationActivator.getInstance().getInjector(ApplicationActivator.HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION);

+                ApplicationActivator activator = ApplicationActivator.getInstance();

+                return activator != null ? activator.getInjector(ApplicationActivator.HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION) : null;

         }

-        

+

 }

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 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.21.0

  */

 package hu.bme.mit.inf.dslreasoner.application.ui.contentassist;

 

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 @@
 /*

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.21.0

  */

 package hu.bme.mit.inf.dslreasoner.application.ui.internal;

 

 import com.google.common.collect.Maps;

 import com.google.inject.Guice;

 import com.google.inject.Injector;

-import com.google.inject.Module;

 import hu.bme.mit.inf.dslreasoner.application.ApplicationConfigurationRuntimeModule;

 import hu.bme.mit.inf.dslreasoner.application.ui.ApplicationConfigurationUiModule;

 import java.util.Collections;

@@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext;
  */

 public class ApplicationActivator extends AbstractUIPlugin {

 

+        public static final String PLUGIN_ID = "hu.bme.mit.inf.dslreasoner.application.ui";

         public static final String HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION = "hu.bme.mit.inf.dslreasoner.application.ApplicationConfiguration";

         

         private static final Logger logger = Logger.getLogger(ApplicationActivator.class);

@@ -60,10 +60,10 @@ public class ApplicationActivator extends AbstractUIPlugin {
         

         protected Injector createInjector(String language) {

                 try {

-                        Module runtimeModule = getRuntimeModule(language);

-                        Module sharedStateModule = getSharedStateModule();

-                        Module uiModule = getUiModule(language);

-                        Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

+                        com.google.inject.Module runtimeModule = getRuntimeModule(language);

+                        com.google.inject.Module sharedStateModule = getSharedStateModule();

+                        com.google.inject.Module uiModule = getUiModule(language);

+                        com.google.inject.Module mergedModule = Modules2.mixin(runtimeModule, sharedStateModule, uiModule);

                         return Guice.createInjector(mergedModule);

                 } catch (Exception e) {

                         logger.error("Failed to create injector for " + language);

@@ -72,22 +72,23 @@ public class ApplicationActivator extends AbstractUIPlugin {
                 }

         }

         

-        protected Module getRuntimeModule(String grammar) {

+        protected com.google.inject.Module getRuntimeModule(String grammar) {

                 if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) {

                         return new ApplicationConfigurationRuntimeModule();

                 }

                 throw new IllegalArgumentException(grammar);

         }

         

-        protected Module getUiModule(String grammar) {

+        protected com.google.inject.Module getUiModule(String grammar) {

                 if (HU_BME_MIT_INF_DSLREASONER_APPLICATION_APPLICATIONCONFIGURATION.equals(grammar)) {

                         return new ApplicationConfigurationUiModule(this);

                 }

                 throw new IllegalArgumentException(grammar);

         }

         

-        protected Module getSharedStateModule() {

+        protected com.google.inject.Module getSharedStateModule() {

                 return new SharedStateModule();

         }

         

+        

 }