[waffle-scm] [870] sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico: merge some interface with impl

[paul]

Title: [waffle-scm] [870] sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico: merge some interface with impl

Revision

870

Author

paul

Date

2009-01-15 05:40:40 -0600 (Thu, 15 Jan 2009)

Log Message

merge some interface with impl

Modified Paths

• sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java

Removed Paths

sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/ScriptedPicoContextContainerFactory.java

Diff

Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/ScriptedPicoContextContainerFactory.java (869 => 870)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/ScriptedPicoContextContainerFactory.java	2009-01-15 11:36:17 UTC (rev 869)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/ScriptedPicoContextContainerFactory.java	2009-01-15 11:40:40 UTC (rev 870)
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) terms as published in http://waffle.codehaus.org/license.html
- */
-package org.codehaus.waffle.context.pico;
-
-import org.codehaus.waffle.context.ContextContainer;
-import org.codehaus.waffle.context.ContextContainerFactory;
-import org.codehaus.waffle.i18n.MessageResources;
-import org.codehaus.waffle.monitor.ContextMonitor;
-import org.codehaus.waffle.monitor.RegistrarMonitor;
-import org.codehaus.waffle.registrar.pico.ParameterResolver;
-import org.picocontainer.MutablePicoContainer;
-
-public abstract class ScriptedPicoContextContainerFactory extends ContextContainerFactory {
-
-    public ScriptedPicoContextContainerFactory(MessageResources messageResources,
-                                                ContextMonitor contextMonitor,
-                                                RegistrarMonitor registrarMonitor,
-                                                ParameterResolver parameterResolver) {
-        super(messageResources, contextMonitor, registrarMonitor, parameterResolver);
-    }
-
-    @Override
-    public MutablePicoContainer buildApplicationContextContainer() {
-        MutablePicoContainer contextContainer = super.buildApplicationContextContainer();
-
-        registerScriptComponents(contextContainer);
-
-        return contextContainer;
-    }
-
-    protected abstract void registerScriptComponents(MutablePicoContainer contextContainer);
-
-}

Modified: sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java (869 => 870)

--- sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java	2009-01-15 11:36:17 UTC (rev 869)
+++ sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/context/pico/RubyPicoContextContainerFactory.java	2009-01-15 11:40:40 UTC (rev 870)
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 
 import org.codehaus.waffle.WaffleException;
+import org.codehaus.waffle.context.ContextContainerFactory;
 import org.codehaus.waffle.i18n.MessageResources;
 import org.codehaus.waffle.monitor.ContextMonitor;
 import org.codehaus.waffle.monitor.RegistrarMonitor;
@@ -25,13 +26,20 @@
  * @author Michael Ward
  * @author Mauro Talevi
  */
-public class RubyPicoContextContainerFactory extends ScriptedPicoContextContainerFactory {
+public class RubyPicoContextContainerFactory extends ContextContainerFactory {
 
     public RubyPicoContextContainerFactory(MessageResources messageResources, ContextMonitor contextMonitor,
             RegistrarMonitor registrarMonitor, ParameterResolver parameterResolver) {
         super(messageResources, contextMonitor, registrarMonitor, parameterResolver);
     }
 
+    @Override
+    public MutablePicoContainer buildApplicationContextContainer() {
+        MutablePicoContainer contextContainer = super.buildApplicationContextContainer();
+        registerScriptComponents(contextContainer);
+        return contextContainer;
+    }
+
     protected void registerScriptComponents(MutablePicoContainer contextContainer) {
         // Register Ruby Runtime at Application level
         Ruby runtime = Ruby.newInstance();

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email