Inject TermFactory instance directly

metaborg · May 18, 2020 · e8119a2 · e8119a2
1 parent 676427a
commit e8119a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...e.meta/src/main/java/org/metaborg/spoofax/eclipse/meta/wizard/UpgradeLangSpecHandler.java b/...e.meta/src/main/java/org/metaborg/spoofax/eclipse/meta/wizard/UpgradeLangSpecHandler.java
@@ -9,11 +9,11 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.metaborg.core.project.IProjectService;
 import org.metaborg.meta.core.project.ILanguageSpecService;
-import org.metaborg.spoofax.core.terms.ITermFactoryService;
 import org.metaborg.spoofax.eclipse.meta.SpoofaxMetaPlugin;
 import org.metaborg.spoofax.eclipse.resource.IEclipseResourceService;
 import org.metaborg.spoofax.eclipse.util.handler.AbstractHandlerUtils;
 import org.metaborg.spoofax.meta.core.config.ISpoofaxLanguageSpecConfigBuilder;
+import org.spoofax.interpreter.terms.ITermFactory;
 
 import com.google.inject.Injector;
 
@@ -22,7 +22,7 @@ public class UpgradeLangSpecHandler extends AbstractHandler {
     private final IProjectService projectService;
     private final ILanguageSpecService languageSpecService;
     private final ISpoofaxLanguageSpecConfigBuilder configBuilder;
-    private final ITermFactoryService termFactoryService;
+    private final ITermFactory termFactory;
 
 
     public UpgradeLangSpecHandler() {
@@ -31,7 +31,7 @@ public UpgradeLangSpecHandler() {
         this.projectService = injector.getInstance(IProjectService.class);
         this.languageSpecService = injector.getInstance(ILanguageSpecService.class);
         this.configBuilder = injector.getInstance(ISpoofaxLanguageSpecConfigBuilder.class);
-        this.termFactoryService = injector.getInstance(ITermFactoryService.class);
+        this.termFactory = injector.getInstance(ITermFactory.class);
     }
 
 
@@ -42,7 +42,7 @@ public UpgradeLangSpecHandler() {
         }
 
         final UpgradeLangSpecWizard wizard = new UpgradeLangSpecWizard(resourceService, projectService,
-            languageSpecService, configBuilder, termFactoryService, project);
+            languageSpecService, configBuilder, termFactory, project);
         final Shell shell = HandlerUtil.getActiveWorkbenchWindow(event).getShell();
         final WizardDialog dialog = new WizardDialog(shell, wizard);
         dialog.open();

diff --git a/...se.meta/src/main/java/org/metaborg/spoofax/eclipse/meta/wizard/UpgradeLangSpecWizard.java b/...se.meta/src/main/java/org/metaborg/spoofax/eclipse/meta/wizard/UpgradeLangSpecWizard.java
@@ -23,7 +23,6 @@
 import org.metaborg.meta.core.project.ILanguageSpec;
 import org.metaborg.meta.core.project.ILanguageSpecService;
 import org.metaborg.spoofax.core.esv.ESVReader;
-import org.metaborg.spoofax.core.terms.ITermFactoryService;
 import org.metaborg.spoofax.eclipse.meta.nature.SpoofaxMetaNature;
 import org.metaborg.spoofax.eclipse.resource.IEclipseResourceService;
 import org.metaborg.spoofax.eclipse.util.BuilderUtils;
@@ -44,6 +43,7 @@
 import org.metaborg.util.resource.ContainsFileSelector;
 import org.spoofax.interpreter.terms.IStrategoAppl;
 import org.spoofax.interpreter.terms.IStrategoTerm;
+import org.spoofax.interpreter.terms.ITermFactory;
 import org.spoofax.terms.ParseError;
 import org.spoofax.terms.io.binary.TermReader;
 
@@ -62,7 +62,7 @@ public class UpgradeLangSpecWizard extends Wizard {
 
     public UpgradeLangSpecWizard(IEclipseResourceService resourceService, IProjectService projectService,
         ILanguageSpecService languageSpecService, ISpoofaxLanguageSpecConfigBuilder configBuilder,
-        ITermFactoryService termFactoryService, IProject eclipseProject) {
+        ITermFactory termFactory, IProject eclipseProject) {
         this.configBuilder = configBuilder;
         this.eclipseProject = eclipseProject;
         this.projectLocation = resourceService.resolve(eclipseProject);
@@ -78,7 +78,7 @@ public UpgradeLangSpecWizard(IEclipseResourceService resourceService, IProjectSe
             if(files != null && files.length > 0) {
                 final FileObject esvFile = files[0];
                 final TermReader reader =
-                    new TermReader(termFactoryService.getGeneric());
+                    new TermReader(termFactory);
                 final IStrategoTerm term = reader.parseFromStream(esvFile.getContent().getInputStream());
                 if(term.getTermType() != IStrategoTerm.APPL) {
                     throw new IllegalStateException("Packed ESV file does not contain a valid ESV term.");