Refactoring of dispatcher code into ui / non ui

bioclipse · Mar 1, 2011 · 8720104 · 8720104
1 parent 1cd2231
commit 8720104
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 590 deletions.
diff --git a/plugins/net.bioclipse.browser.business/META-INF/spring/context.xml b/plugins/net.bioclipse.browser.business/META-INF/spring/context.xml
@@ -24,7 +24,7 @@
                   interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" />
 
   <osgi:reference id="wrapInProxyAdvice"
-                  interface="net.bioclipse.recording.IWrapInProxyAdvice" />
+                  interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" />
 
   <bean id="recordingAdvisor"
         class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">

diff --git a/...oclipse.browser.business/src/net/bioclipse/browser/business/business/IBrowserManager.java b/...oclipse.browser.business/src/net/bioclipse/browser/business/business/IBrowserManager.java
@@ -15,11 +15,11 @@
 import net.bioclipse.core.api.BioclipseException;
 import net.bioclipse.core.api.Recorded;
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.core.api.managers.IBioclipseManager;
 import net.bioclipse.core.api.managers.PublishedClass;
 import net.bioclipse.core.api.managers.PublishedMethod;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseUIJob;
 
 @PublishedClass(

diff --git a/...lipse.browser.tests/src/net/bioclipse/browser/tests/AbstractBrowserManagerPluginTest.java b/...lipse.browser.tests/src/net/bioclipse/browser/tests/AbstractBrowserManagerPluginTest.java
@@ -16,8 +16,8 @@
 
 import net.bioclipse.core.api.BioclipseException;
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.browser.business.business.IBrowserManager;
 
 import org.junit.Ignore;

diff --git a/...bioclipse.browser.tests/src/net/bioclipse/browser/tests/JavaBrowserManagerPluginTest.java b/...bioclipse.browser.tests/src/net/bioclipse/browser/tests/JavaBrowserManagerPluginTest.java
@@ -14,8 +14,8 @@
 
 import net.bioclipse.core.api.BioclipseException;
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

diff --git a/plugins/net.bioclipse.browser/src/net/bioclipse/browser/editors/RichBrowserEditor.java b/plugins/net.bioclipse.browser/src/net/bioclipse/browser/editors/RichBrowserEditor.java
@@ -15,8 +15,8 @@
 import net.bioclipse.browser.business.Activator;
 import net.bioclipse.core.api.BioclipseException;
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;

diff --git a/plugins/net.bioclipse.business/META-INF/spring/context-osgi.xml b/plugins/net.bioclipse.business/META-INF/spring/context-osgi.xml
@@ -20,7 +20,7 @@
 		interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" />
 
 	<osgi:reference id="wrapInProxyAdvice"
-		interface="net.bioclipse.recording.IWrapInProxyAdvice" />
+		interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" />
 
 	<bean id="recordingAdvisor"
 		class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">

diff --git a/plugins/net.bioclipse.core.api/META-INF/MANIFEST.MF b/plugins/net.bioclipse.core.api/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: net.bioclipse.core.api.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.5.2",
- org.springframework.osgi.aopalliance.osgi;bundle-version="1.0.0"
+ org.springframework.osgi.aopalliance.osgi;bundle-version="1.0.0",
+ org.springframework.bundle.spring.core;bundle-version="2.5.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: net.bioclipse.core.api,
@@ -16,4 +17,5 @@ Export-Package: net.bioclipse.core.api,
  net.bioclipse.core.api.recording,
  net.bioclipse.core.api.util
 Import-Package: org.apache.log4j,
- org.springframework.aop
+ org.springframework.aop,
+ org.springframework.aop.support
diff --git a/...ipse.core.tests/src/net/bioclipse/managers/tests/AbstractManagerMethodDispatcherTest.java b/...ipse.core.tests/src/net/bioclipse/managers/tests/AbstractManagerMethodDispatcherTest.java
@@ -14,8 +14,8 @@
 import java.util.List;
 
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseUIJob;
 import net.bioclipse.jobs.ExtendedBioclipseJob;
 

diff --git a/plugins/net.bioclipse.core.tests/src/net/bioclipse/managers/tests/ITestManager.java b/plugins/net.bioclipse.core.tests/src/net/bioclipse/managers/tests/ITestManager.java
@@ -6,13 +6,13 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 
 import net.bioclipse.core.api.domain.IBioObject;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
+import net.bioclipse.core.api.jobs.GuiAction;
 import net.bioclipse.core.api.jobs.IBioclipseJob;
+import net.bioclipse.core.api.jobs.IExtendedBioclipseJob;
 import net.bioclipse.core.api.managers.IBioclipseManager;
 import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.jobs.BioclipseUIJob;
-import net.bioclipse.jobs.ExtendedBioclipseJob;
-import net.bioclipse.managers.business.GuiAction;
 
 public interface ITestManager extends IBioclipseManager {
 
@@ -58,11 +58,11 @@ public void createBioObject( IFile file,
      * ExtendedBioclipseJob
      */
 
-    public ExtendedBioclipseJob<Void> extendedVoidJobMethod(String path);
+    public IExtendedBioclipseJob<Void> extendedVoidJobMethod(String path);
 
-    public ExtendedBioclipseJob<Void> extendedVoidJobMethod(IFile file);
+    public IExtendedBioclipseJob<Void> extendedVoidJobMethod(IFile file);
 
-    public ExtendedBioclipseJob<IBioObject> 
+    public IExtendedBioclipseJob<IBioObject> 
                extendedGetBioObjects( IFile file, 
                                       BioclipseJobUpdateHook h );
 

diff --git a/...et.bioclipse.core.tests/src/net/bioclipse/managers/tests/JavaScriptManagerMethodTest.java b/...et.bioclipse.core.tests/src/net/bioclipse/managers/tests/JavaScriptManagerMethodTest.java
@@ -6,7 +6,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import net.bioclipse.managers.business.JavaScriptManagerMethodDispatcher;
+import net.bioclipse.core.api.managers.JavaScriptManagerMethodDispatcher;
 import net.bioclipse.managers.tests.AbstractManagerMethodDispatcherTest.MyInvocation;
 
 /**

diff --git a/plugins/net.bioclipse.core/META-INF/MANIFEST.MF b/plugins/net.bioclipse.core/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Export-Package: net.bioclipse.core,
  net.bioclipse.managers,
  net.bioclipse.managers.business,
  net.bioclipse.recording
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: net.bioclipse.core.api;bundle-version="1.0.0",
+ org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.ui.views,
@@ -24,8 +25,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.springframework.osgi.aopalliance.osgi;bundle-version="1.0.0",
  org.springframework.bundle.spring.core;bundle-version="2.5.1",
  net.sf.cglib;bundle-version="2.1.3",
- org.eclipse.jface,
- net.bioclipse.core.api;bundle-version="1.0.0"
+ org.eclipse.jface
 Bundle-ClassPath: libs/js.jar,
  .,
  libs/groovy-1.0.jar,

diff --git a/plugins/net.bioclipse.core/META-INF/spring/context-osgi.xml b/plugins/net.bioclipse.core/META-INF/spring/context-osgi.xml
@@ -8,27 +8,26 @@
 		Export the beans (defined in a separate config file in this case) as
 		an OSGi service
 	-->
-	<osgi:service id="historyOSGI" ref="history"
+
+   <osgi:service 
+       id="recordingAdviceOSGI" ref="recordingAdvice"
+       interface="net.bioclipse.core.api.recording.IRecordingAdvice" />
+
+	<osgi:service 
+	    id="historyOSGI" 
+	    ref="history"
 		interface="net.bioclipse.recording.IHistory" />
 
-	<osgi:service id="recordingAdviceOSGI" ref="recordingAdvice"
-		interface="net.bioclipse.core.api.recording.IRecordingAdvice" />
+	<osgi:service 
+	    id="wrapInProxyAdviceOSGI" 
+	    ref="wrapInProxyAdvice"
+		interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" />
 
-	<osgi:service id="wrapInProxyAdviceOSGI" ref="wrapInProxyAdvice"
-		interface="net.bioclipse.recording.IWrapInProxyAdvice" />
-
-	<osgi:reference id="createJobAdvice"
-		interface="net.bioclipse.core.api.jobs.ICreateJobAdvice" />
-
-	<bean id="recordingAdvisor"
+	<bean 
+	    id="recordingAdvisor"
 		class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
 		<property name="advice" ref="recordingAdvice" />
 		<property name="pattern" value=".*" /> <!-- See also class implementation -->
 	</bean>
 
-	<osgi:service id="JSJobCreatorAdviceOSGI" ref="createJSJobAdvice"
-		interface="net.bioclipse.scripting.business.IJSJobCreatorAdvice" />
-
-	<bean id="createJSJobAdvice" class="net.bioclipse.scripting.business.JSJobCreatorAdvice">
-	</bean>
-</beans>
+</beans>
diff --git a/plugins/net.bioclipse.core/META-INF/spring/context.xml b/plugins/net.bioclipse.core/META-INF/spring/context.xml
@@ -3,6 +3,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
 	<bean id="recordingAdvice" class="net.bioclipse.recording.RecordingAdvice">
 		<constructor-arg>
 			<ref local="history" />

diff --git a/plugins/net.bioclipse.core/META-INF/spring/managers.xml b/plugins/net.bioclipse.core/META-INF/spring/managers.xml
@@ -9,27 +9,13 @@
                   ref="javaManagerDispatcherAdvisor"
                   interface="net.bioclipse.core.api.managers.IJavaManagerDispatcherAdvisor" />
 
-    <osgi:service id="javaScriptManagerDispatcherAdvisorOSGI" 
-                  ref="javaScriptManagerDispatcherAdvisor"
-                  interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" />
-
     <bean id="javaManagerMethodDispatcher"
           class="net.bioclipse.managers.business.JavaManagerMethodDispatcher" >
     </bean>
 
-    <bean id="javaScriptManagerMethodDispatcher"
-          class="net.bioclipse.managers.business.JavaScriptManagerMethodDispatcher" >
-    </bean>
-
     <bean id="javaManagerDispatcherAdvisor"
         class="net.bioclipse.managers.business.JavaManagerDispatcherAdvisor">
         <property name="advice"  ref="javaManagerMethodDispatcher" />
         <property name="pattern" value=".*" />
     </bean>
-
-    <bean id="javaScriptManagerDispatcherAdvisor"
-        class="net.bioclipse.managers.business.JavaScriptManagerDispatcherAdvisor">
-        <property name="advice"  ref="javaScriptManagerMethodDispatcher" />
-        <property name="pattern" value=".*" />
-    </bean>      
 </beans>
diff --git a/plugins/net.bioclipse.core/src/net/bioclipse/jobs/BioclipseJob.java b/plugins/net.bioclipse.core/src/net/bioclipse/jobs/BioclipseJob.java
@@ -9,6 +9,7 @@
 import net.bioclipse.core.SilentNotification;
 import net.bioclipse.core.api.BioclipseException;
 import net.bioclipse.core.api.ResourcePathTransformer;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
 import net.bioclipse.core.api.jobs.IBioclipseJob;
 import net.bioclipse.core.api.jobs.IReturner;
 import net.bioclipse.core.api.managers.IBioclipseManager;

diff --git a/plugins/net.bioclipse.core/src/net/bioclipse/jobs/BioclipseJobUpdateHook.java b/plugins/net.bioclipse.core/src/net/bioclipse/jobs/BioclipseJobUpdateHook.java
diff --git a/plugins/net.bioclipse.core/src/net/bioclipse/jobs/ExtendedBioclipseJob.java b/plugins/net.bioclipse.core/src/net/bioclipse/jobs/ExtendedBioclipseJob.java
@@ -10,6 +10,9 @@
  ******************************************************************************/
 package net.bioclipse.jobs;
 
+import net.bioclipse.core.api.jobs.IExtendedBioclipseJob;
+
+
 
 /**
  * Extended version of the BioclipseJob class which is not automagicly scheduled
@@ -18,7 +21,8 @@
  * @author jonalv
  *
  */
-public class ExtendedBioclipseJob<T> extends BioclipseJob<T> {
+public class ExtendedBioclipseJob<T> extends BioclipseJob<T> 
+                                     implements IExtendedBioclipseJob<T> {
 
     /**
      * @param name