Skip to content

Commit

Permalink
refarctoring for HEADLESS
Browse files Browse the repository at this point in the history
  • Loading branch information
jonalv committed Oct 26, 2010
1 parent 52a9162 commit 3d369d7
Show file tree
Hide file tree
Showing 38 changed files with 100 additions and 93 deletions.
Expand Up @@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui,
net.bioclipse.core.tests;bundle-version="0.1.0", net.bioclipse.core.tests;bundle-version="0.1.0",
net.bioclipse.biojava.business;bundle-version="0.1.0", net.bioclipse.biojava.business;bundle-version="0.1.0",
org.junit4;bundle-version="4.3.1", org.junit4;bundle-version="4.3.1",
net.bioclipse.align.kalign.ws;bundle-version="1.0.0" net.bioclipse.align.kalign.ws;bundle-version="1.0.0",
net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Expand Up @@ -18,9 +18,9 @@
import net.bioclipse.align.kalign.ws.Activator; import net.bioclipse.align.kalign.ws.Activator;
import net.bioclipse.align.kalign.ws.business.IKalignManager; import net.bioclipse.align.kalign.ws.business.IKalignManager;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;


import org.junit.Test; import org.junit.Test;


Expand Down
3 changes: 2 additions & 1 deletion plugins/net.bioclipse.align.kalign.ws/META-INF/MANIFEST.MF
Expand Up @@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
net.bioclipse.biojava, net.bioclipse.biojava,
net.bioclipse.biojava.ui, net.bioclipse.biojava.ui,
org.eclipse.core.resources, org.eclipse.core.resources,
net.bioclipse.ui.business;bundle-version="2.1.1" net.bioclipse.ui.business;bundle-version="2.1.1",
net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: ., Bundle-ClassPath: .,
Expand Down
Expand Up @@ -10,7 +10,7 @@
******************************************************************************/ ******************************************************************************/
package net.bioclipse.align.kalign.ws.business; package net.bioclipse.align.kalign.ws.business;


import net.bioclipse.managers.business.IBioclipseJSManager; import net.bioclipse.core.api.managers.IBioclipseJSManager;


