From 3997c2408f192e22f809cd96faa5bc552530289d Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Sun, 14 Jun 2020 19:38:40 -0400 Subject: This branch is ready to be merged into master --- .../ui/AbstractApplicationConfigurationUiModule.java | 16 ++++++++-------- ...cationConfigurationExecutableExtensionFactory.java | 10 ++++++---- ...tractApplicationConfigurationProposalProvider.java | 2 +- .../application/ui/internal/ApplicationActivator.java | 19 ++++++++++--------- 4 files changed, 25 insertions(+), 22 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application.ui/src-gen/hu/bme/mit/inf/dslreasoner/application') 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; @@ -215,6 +215,13 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi return ApplicationConfigurationProposalProvider.class; } + // 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 bindIRenameStrategy() { return DefaultRenameStrategy.class; @@ -225,13 +232,6 @@ public abstract class AbstractApplicationConfigurationUiModule extends DefaultUi return DefaultReferenceUpdater.class; } - // 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 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(); } + } -- cgit v1.2.3-54-g00ecf