import jalview.schemes.TCoffeeColourScheme;
import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
-import jalview.util.dialogrunner.RunResponse;
+import jalview.util.Platform;
import jalview.viewmodel.AlignmentViewport;
import jalview.viewmodel.ViewportRanges;
import jalview.ws.DBRefFetcher;
*/
void init()
{
+// setBackground(Color.white); // BH 2019
+
if (!Jalview.isHeadlessMode())
{
progressBar = new ProgressBar(this.statusPanel, this.statusBar);
@Override
public void setStatus(String text)
{
- statusBar.setText(text);
+ // BH note: If text width and height are 0, then the layout manager
+ // will dispense of it and change the frame height.
+ // In JavaScript, we use \u00A0 -- unicode "non-breaking space"
+ // which is the unicode encoding of
+
+ statusBar.setText(text == null || text.isEmpty() ? " " : text);
}
/*
}
@Override
- public void fetchSequence_actionPerformed(ActionEvent e)
+ public void fetchSequence_actionPerformed()
{
- new jalview.gui.SequenceFetcher(this);
+ new SequenceFetcher(this);
}
@Override
}
AlignExportSettingsI options = new AlignExportSettingsAdapter(false);
- RunResponse cancelAction = new RunResponse(JvOptionPane.CANCEL_OPTION)
+ Runnable cancelAction = new Runnable()
{
@Override
public void run()
lastSaveSuccessful = false;
}
};
- RunResponse outputAction = new RunResponse(JvOptionPane.OK_OPTION)
+ Runnable outputAction = new Runnable()
{
@Override
public void run()
{
AlignExportOptions choices = new AlignExportOptions(
alignPanel.getAlignViewport(), format, options);
- choices.setResponseAction(outputAction);
- choices.setResponseAction(cancelAction);
+ choices.setResponseAction(0, outputAction);
+ choices.setResponseAction(1, cancelAction);
choices.showDialog();
}
else
FileFormatI fileFormat = FileFormats.getInstance()
.forName(fileFormatName);
AlignExportSettingsI options = new AlignExportSettingsAdapter(false);
- RunResponse outputAction = new RunResponse(JvOptionPane.OK_OPTION)
+ Runnable outputAction = new Runnable()
{
@Override
public void run()
{
AlignExportOptions choices = new AlignExportOptions(
alignPanel.getAlignViewport(), fileFormat, options);
- choices.setResponseAction(outputAction);
+ choices.setResponseAction(0, outputAction);
choices.showDialog();
}
else
MessageManager.getString("label.load_jalview_annotations"));
chooser.setToolTipText(
MessageManager.getString("label.load_jalview_annotations"));
- chooser.response(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+ chooser.setResponseHandler(0, new Runnable()
{
-
@Override
public void run()
{
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
loadJalviewDataFile(chooser.getSelectedFile(), null, null, null);
}
-
});
- chooser.openDialog(this);
+ chooser.showOpenDialog(this);
}
/**
{ contents.toString() });
contents = null;
- if (Jalview.isJS())
+ if (Platform.isJS())
{
JLabel textLabel = new JLabel();
textLabel.setText(content);
chooser.setToolTipText(
MessageManager.getString("label.load_tree_file"));
- chooser.response(new jalview.util.dialogrunner.RunResponse(
- JalviewFileChooser.APPROVE_OPTION)
+ chooser.setResponseHandler(0,new Runnable()
{
@Override
public void run()
JvOptionPane.WARNING_MESSAGE);
}
}
- }).openDialog(this);
+ });
+ chooser.showOpenDialog(this);
}
public TreePanel showNewickTree(NewickFile nf, String treeTitle)
});
rfetch.add(fetchr);
- final AlignFrame me = this;
new Thread(new Runnable()
{
@Override
public void run()
{
final jalview.ws.SequenceFetcher sf = jalview.gui.SequenceFetcher
- .getSequenceFetcherSingleton(me);
+ .getSequenceFetcherSingleton();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
@Override
public void run()
{
- String[] dbclasses = sf.getOrderedSupportedSources();
- // sf.getDbInstances(jalview.ws.dbsources.DasSequenceSource.class);
- // jalview.util.QuickSort.sort(otherdb, otherdb);
+ String[] dbclasses = sf.getNonAlignmentSources();
List<DbSourceProxy> otherdb;
JMenu dfetch = new JMenu();
JMenu ifetch = new JMenu();
{
continue;
}
- // List<DbSourceProxy> dbs=otherdb;
- // otherdb=new ArrayList<DbSourceProxy>();
- // for (DbSourceProxy db:dbs)
- // {
- // if (!db.isA(DBRefSource.ALIGNMENTDB)
- // }
if (mname == null)
{
mname = "From " + dbclass;
chooser.setDialogTitle(MessageManager.getString("label.load_vcf_file"));
chooser.setToolTipText(MessageManager.getString("label.load_vcf_file"));
final AlignFrame us = this;
- chooser.response(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+ chooser.setResponseHandler(0, new Runnable()
{
@Override
public void run()
{
-
- {
- String choice = chooser.getSelectedFile().getPath();
- Cache.setProperty("LAST_DIRECTORY", choice);
- SequenceI[] seqs = viewport.getAlignment().getSequencesArray();
- new VCFLoader(choice).loadVCF(seqs, us);
- }
-
+ String choice = chooser.getSelectedFile().getPath();
+ Cache.setProperty("LAST_DIRECTORY", choice);
+ SequenceI[] seqs = viewport.getAlignment().getSequencesArray();
+ new VCFLoader(choice).loadVCF(seqs, us);
};
- }).openDialog(null);
+ });
+ chooser.showOpenDialog(null);
}