/** /**
* *
Expand Down
Expand Up @@ -12,13 +12,13 @@


import java.util.List; import java.util.List;


import net.bioclipse.core.PublishedClass; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.PublishedMethod; import net.bioclipse.core.api.Recorded;
import net.bioclipse.core.Recorded; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.managers.IBioclipseManager;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.managers.PublishedClass;
import net.bioclipse.managers.business.IBioclipseManager; import net.bioclipse.core.api.managers.PublishedMethod;


@PublishedClass(value = "Controls access to KAlign Webservice at EBI.") @PublishedClass(value = "Controls access to KAlign Webservice at EBI.")
/** /**
Expand Down
Expand Up @@ -35,12 +35,12 @@
import net.bioclipse.align.kalign.ws.util.SequenceCollectionContentHandler; import net.bioclipse.align.kalign.ws.util.SequenceCollectionContentHandler;
import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.domain.RecordableList; import net.bioclipse.core.api.domain.RecordableList;
import net.bioclipse.managers.business.IBioclipseManager; import net.bioclipse.core.api.managers.IBioclipseManager;




/** /**
Expand Down
Expand Up @@ -17,9 +17,9 @@
import net.bioclipse.align.kalign.ws.Activator; import net.bioclipse.align.kalign.ws.Activator;
import net.bioclipse.align.kalign.ws.business.IKalignManager; import net.bioclipse.align.kalign.ws.business.IKalignManager;
import net.bioclipse.biojava.ui.editors.SequenceEditor; import net.bioclipse.biojava.ui.editors.SequenceEditor;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionEvent;
Expand Down
Expand Up @@ -17,9 +17,9 @@
import net.bioclipse.align.kalign.ws.Activator; import net.bioclipse.align.kalign.ws.Activator;
import net.bioclipse.align.kalign.ws.business.IKalignManager; import net.bioclipse.align.kalign.ws.business.IKalignManager;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.ui.business.IUIManager; import net.bioclipse.ui.business.IUIManager;


import org.apache.log4j.Logger; import org.apache.log4j.Logger;
Expand Down
Expand Up @@ -14,7 +14,7 @@


import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


import org.biojava.bio.seq.DNATools; import org.biojava.bio.seq.DNATools;
import org.biojava.bio.seq.ProteinTools; import org.biojava.bio.seq.ProteinTools;
Expand Down
Expand Up @@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.core.runtime,
net.bioclipse.biojava.business, net.bioclipse.biojava.business,
net.bioclipse.core, net.bioclipse.core,
net.bioclipse.biojava, net.bioclipse.biojava,
net.bioclipse.scripting net.bioclipse.scripting,
net.bioclipse.core.api;bundle-version="1.0.0"
Eclipse-LazyStart: true Eclipse-LazyStart: true
Bundle-ClassPath: . Bundle-ClassPath: .
Export-Package: net.bioclipse.biojava.business, Export-Package: net.bioclipse.biojava.business,
Expand Down
Expand Up @@ -15,9 +15,9 @@
import net.bioclipse.biojava.domain.BiojavaDNA; import net.bioclipse.biojava.domain.BiojavaDNA;
import net.bioclipse.biojava.domain.BiojavaProtein; import net.bioclipse.biojava.domain.BiojavaProtein;
import net.bioclipse.biojava.domain.BiojavaRNA; import net.bioclipse.biojava.domain.BiojavaRNA;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.IRNA; import net.bioclipse.core.api.domain.IRNA;


import org.junit.Test; import org.junit.Test;


Expand Down
3 changes: 2 additions & 1 deletion plugins/net.bioclipse.biojava.business/META-INF/MANIFEST.MF
Expand Up @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources, org.eclipse.core.resources,
org.springframework.bundle.spring.aop, org.springframework.bundle.spring.aop,
net.sf.cglib, net.sf.cglib,
org.springframework.osgi.aopalliance.osgi;bundle-version="1.0.0" org.springframework.osgi.aopalliance.osgi;bundle-version="1.0.0",
net.bioclipse.core.api;bundle-version="1.0.0"
Export-Package: net.bioclipse.biojava.business, Export-Package: net.bioclipse.biojava.business,
net.bioclipse.biojava.domain net.bioclipse.biojava.domain
Bundle-Vendor: The Bioclipse Team Bundle-Vendor: The Bioclipse Team
Expand Down
Expand Up @@ -42,13 +42,13 @@
import net.bioclipse.biojava.domain.BiojavaProtein; import net.bioclipse.biojava.domain.BiojavaProtein;
import net.bioclipse.biojava.domain.BiojavaRNA; import net.bioclipse.biojava.domain.BiojavaRNA;
import net.bioclipse.biojava.domain.IFeature; import net.bioclipse.biojava.domain.IFeature;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.IRNA; import net.bioclipse.core.api.domain.IRNA;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.domain.RecordableList; import net.bioclipse.core.api.domain.RecordableList;
import net.bioclipse.managers.business.IBioclipseManager; import net.bioclipse.core.api.managers.IBioclipseManager;


import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.biojava.bio.BioException; import org.biojava.bio.BioException;
Expand Down
Expand Up @@ -21,15 +21,15 @@
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;


import net.bioclipse.biojava.domain.IFeature; import net.bioclipse.biojava.domain.IFeature;
import net.bioclipse.core.PublishedClass; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.PublishedMethod; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.domain.IProtein;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IRNA;
import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.domain.IRNA; import net.bioclipse.core.api.domain.RecordableList;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.managers.IBioclipseManager;
import net.bioclipse.core.domain.RecordableList; import net.bioclipse.core.api.managers.PublishedClass;
import net.bioclipse.managers.business.IBioclipseManager; import net.bioclipse.core.api.managers.PublishedMethod;


/** /**
* @author jonalv, ola * @author jonalv, ola
Expand Down
Expand Up @@ -10,7 +10,7 @@
******************************************************************************/ ******************************************************************************/
package net.bioclipse.biojava.business; package net.bioclipse.biojava.business;


import net.bioclipse.managers.business.IBioclipseJSManager; import net.bioclipse.core.api.managers.IBioclipseJSManager;


