From 50838b3f296de1e668e4e15c0516c12ce993fd6e Mon Sep 17 00:00:00 2001 From: jonalv Date: Mon, 17 Jan 2011 17:09:49 +0100 Subject: [PATCH] Refactoring of dispatcher code into ui / non ui --- .../META-INF/spring/context.xml | 2 +- .../META-INF/spring/context-jcp.xml | 2 +- .../META-INF/spring/context-jcpglobal.xml | 2 +- .../ui/sdfeditor/tests/MolTablePluginTest.java | 2 +- .../META-INF/spring/content.xml | 2 +- .../business/IMoleculeTableManager.java | 2 +- .../cdk/ui/sdfeditor/editor/MoleculesEditor.java | 2 +- .../META-INF/spring/context.xml | 2 +- .../META-INF/spring/context-osgi.xml | 2 +- .../META-INF/spring/context.xml | 16 ++++++++-------- .../net/bioclipse/inchi/business/Activator.java | 4 ++-- .../META-INF/spring/context.xml | 2 +- .../META-INF/spring/context-osgi.xml | 2 +- .../pubchem/business/IPubChemManager.java | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugins/net.bioclipse.cdk.debug/META-INF/spring/context.xml b/plugins/net.bioclipse.cdk.debug/META-INF/spring/context.xml index 7c39223cc..52294cfc2 100644 --- a/plugins/net.bioclipse.cdk.debug/META-INF/spring/context.xml +++ b/plugins/net.bioclipse.cdk.debug/META-INF/spring/context.xml @@ -17,7 +17,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcp.xml b/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcp.xml index fb9f0be07..b0dab570c 100644 --- a/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcp.xml +++ b/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcp.xml @@ -23,7 +23,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcpglobal.xml b/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcpglobal.xml index 80ccf163d..8b1886aac 100644 --- a/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcpglobal.xml +++ b/plugins/net.bioclipse.cdk.jchempaint/META-INF/spring/context-jcpglobal.xml @@ -23,7 +23,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.cdk.ui.sdfeditor.tests/src/net/bioclipse/cdk/ui/sdfeditor/tests/MolTablePluginTest.java b/plugins/net.bioclipse.cdk.ui.sdfeditor.tests/src/net/bioclipse/cdk/ui/sdfeditor/tests/MolTablePluginTest.java index 33eddcfdb..f30b57c00 100644 --- a/plugins/net.bioclipse.cdk.ui.sdfeditor.tests/src/net/bioclipse/cdk/ui/sdfeditor/tests/MolTablePluginTest.java +++ b/plugins/net.bioclipse.cdk.ui.sdfeditor.tests/src/net/bioclipse/cdk/ui/sdfeditor/tests/MolTablePluginTest.java @@ -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; diff --git a/plugins/net.bioclipse.cdk.ui.sdfeditor/META-INF/spring/content.xml b/plugins/net.bioclipse.cdk.ui.sdfeditor/META-INF/spring/content.xml index df71a8b2b..b406ba19b 100644 --- a/plugins/net.bioclipse.cdk.ui.sdfeditor/META-INF/spring/content.xml +++ b/plugins/net.bioclipse.cdk.ui.sdfeditor/META-INF/spring/content.xml @@ -15,7 +15,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/IMoleculeTableManager.java b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/IMoleculeTableManager.java index 501752c4c..23c79ed4b 100644 --- a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/IMoleculeTableManager.java +++ b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/business/IMoleculeTableManager.java @@ -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; diff --git a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java index 4a83e0047..edb6c19d0 100644 --- a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java +++ b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MoleculesEditor.java @@ -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; diff --git a/plugins/net.bioclipse.chemspider/META-INF/spring/context.xml b/plugins/net.bioclipse.chemspider/META-INF/spring/context.xml index 2420bea1b..e85226847 100644 --- a/plugins/net.bioclipse.chemspider/META-INF/spring/context.xml +++ b/plugins/net.bioclipse.chemspider/META-INF/spring/context.xml @@ -24,7 +24,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.cml/META-INF/spring/context-osgi.xml b/plugins/net.bioclipse.cml/META-INF/spring/context-osgi.xml index 17855f65b..14d5f7d5a 100644 --- a/plugins/net.bioclipse.cml/META-INF/spring/context-osgi.xml +++ b/plugins/net.bioclipse.cml/META-INF/spring/context-osgi.xml @@ -23,7 +23,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.inchi/META-INF/spring/context.xml b/plugins/net.bioclipse.inchi/META-INF/spring/context.xml index d702e209c..fd9692dbe 100644 --- a/plugins/net.bioclipse.inchi/META-INF/spring/context.xml +++ b/plugins/net.bioclipse.inchi/META-INF/spring/context.xml @@ -8,28 +8,30 @@ http://www.springframework.org/schema/osgi/spring-osgi.xsd"> + - + - + @@ -57,9 +59,7 @@ value="net.bioclipse.inchi.business.IJavaScriptInChIManager" /> - recordingAdvisor - wrapInProxyAdvice - javaScriptManagerDispatcherAdvisor + javaScriptManagerDispatcherAdvisor diff --git a/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/Activator.java b/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/Activator.java index a106cdcd3..4bf29d78a 100644 --- a/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/Activator.java +++ b/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/Activator.java @@ -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; } diff --git a/plugins/net.bioclipse.jmol/META-INF/spring/context.xml b/plugins/net.bioclipse.jmol/META-INF/spring/context.xml index e9d59e159..46b8c4faa 100644 --- a/plugins/net.bioclipse.jmol/META-INF/spring/context.xml +++ b/plugins/net.bioclipse.jmol/META-INF/spring/context.xml @@ -26,7 +26,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor"/> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.pubchem/META-INF/spring/context-osgi.xml b/plugins/net.bioclipse.pubchem/META-INF/spring/context-osgi.xml index b9ee10d78..fd96382ce 100644 --- a/plugins/net.bioclipse.pubchem/META-INF/spring/context-osgi.xml +++ b/plugins/net.bioclipse.pubchem/META-INF/spring/context-osgi.xml @@ -20,7 +20,7 @@ interface="net.bioclipse.core.api.managers.IJavaScriptManagerDispatcherAdvisor" /> + interface="net.bioclipse.core.api.recording.IWrapInProxyAdvice" /> diff --git a/plugins/net.bioclipse.pubchem/src/net/bioclipse/pubchem/business/IPubChemManager.java b/plugins/net.bioclipse.pubchem/src/net/bioclipse/pubchem/business/IPubChemManager.java index 6bd976b9f..1b00a7482 100644 --- a/plugins/net.bioclipse.pubchem/src/net/bioclipse/pubchem/business/IPubChemManager.java +++ b/plugins/net.bioclipse.pubchem/src/net/bioclipse/pubchem/business/IPubChemManager.java @@ -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;