import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.ComplexAlignFile;
+import jalview.api.FeaturesDisplayedI;
+import jalview.bin.Jalview;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SequenceI;
+import jalview.io.AppletFormatAdapter;
import jalview.io.FileParse;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
this.alignpanel = viewpanel;
if (alignpanel != null)
{
-
+ this.viewport = alignpanel.getAlignViewport();
}
- this.viewport = alignpanel.getAlignViewport();
if (viewport != null)
{
ok.setText(MessageManager.getString("action.add"));
*/
public void ok_actionPerformed(ActionEvent e)
{
- String format = new IdentifyFile().Identify(getText(), "Paste");
+ String text = getText();
+ if (text.trim().length() < 1)
+ {
+ return;
+ }
+
+ String format = new IdentifyFile().Identify(text, "Paste");
+ if (format == null || format.equalsIgnoreCase("EMPTY DATA FILE"))
+ {
+ System.err.println(MessageManager
+ .getString("label.couldnt_read_data"));
+ if (!Jalview.isHeadlessMode())
+ {
+ javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ AppletFormatAdapter.SUPPORTED_FORMATS,
+ MessageManager.getString("label.couldnt_read_data"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+ return;
+ }
+
// TODO: identify feature, annotation or tree file and parse appropriately.
AlignmentI al = null;
}
}
- if (al != null)
+ if (al != null && al.hasValidSequence())
{
String title = MessageManager.formatMessage(
"label.input_cut_paste_params", new String[]
boolean showSeqFeatures = ((ComplexAlignFile) source)
.isShowSeqFeatures();
ColourSchemeI cs = ((ComplexAlignFile) source).getColourScheme();
+ FeaturesDisplayedI fd = ((ComplexAlignFile) source)
+ .getDisplayedFeatures();
af = new AlignFrame(al, hiddenSeqs, colSel,
AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
-
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
+ af.getViewport().setFeaturesDisplayed(fd);
af.changeColour(cs);
}
else
}
}
}
+ else
+ {
+ System.err.println(MessageManager
+ .getString("label.couldnt_read_data"));
+ if (!Jalview.isHeadlessMode())
+ {
+ javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ AppletFormatAdapter.SUPPORTED_FORMATS,
+ MessageManager.getString("label.couldnt_read_data"),
+ JOptionPane.WARNING_MESSAGE);
+ }
+ }
}