X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FDasSequenceFeatureFetcher.java;h=3db663d522f231764246518ee8f8de8326658157;hb=b4abe1ffdea4b7711cdc72c6c95af4356187302b;hp=8a7bcbc189f5f67d80596894ed0d1e8ab5051c6a;hpb=aced09c4feeaf3406269442c14e54abeeb4cad81;p=jalview.git diff --git a/src/jalview/ws/DasSequenceFeatureFetcher.java b/src/jalview/ws/DasSequenceFeatureFetcher.java index 8a7bcbc..3db663d 100644 --- a/src/jalview/ws/DasSequenceFeatureFetcher.java +++ b/src/jalview/ws/DasSequenceFeatureFetcher.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -496,13 +496,13 @@ public class DasSequenceFeatureFetcher } catch (Exception ex) { Cache.log - .info("Error in 'experimental' mapping of features. Please try to reproduce and then report info to jalview-discuss@jalview.org."); - Cache.log.info("Mapping feature from " + f.getBegin() + .warn("Error in 'experimental' mapping of features. Please try to reproduce and then report info to jalview-discuss@jalview.org."); + Cache.log.warn("Mapping feature from " + f.getBegin() + " to " + f.getEnd() + " in dbref " + dbref.getAccessionId() + " in " + dbref.getSource()); - Cache.log.info("using das Source " + source); - Cache.log.info("Exception", ex); + Cache.log.warn("using das Source " + source); + Cache.log.warn("Exception", ex); } if (vf != null) @@ -587,7 +587,7 @@ public class DasSequenceFeatureFetcher if (af != null && af.featureSettings != null) { - af.featureSettings.setTableData(); + af.featureSettings.discoverAllFeatureData(); } if (getFeatSettings() != null) @@ -626,7 +626,9 @@ public class DasSequenceFeatureFetcher Object[] nextSequence(jalviewSourceI dasSource, SequenceI seq) { if (cancelled) + { return null; + } DBRefEntry[] uprefs = jalview.util.DBRefUtils.selectRefs( seq.getDBRef(), new String[] { @@ -668,7 +670,9 @@ public class DasSequenceFeatureFetcher qstring.add(uprefs[j].getAccessionId()); } else + { System.out.println("IGNORE " + csys.getAuthority()); + } } } } @@ -839,7 +843,7 @@ public class DasSequenceFeatureFetcher { for (String note : feat.getNOTE()) { - desc += (String) note; + desc += note; } }