git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceFetcher.java
diff --git
a/src/jalview/gui/SequenceFetcher.java
b/src/jalview/gui/SequenceFetcher.java
index
9052413
..
137655f
100755
(executable)
--- a/
src/jalview/gui/SequenceFetcher.java
+++ b/
src/jalview/gui/SequenceFetcher.java
@@
-44,6
+44,7
@@
import javax.swing.SwingConstants;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.Cache;
import jalview.api.FeatureSettingsModelI;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.DBRefEntry;
import jalview.datamodel.SequenceI;
@@
-185,6
+186,7
@@
public class SequenceFetcher extends JPanel implements Runnable
frame = new JInternalFrame();
frame.setContentPane(this);
frame = new JInternalFrame();
frame.setContentPane(this);
+ frame.setFrameIcon(null);
Desktop.addInternalFrame(frame, getFrameTitle(), true, 400,
Platform.isAMacAndNotJS() ? 240 : 180);
}
Desktop.addInternalFrame(frame, getFrameTitle(), true, 400,
Platform.isAMacAndNotJS() ? 240 : 180);
}
@@
-597,7
+599,7
@@
public class SequenceFetcher extends JPanel implements Runnable
+ ((StringPair) database.getSelectedItem()).getDisplay());
// error
// +="Couldn't retrieve sequences from "+database.getSelectedItem();
+ ((StringPair) database.getSelectedItem()).getDisplay());
// error
// +="Couldn't retrieve sequences from "+database.getSelectedItem();
- System.err.println("Retrieval failed for source ='"
+ jalview.bin.Console.errPrintln("Retrieval failed for source ='"
+ ((StringPair) database.getSelectedItem()).getDisplay()
+ "' and query\n'" + textArea.getText() + "'\n");
e.printStackTrace();
+ ((StringPair) database.getSelectedItem()).getDisplay()
+ "' and query\n'" + textArea.getText() + "'\n");
e.printStackTrace();
@@
-811,7
+813,7
@@
public class SequenceFetcher extends JPanel implements Runnable
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- Cache.info("Error retrieving " + accession + " from "
+ Console.info("Error retrieving " + accession + " from "
+ proxy.getDbName(), e);
}
return success;
+ proxy.getDbName(), e);
}
return success;