Permalink
Browse files

Refactoring of dispatcher code into ui / non ui

  • Loading branch information...
1 parent 422820d commit 50838b3f296de1e668e4e15c0516c12ce993fd6e @jonalv jonalv committed Jan 17, 2011
@@ -17,7 +17,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">
@@ -23,7 +23,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">
@@ -23,7 +23,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">
@@ -17,8 +17,8 @@
import net.bioclipse.cdk.ui.sdfeditor.business.IMoleculeTableManager;
import net.bioclipse.cdk.ui.sdfeditor.business.SDFIndexEditorModel;
import net.bioclipse.core.api.domain.IMolecule.Property;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -15,7 +15,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">
@@ -18,12 +18,12 @@
import net.bioclipse.cdk.ui.views.IMoleculesEditorModel;
import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.api.Recorded;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
import net.bioclipse.core.api.jobs.IReturner;
import net.bioclipse.core.api.managers.IBioclipseManager;
import net.bioclipse.core.api.managers.IBioclipseUIJob;
import net.bioclipse.core.api.managers.PublishedMethod;
import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
@@ -35,9 +35,9 @@
import net.bioclipse.cdk.ui.views.IMoleculesEditorModel;
import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.api.ResourcePathTransformer;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
import net.bioclipse.core.util.LogUtils;
import net.bioclipse.jobs.BioclipseJob;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
import net.bioclipse.jobs.BioclipseUIJob;
import net.sourceforge.nattable.NatTable;
import net.sourceforge.nattable.grid.GridRegion;
@@ -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">
@@ -23,7 +23,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">
@@ -8,28 +8,30 @@
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<!-- Gets the recording advice -->
+<!--
<osgi:reference id="recordingAdvice"
interface="net.bioclipse.core.api.recording.IRecordingAdvice" />
<osgi:reference id="javaManagerDispatcherAdvisor"
interface="net.bioclipse.core.api.managers.IJavaManagerDispatcherAdvisor" />
+ -->
<osgi:reference id="javaScriptManagerDispatcherAdvisor"
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">
<property name="advice" ref="recordingAdvice" />
<property name="pattern" value=".*" />
</bean>
-
+ -->
<bean id="inchiManagerTarget"
class="net.bioclipse.inchi.business.InChIManager">
</bean>
-
+<!--
<osgi:service id="javaInchiManagerOSGI" ref="javaInchiManager"
interface="net.bioclipse.inchi.business.IJavaInChIManager" />
@@ -46,7 +48,7 @@
</list>
</property>
</bean>
-
+ -->
<osgi:service id="javaScriptInchiManagerOSGI" ref="javaScriptInchiManager"
interface="net.bioclipse.inchi.business.IJavaScriptInChIManager" />
@@ -57,9 +59,7 @@
value="net.bioclipse.inchi.business.IJavaScriptInChIManager" />
<property name="interceptorNames">
<list>
- <value>recordingAdvisor</value>
- <value>wrapInProxyAdvice</value>
- <value>javaScriptManagerDispatcherAdvisor</value>
+ <value>javaScriptManagerDispatcherAdvisor</value>
</list>
</property>
</bean>
@@ -60,7 +60,7 @@ public IInChIManager getJavaInChIManager() {
logger.log( Level.DEBUG, "Caught exception", e );
}
if(inchiManager == null) {
- throw new IllegalStateException("Could not get inchi manager");
+ throw new IllegalStateException("Could not get java inchi manager");
}
return inchiManager;
}
@@ -74,7 +74,7 @@ public IInChIManager getJavaScriptInChIManager() {
logger.log( Level.DEBUG, "Caught exception", e );
}
if(inchiManager == null) {
- throw new IllegalStateException("Could not get inchi manager");
+ throw new IllegalStateException("Could not get JS inchi manager");
}
return inchiManager;
}
@@ -26,7 +26,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">
@@ -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">
@@ -16,10 +16,10 @@
import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.api.Recorded;
import net.bioclipse.core.api.domain.IMolecule;
+import net.bioclipse.core.api.jobs.BioclipseJobUpdateHook;
import net.bioclipse.core.api.jobs.IBioclipseJob;
import net.bioclipse.core.api.managers.IBioclipseManager;
import net.bioclipse.core.api.managers.PublishedMethod;
-import net.bioclipse.jobs.BioclipseJobUpdateHook;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;

0 comments on commit 50838b3

Please sign in to comment.