X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Finject%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Finject%2FInjectable.java;h=7cfdc3d1b56945cbfc54fcfe6044f1b5207dd09c;hb=94ddca39fadbe7931a17c179424afd123bd2863a;hp=0c881d9b104d50a796a815d13f0bd5ce955ee309;hpb=6edb8d1fb3e7f36d3fe9f53583fa6aac0ccd3f65;p=utils

diff --git a/support/inject/src/main/java/org/wamblee/inject/Injectable.java b/support/inject/src/main/java/org/wamblee/inject/Injectable.java
index 0c881d9b..7cfdc3d1 100644
--- a/support/inject/src/main/java/org/wamblee/inject/Injectable.java
+++ b/support/inject/src/main/java/org/wamblee/inject/Injectable.java
@@ -15,31 +15,42 @@
  */
 package org.wamblee.inject;
 
-import java.util.ServiceLoader;
-
-
 /**
  * This abstract base class performs injection at construction. Be sure not to
  * initialize fields of derived classes to null as these will override the
  * initializations of this base class.
  * 
- * Use this by subclassing through {@link #Injectable()).
- * 
- * To use this class, the {@link ServiceLoader} mechanism must be used to locate
- * a {@link InjectorFactory}. The first implementation that is found will be
- * used for injection.
+ * This class uses {@link InjectorBuilder} to obtain an implementation of a
+ * {@link InjectorFactory} to use.
  * 
  * @author Erik Brakkee
  */
 public abstract class Injectable {
 
-    private static final SimpleInjector INJECTOR = new SimpleInjector(
-        InjectorFactoryBuilder.getInjectorFactory());
+    private final Injector injector = InjectorBuilder.getInjector();
 
     /**
      * Inheritance style constructor.
      */
     protected Injectable() {
-        INJECTOR.inject(this);
-    }    
+        inject();
+    }
+
+    /**
+     * Inject references. This can be useful when injection is to be done again
+     * after construction to obtain new references or after zeroing out of the
+     * references.
+     */
+    public void inject() {
+        injector.inject(this);
+    }
+
+    /**
+     * Gets the default injector.
+     * 
+     * @return Injector.
+     */
+    public Injector getInjector() {
+        return injector;
+    }
 }