From 6b347172449f9553694aa12c9229bc7643a504fb Mon Sep 17 00:00:00 2001
From: Steve Hickman <steve@epistimis.com>
Date: Fri, 22 Dec 2023 14:39:28 -0800
Subject: [PATCH] Updated DI - inject less / update RuntimeModule with
 injectable classes

Also reorganize RuntimeModule to group all 'standard' (XText based)
interfaces at the top of the file.
---
 .../com/epistimis/uddl/EntityProcessor.java   |  3 --
 .../epistimis/uddl/NavigationUtilities.java   |  1 -
 .../com/epistimis/uddl/UddlRuntimeModule.java | 52 +++++++++++--------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/EntityProcessor.java b/com.epistimis.uddl/src/com/epistimis/uddl/EntityProcessor.java
index bb5067c..ed33e49 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/EntityProcessor.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/EntityProcessor.java
@@ -56,9 +56,6 @@ public abstract class EntityProcessor<Characteristic extends EObject, Entity ext
 	@Inject
 	IQualifiedNameConverter qnc;
 
-	@Inject
-	CLPExtractors clp;
-
 	static Logger logger = Logger.getLogger(QueryProcessor.class);
 
 	/**
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/NavigationUtilities.java b/com.epistimis.uddl/src/com/epistimis/uddl/NavigationUtilities.java
index 6841265..6bfec89 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/NavigationUtilities.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/NavigationUtilities.java
@@ -18,7 +18,6 @@
 public class NavigationUtilities {
 
 	@Inject IndexUtilities iu;
-	@Inject ConceptualEntityProcessor cep;
 
 	/**
 	 * Walk up the containment hierarchy until we find a container that fails the test.
diff --git a/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java b/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
index e10cb35..08525d9 100644
--- a/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
+++ b/com.epistimis.uddl/src/com/epistimis/uddl/UddlRuntimeModule.java
@@ -37,6 +37,28 @@ public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() {
 		// TODO Auto-generated method stub
 		return UddlQNP.class;
 	}
+
+	/**
+	 * Enable this if there are performance issues with name resolution. And then
+	 * look at the strategy to see what should be excluded from the index
+	 */
+	public  Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
+		return UddlResourceDescriptionStrategy.class;
+	}
+
+//	// Enable imports by uncommenting this. The default is to import anything visible in a project
+//	// See section 3.3.1,3.3.2 of the Advanced XText Manual PDF 
+//	// or https://blogs.itemis.com/en/in-five-minutes-to-transitive-imports-within-a-dsl-with-xtext
+//	@Override
+//	public
+//	Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
+//		return UddlGlobalScopeProvider.class;
+//	}
+	
+	public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
+		return IQualifiedNameConverter.DefaultImpl.class;
+	}
+
 	/** 
 	 * Inject this if you want the additional methods provided by this QNP
 	 * @return
@@ -51,10 +73,10 @@ public Class<? extends IndexUtilities> bindIndexUtilities() {
 	}
 
 
-	public Class<? extends IQualifiedNameConverter> bindIQualifiedNameConverter() {
-		return IQualifiedNameConverter.DefaultImpl.class;
+	public Class<? extends com.epistimis.uddl.CLPExtractors> bindCLPExtractors() {
+		return CLPExtractors.class;
 	}
-
+	
 	public Class<? extends ConceptualQueryProcessor> bindConceptualQueryProcessor() {
 		return ConceptualQueryProcessor.class;
 	}
@@ -65,29 +87,13 @@ public Class<? extends PlatformQueryProcessor> bindPlatformQueryProcessor() {
 		return PlatformQueryProcessor.class;
 	}
 
-	public Class<? extends com.epistimis.uddl.CLPExtractors> bindCLPExtractors() {
-		return CLPExtractors.class;
-	}
-	
+	// ----------- Taxonomy processors
 	public Class<? extends com.epistimis.uddl.LogicalEnumeratedProcessor> bindLogicalEnumeratedProcessor() {
 		return LogicalEnumeratedProcessor.class;
 	}
-	
-	/**
-	 * Enable this if there are performance issues with name resolution. And then
-	 * look at the strategy to see what should be excluded from the index
-	 */
-	public  Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
-		return UddlResourceDescriptionStrategy.class;
+	public Class<? extends com.epistimis.uddl.TaxonomyBaseProcessor> bindTaxonomyBaseProcessor() {
+		return TaxonomyBaseProcessor.class;
 	}
-
-//	// Enable imports by uncommenting this. The default is to import anything visible in a project
-//	// See section 3.3.1,3.3.2 of the Advanced XText Manual PDF 
-//	// or https://blogs.itemis.com/en/in-five-minutes-to-transitive-imports-within-a-dsl-with-xtext
-//	@Override
-//	public
-//	Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
-//		return UddlGlobalScopeProvider.class;
-//	}
+	
 
 }