From 5c4471e3a4cd273bf68eb2ccc1d91f99b5c8c7bc Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Wed, 6 Mar 2019 17:26:43 -0500 Subject: Implement Enum handling and study hierarchy handling --- .../language/ui/internal/LanguageActivator.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire') diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java index eca3aa7f..b25ea8a3 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/vampire/language/ui/internal/LanguageActivator.java @@ -1,5 +1,5 @@ /* - * generated by Xtext 2.12.0 + * generated by Xtext 2.14.0 */ package ca.mcgill.ecse.dslreasoner.vampire.language.ui.internal; @@ -8,7 +8,6 @@ import ca.mcgill.ecse.dslreasoner.ui.VampireLanguageUiModule; import com.google.common.collect.Maps; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.Module; import java.util.Collections; import java.util.Map; import org.apache.log4j.Logger; @@ -23,6 +22,7 @@ import org.osgi.framework.BundleContext; */ public class LanguageActivator extends AbstractUIPlugin { + public static final String PLUGIN_ID = "ca.mcgill.ecse.dslreasoner.vampire.language.ui"; public static final String CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE = "ca.mcgill.ecse.dslreasoner.VampireLanguage"; private static final Logger logger = Logger.getLogger(LanguageActivator.class); @@ -60,10 +60,10 @@ public class LanguageActivator 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 LanguageActivator extends AbstractUIPlugin { } } - protected Module getRuntimeModule(String grammar) { + protected com.google.inject.Module getRuntimeModule(String grammar) { if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { return new VampireLanguageRuntimeModule(); } throw new IllegalArgumentException(grammar); } - protected Module getUiModule(String grammar) { + protected com.google.inject.Module getUiModule(String grammar) { if (CA_MCGILL_ECSE_DSLREASONER_VAMPIRELANGUAGE.equals(grammar)) { return new VampireLanguageUiModule(this); } throw new IllegalArgumentException(grammar); } - protected Module getSharedStateModule() { + protected com.google.inject.Module getSharedStateModule() { return new SharedStateModule(); } + } -- cgit v1.2.3-70-g09d2