public interface IJavaScriptBiojavaManager public interface IJavaScriptBiojavaManager
extends IBiojavaManager, IBioclipseJSManager { extends IBiojavaManager, IBioclipseJSManager {
Expand Down
Expand Up @@ -14,7 +14,7 @@


import org.biojava.bio.seq.Sequence; import org.biojava.bio.seq.Sequence;


import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;


public class BiojavaDNA extends BiojavaSequence public class BiojavaDNA extends BiojavaSequence
implements IDNA { implements IDNA {
Expand Down
Expand Up @@ -12,7 +12,7 @@
******************************************************************************/ ******************************************************************************/
package net.bioclipse.biojava.domain; package net.bioclipse.biojava.domain;


import net.bioclipse.core.domain.IProtein; import net.bioclipse.core.api.domain.IProtein;


import org.biojava.bio.seq.Sequence; import org.biojava.bio.seq.Sequence;


Expand Down
Expand Up @@ -14,7 +14,7 @@


import org.biojava.bio.seq.Sequence; import org.biojava.bio.seq.Sequence;


import net.bioclipse.core.domain.IRNA; import net.bioclipse.core.api.domain.IRNA;


public class BiojavaRNA extends BiojavaSequence public class BiojavaRNA extends BiojavaSequence
implements IRNA { implements IRNA {
Expand Down
Expand Up @@ -15,9 +15,9 @@
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;


import net.bioclipse.core.Recorded; import net.bioclipse.core.api.Recorded;
import net.bioclipse.core.domain.BioObject; import net.bioclipse.core.api.domain.BioObject;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


import org.biojava.bio.seq.Sequence; import org.biojava.bio.seq.Sequence;
import org.biojavax.Namespace; import org.biojavax.Namespace;
Expand Down
3 changes: 2 additions & 1 deletion plugins/net.bioclipse.biojava.ui/META-INF/MANIFEST.MF
Expand Up @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.forms, org.eclipse.ui.forms,
org.eclipse.ui.ide, org.eclipse.ui.ide,
org.eclipse.ui.views;bundle-version="3.3.0", org.eclipse.ui.views;bundle-version="3.3.0",
net.bioclipse.ui.business;bundle-version="2.0.0" net.bioclipse.ui.business;bundle-version="2.0.0",
net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Export-Package: net.bioclipse.biojava.ui, Export-Package: net.bioclipse.biojava.ui,
net.bioclipse.biojava.ui.actions, net.bioclipse.biojava.ui.actions,
Expand Down
4 changes: 2 additions & 2 deletions plugins/net.bioclipse.biojava.ui/plugin.xml
Expand Up @@ -30,12 +30,12 @@
<BioObject <BioObject
describer="net.bioclipse.biojava.ui.describer.SequenceEditorDescriber" describer="net.bioclipse.biojava.ui.describer.SequenceEditorDescriber"
id="net.bioclipse.cdk.sequenceditor.describer" id="net.bioclipse.cdk.sequenceditor.describer"
objectClass="net.bioclipse.core.domain.RecordableList"> objectClass="net.bioclipse.core.api.domain.RecordableList">
</BioObject> </BioObject>
<BioObject <BioObject
describer="net.bioclipse.biojava.ui.describer.SequenceEditorDescriber" describer="net.bioclipse.biojava.ui.describer.SequenceEditorDescriber"
id="net.bioclipse.cdk.sequenceditor.describer" id="net.bioclipse.cdk.sequenceditor.describer"
objectClass="net.bioclipse.core.domain.ISequence"> objectClass="net.bioclipse.core.api.domain.ISequence">
</BioObject> </BioObject>
</extension> </extension>


Expand Down
Expand Up @@ -15,7 +15,7 @@


import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
Expand Down
Expand Up @@ -14,8 +14,8 @@
import java.io.IOException; import java.io.IOException;


import net.bioclipse.biojava.domain.BiojavaDNA; import net.bioclipse.biojava.domain.BiojavaDNA;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


public class TranslateDNAToProteinAction extends TranslateAction{ public class TranslateDNAToProteinAction extends TranslateAction{


Expand Down
Expand Up @@ -14,8 +14,8 @@
import java.io.IOException; import java.io.IOException;


import net.bioclipse.biojava.domain.BiojavaDNA; import net.bioclipse.biojava.domain.BiojavaDNA;
import net.bioclipse.core.domain.IDNA; import net.bioclipse.core.api.domain.IDNA;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


public class TranslateDNAToRNAAction extends TranslateAction{ public class TranslateDNAToRNAAction extends TranslateAction{


Expand Down
Expand Up @@ -15,7 +15,7 @@


import org.apache.log4j.Logger; import org.apache.log4j.Logger;


import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;




/** /**
Expand Down
Expand Up @@ -15,7 +15,7 @@


import org.apache.log4j.Logger; import org.apache.log4j.Logger;


import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;




/** /**
Expand Down
@@ -1,10 +1,10 @@
package net.bioclipse.biojava.ui.describer; package net.bioclipse.biojava.ui.describer;


import net.bioclipse.biojava.ui.editors.SequenceEditor; import net.bioclipse.biojava.ui.editors.SequenceEditor;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.IBioObject; import net.bioclipse.core.api.domain.IBioObject;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.domain.RecordableList; import net.bioclipse.core.api.domain.RecordableList;
import net.bioclipse.ui.business.describer.IBioObjectDescriber; import net.bioclipse.ui.business.describer.IBioObjectDescriber;




Expand Down
Expand Up @@ -19,7 +19,7 @@


import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.ui.editors.ColorManager; import net.bioclipse.ui.editors.ColorManager;


import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
Expand Down
Expand Up @@ -14,8 +14,8 @@
import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.biojava.ui.views.outline.SequenceOutlinePage; import net.bioclipse.biojava.ui.views.outline.SequenceOutlinePage;
import net.bioclipse.core.business.BioclipseException; import net.bioclipse.core.api.BioclipseException;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.util.LogUtils; import net.bioclipse.core.util.LogUtils;


import org.apache.log4j.Logger; import org.apache.log4j.Logger;
Expand Down
Expand Up @@ -28,8 +28,8 @@


import net.bioclipse.biojava.business.Activator; import net.bioclipse.biojava.business.Activator;
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.core.domain.IBioObject; import net.bioclipse.core.api.domain.IBioObject;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.util.LogUtils; import net.bioclipse.core.util.LogUtils;


import org.apache.log4j.Logger; import org.apache.log4j.Logger;
Expand Down
Expand Up @@ -24,8 +24,8 @@
import java.util.List; import java.util.List;


import net.bioclipse.biojava.ui.Activator; import net.bioclipse.biojava.ui.Activator;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;
import net.bioclipse.core.domain.RecordableList; import net.bioclipse.core.api.domain.RecordableList;


import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
Expand Down
Expand Up @@ -11,7 +11,7 @@
import net.bioclipse.biojava.business.IBiojavaManager; import net.bioclipse.biojava.business.IBiojavaManager;
import net.bioclipse.biojava.ui.editors.Aligner; import net.bioclipse.biojava.ui.editors.Aligner;
import net.bioclipse.biojava.ui.editors.SequenceEditor; import net.bioclipse.biojava.ui.editors.SequenceEditor;
import net.bioclipse.core.domain.ISequence; import net.bioclipse.core.api.domain.ISequence;


import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
Expand Down
3 changes: 2 additions & 1 deletion plugins/net.bioclipse.biows.tests/META-INF/MANIFEST.MF
Expand Up @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
net.bioclipse.core.tests;bundle-version="0.1.0", net.bioclipse.core.tests;bundle-version="0.1.0",
net.bioclipse.biojava.business;bundle-version="0.1.0", net.bioclipse.biojava.business;bundle-version="0.1.0",
net.bioclipse.biows;bundle-version="0.1.1", net.bioclipse.biows;bundle-version="0.1.1",
org.junit4;bundle-version="4.3.1" org.junit4;bundle-version="4.3.1",
net.bioclipse.core.api;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j Import-Package: org.apache.log4j

0 comments on commit 3d369d7

Please sign in to comment.