X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fws%2Fseqdb%2FSequenceDbWsTools.java;h=a54a3b92bf727975379f04c6df65b3995c3a6303;hb=0c6757717df4ae39a92fcea587461481dc2cde1d;hp=c2d2bd5994253f50ea51a51c5a5715fe2cdf525d;hpb=4dfa0f32da64aead4d4269247ac52f01b2df6af0;p=jalview.git

diff --git a/forester/java/src/org/forester/ws/seqdb/SequenceDbWsTools.java b/forester/java/src/org/forester/ws/seqdb/SequenceDbWsTools.java
index c2d2bd5..a54a3b9 100644
--- a/forester/java/src/org/forester/ws/seqdb/SequenceDbWsTools.java
+++ b/forester/java/src/org/forester/ws/seqdb/SequenceDbWsTools.java
@@ -62,14 +62,14 @@ public final class SequenceDbWsTools {
     public final static String   EMBL_GENBANK               = "http://www.ebi.ac.uk/Tools/dbfetch/dbfetch?db=GENBANK&style=raw&id=";
     public final static String   EMBL_REFSEQ                = "http://www.ebi.ac.uk/Tools/dbfetch/dbfetch?db=REFSEQ&style=raw&id=";
     public final static String   EMBL_EMBL                  = "http://www.ebi.ac.uk/Tools/dbfetch/dbfetch?db=EMBL&style=raw&id=";
-    private final static boolean DEBUG                      = true;
+    private final static boolean DEBUG                      = false;
     private final static String  URL_ENC                    = "UTF-8";
     private final static int     SLEEP                      = 200;
     private static final boolean ALLOW_TO_OVERWRITE_MOL_SEQ = false;
 
     public static List<UniProtTaxonomy> getTaxonomiesFromCommonNameStrict( final String cn,
                                                                            final int max_taxonomies_return )
-                                                                                   throws IOException {
+            throws IOException {
         final List<UniProtTaxonomy> taxonomies = getTaxonomiesFromCommonName( cn, max_taxonomies_return );
         if ( ( taxonomies != null ) && ( taxonomies.size() > 0 ) ) {
             final List<UniProtTaxonomy> filtered_taxonomies = new ArrayList<UniProtTaxonomy>();
@@ -100,7 +100,7 @@ public final class SequenceDbWsTools {
      */
     public static List<UniProtTaxonomy> getTaxonomiesFromScientificNameStrict( final String sn,
                                                                                final int max_taxonomies_return )
-                                                                                       throws IOException {
+            throws IOException {
         final List<UniProtTaxonomy> taxonomies = getTaxonomiesFromScientificName( sn, max_taxonomies_return );
         if ( ( taxonomies != null ) && ( taxonomies.size() > 0 ) ) {
             final List<UniProtTaxonomy> filtered_taxonomies = new ArrayList<UniProtTaxonomy>();
@@ -116,7 +116,7 @@ public final class SequenceDbWsTools {
 
     public static List<UniProtTaxonomy> getTaxonomiesFromTaxonomyCode( final String code,
                                                                        final int max_taxonomies_return )
-                                                                               throws IOException {
+            throws IOException {
         final String my_code = new String( code );
         final List<String> result = getTaxonomyStringFromTaxonomyCode( my_code, max_taxonomies_return );
         if ( result.size() > 0 ) {
@@ -132,7 +132,7 @@ public final class SequenceDbWsTools {
     public static SequenceDatabaseEntry obtainEmblEntry( final Accession acc, final int max_lines_to_return )
             throws IOException {
         final List<String> lines = queryEmblDb( acc, max_lines_to_return );
-        return EbiDbEntry.createInstanceFromPlainTextForRefSeq( lines );
+        return EbiDbEntry.createInstance( lines );
     }
 
     public static SequenceDatabaseEntry obtainEntry( final String acc_str ) throws IOException {
@@ -142,7 +142,7 @@ public final class SequenceDbWsTools {
         final Accession acc = SequenceAccessionTools.parseAccessorFromString( acc_str );
         if ( acc == null ) {
             throw new IllegalArgumentException( "could not extract acceptable sequence db accessor from \"" + acc_str
-                                                + "\"" );
+                    + "\"" );
         }
         if ( acc.getSource().equals( Source.REFSEQ.toString() ) || acc.getSource().equals( Source.EMBL.toString() )
                 || acc.getSource().equals( Source.NCBI.toString() ) ) {
@@ -153,7 +153,7 @@ public final class SequenceDbWsTools {
         }
         else {
             throw new IllegalArgumentException( "don't know how to handle request for source \"" + acc.getSource()
-                                                + "\"" );
+                    + "\"" );
         }
     }
 
@@ -164,7 +164,7 @@ public final class SequenceDbWsTools {
     public static SequenceDatabaseEntry obtainRefSeqEntryFromEmbl( final Accession acc, final int max_lines_to_return )
             throws IOException {
         final List<String> lines = queryEmblDbForRefSeqEntry( acc, max_lines_to_return );
-        return EbiDbEntry.createInstanceFromPlainTextForRefSeq( lines );
+        return EbiDbEntry.createInstance( lines );
     }
 
     public final static Accession obtainSeqAccession( final PhylogenyNode node ) {
@@ -221,7 +221,7 @@ public final class SequenceDbWsTools {
     public static SequenceDatabaseEntry obtainUniProtEntry( final String query, final int max_lines_to_return )
             throws IOException {
         final List<String> lines = queryUniprot( "uniprot/" + query + ".txt", max_lines_to_return );
-        return UniProtEntry.createInstanceFromPlainText( lines );
+        return UniProtEntry.createInstance( lines );
     }
 
     public static List<String> queryDb( final String query, int max_lines_to_return, final String base_url )
@@ -263,7 +263,9 @@ public final class SequenceDbWsTools {
     public static List<String> queryEmblDb( final Accession acc, final int max_lines_to_return ) throws IOException {
         final StringBuilder url_sb = new StringBuilder();
         //  url_sb.append( BASE_EMBL_DB_URL );
-        System.out.println( "source: " + acc.getSource() );
+        if ( DEBUG ) {
+            System.out.println( "source: " + acc.getSource() );
+        }
         if ( acc.getSource().equals( Source.NCBI.toString() ) ) {
             url_sb.append( EMBL_GENBANK );
             //url_sb.append( '/' );
@@ -454,7 +456,7 @@ public final class SequenceDbWsTools {
 
     private static List<UniProtTaxonomy> getTaxonomiesFromScientificName( final String sn,
                                                                           final int max_taxonomies_return )
-                                                                                  throws IOException {
+            throws IOException {
         final List<String> result = getTaxonomyStringFromScientificName( sn, max_taxonomies_return );
         if ( result.size() > 0 ) {
             return parseUniProtTaxonomy( result );
@@ -486,7 +488,7 @@ public final class SequenceDbWsTools {
         return ( !( ( acc == null ) || ForesterUtil.isEmpty( acc.getSource() ) || ForesterUtil.isEmpty( acc.getValue() ) || ( ( acc
                 .getSource().equals( Source.UNIPROT.toString() ) )
                 && ( acc.getSource().toString().equals( Source.EMBL.toString() ) ) && ( acc.getSource().toString()
-                        .equals( Source.REFSEQ.toString() ) ) ) ) );
+                .equals( Source.REFSEQ.toString() ) ) ) ) );
     }
 
     private static List<UniProtTaxonomy> parseUniProtTaxonomy( final List<String> result ) throws IOException {