Permalink
Browse files

refarctoring for HEADLESS

  • Loading branch information...
jonalv committed Oct 26, 2010
1 parent 89d70c7 commit 073014078d7efd17ac48c208a5303a7967cdadd6
Showing with 35 additions and 33 deletions.
  1. +2 −1 net.bioclipse.vscreen.tests/META-INF/MANIFEST.MF
  2. +2 −2 net.bioclipse.vscreen.tests/src/net/bioclipse/vscreen/tests/APITest.java
  3. +1 −1 net.bioclipse.vscreen.tests/src/net/bioclipse/vscreen/tests/AbstractVScreenManagerPluginTest.java
  4. +2 −2 net.bioclipse.vscreen.tests/src/net/bioclipse/vscreen/tests/CoverageTest.java
  5. +2 −1 net.bioclipse.vscreen/META-INF/MANIFEST.MF
  6. +1 −1 net.bioclipse.vscreen/src/net/bioclipse/vscreen/business/IJavaScriptVScreenManager.java
  7. +5 −5 net.bioclipse.vscreen/src/net/bioclipse/vscreen/business/IVScreenManager.java
  8. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/business/VScreenManager.java
  9. +1 −1 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/AbstractDoubleFilter.java
  10. +1 −1 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/AbstractParamFilter.java
  11. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/IScreeningFilter.java
  12. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/MWFilter.java
  13. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/RestrictElementFilter.java
  14. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/RingCountFilter.java
  15. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/RuleOfFiveFilter.java
  16. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/SMARTSFilter.java
  17. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/TPSAFilter.java
  18. +2 −2 net.bioclipse.vscreen/src/net/bioclipse/vscreen/filters/impl/XlogPFilter.java
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.junit4,
net.bioclipse.vscreen,
net.bioclipse.structuredb;bundle-version="2.1.0",
- net.bioclipse.cdk.business;bundle-version="2.1.0"
+ net.bioclipse.cdk.business;bundle-version="2.1.0",
+ net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.apache.log4j
Bundle-ActivationPolicy: lazy
@@ -10,8 +10,8 @@
******************************************************************************/
package net.bioclipse.vscreen.tests;
- import net.bioclipse.core.tests.AbstractManagerTest;
-import net.bioclipse.managers.business.IBioclipseManager;
+ import net.bioclipse.core.api.managers.IBioclipseManager;
+import net.bioclipse.core.tests.AbstractManagerTest;
import net.bioclipse.vscreen.business.IVScreenManager;
import net.bioclipse.vscreen.business.VScreenManager;
@@ -21,7 +21,7 @@
import junit.framework.TestFailure;
-import net.bioclipse.core.business.BioclipseException;
+import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.util.FileUtil;
import net.bioclipse.structuredb.Activator;
import net.bioclipse.structuredb.business.IJavaStructuredbManager;
@@ -10,8 +10,8 @@
******************************************************************************/
package net.bioclipse.vscreen.tests;
- import net.bioclipse.core.tests.coverage.AbstractCoverageTest;
-import net.bioclipse.managers.business.IBioclipseManager;
+ import net.bioclipse.core.api.managers.IBioclipseManager;
+import net.bioclipse.core.tests.coverage.AbstractCoverageTest;
import net.bioclipse.vscreen.business.IVScreenManager;
import net.bioclipse.vscreen.business.VScreenManager;
@@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.ui,
org.openscience.cdk.interfaces,
org.openscience.cdk.smarts,
org.eclipse.ui.ide,
- net.bioclipse.scripting.ui;bundle-version="2.2.0"
+ net.bioclipse.scripting.ui;bundle-version="2.2.0",
+ net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.apache.commons.logging,
org.apache.log4j
@@ -10,7 +10,7 @@
******************************************************************************/
package net.bioclipse.vscreen.business;
-import net.bioclipse.managers.business.IBioclipseJSManager;
+import net.bioclipse.core.api.managers.IBioclipseJSManager;
public interface IJavaScriptVScreenManager
extends IVScreenManager, IBioclipseJSManager {
@@ -16,12 +16,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import net.bioclipse.core.PublishedClass;
-import net.bioclipse.core.PublishedMethod;
-import net.bioclipse.core.Recorded;
-import net.bioclipse.core.business.BioclipseException;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.Recorded;
+import net.bioclipse.core.api.managers.IBioclipseManager;
+import net.bioclipse.core.api.managers.PublishedClass;
+import net.bioclipse.core.api.managers.PublishedMethod;
import net.bioclipse.managers.business.GuiAction;
-import net.bioclipse.managers.business.IBioclipseManager;
import net.bioclipse.vscreen.filters.IScreeningFilter;
/**
@@ -19,12 +19,12 @@
import java.util.Iterator;
import java.util.List;
-import net.bioclipse.core.business.BioclipseException;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.managers.IBioclipseManager;
import net.bioclipse.core.util.LogUtils;
import net.bioclipse.core.util.StringInput;
import net.bioclipse.core.util.StringStorage;
import net.bioclipse.core.util.TimeCalculator;
-import net.bioclipse.managers.business.IBioclipseManager;
import net.bioclipse.scripting.ui.business.IJsConsoleManager;
import net.bioclipse.structuredb.Activator;
import net.bioclipse.structuredb.business.IJavaStructuredbManager;
@@ -10,7 +10,7 @@
******************************************************************************/
package net.bioclipse.vscreen.filters;
-import net.bioclipse.core.business.BioclipseException;
+import net.bioclipse.core.api.BioclipseException;
/**
@@ -15,7 +15,7 @@
import org.apache.log4j.Logger;
-import net.bioclipse.core.business.BioclipseException;
+import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.util.LogUtils;
import net.bioclipse.vscreen.Activator;
@@ -12,8 +12,8 @@
import org.eclipse.swt.graphics.Image;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
/**
* An IScreeningFilter is used to filter out molecules in VScreen.
@@ -13,8 +13,8 @@
import org.apache.log4j.Logger;
import net.bioclipse.cdk.business.ICDKManager;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractDoubleFilter;
import net.bioclipse.vscreen.filters.IDoubleFilter;
@@ -12,8 +12,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractParamFilter;
import net.bioclipse.vscreen.filters.IParamFilter;
@@ -12,8 +12,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractDoubleFilter;
import net.bioclipse.vscreen.filters.IDoubleFilter;
@@ -12,8 +12,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractDoubleFilter;
import net.bioclipse.vscreen.filters.IDoubleFilter;
@@ -14,8 +14,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractParamFilter;
import net.bioclipse.vscreen.filters.IParamFilter;
@@ -12,8 +12,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractDoubleFilter;
import net.bioclipse.vscreen.filters.IDoubleFilter;
@@ -12,8 +12,8 @@
import net.bioclipse.cdk.business.ICDKManager;
import net.bioclipse.cdk.domain.ICDKMolecule;
-import net.bioclipse.core.business.BioclipseException;
-import net.bioclipse.core.domain.IMolecule;
+import net.bioclipse.core.api.BioclipseException;
+import net.bioclipse.core.api.domain.IMolecule;
import net.bioclipse.vscreen.filters.AbstractDoubleFilter;
import net.bioclipse.vscreen.filters.IDoubleFilter;

0 comments on commit 0730140

Please sign in to comment.