This branch is ready to be merged into masterVampire-New

1 files changed, 6 insertions, 4 deletions

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;

         }

-        

+

 }