*/
package jalview.gui;
+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;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GCutAndPasteTransfer;
+import jalview.schemes.ColourSchemeI;
+import jalview.util.MessageManager;
+
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;
-import jalview.api.ComplexAlignFile;
-import jalview.datamodel.Alignment;
-import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.SequenceI;
-import jalview.io.FileParse;
-import jalview.io.FormatAdapter;
-import jalview.io.IdentifyFile;
-import jalview.io.JalviewFileChooser;
-import jalview.io.JalviewFileView;
-import jalview.jbgui.GCutAndPasteTransfer;
-import jalview.schemes.ColourSchemeI;
-import jalview.util.MessageManager;
-
/**
* Cut'n'paste files into the desktop See JAL-1105
*
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
- AlignViewport viewport;
+ AlignmentViewPanel alignpanel;
+
+ AlignViewportI viewport;
FileParse source = null;
+
public CutAndPasteTransfer()
{
SwingUtilities.invokeLater(new Runnable()
/**
* DOCUMENT ME!
*/
- public void setForInput(AlignViewport viewport)
+ public void setForInput(AlignmentViewPanel viewpanel)
{
- this.viewport = viewport;
+ this.alignpanel = viewpanel;
+ if (alignpanel != null)
+ {
+ this.viewport = alignpanel.getAlignViewport();
+ }
if (viewport != null)
{
ok.setText(MessageManager.getString("action.add"));
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(MessageManager.getString("label.save_text_to_file"));
+ chooser.setDialogTitle(MessageManager
+ .getString("label.save_text_to_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
*/
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.
- Alignment al = null;
+ AlignmentI al = null;
if (FormatAdapter.isValidFormat(format))
{
try
{
- FormatAdapter fa = new FormatAdapter(viewport);
+ FormatAdapter fa = new FormatAdapter(alignpanel);
al = fa.readFile(getText(), "Paste", format);
source = fa.getAlignFile();
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.formatMessage(
- "label.couldnt_read_pasted_text", new String[]
- { ex.toString() }), MessageManager
+ "label.couldnt_read_pasted_text",
+ new String[] { ex.toString() }), MessageManager
.getString("label.error_parsing_text"),
JOptionPane.WARNING_MESSAGE);
}
}
- if (al != null)
+ if (al != null && al.hasValidSequence())
{
String title = MessageManager.formatMessage(
- "label.input_cut_paste_params", new String[]
- { format });
+ "label.input_cut_paste_params", new String[] { format });
if (viewport != null)
{
- viewport.addAlignment(al, title);
+ ((AlignViewport) viewport).addAlignment(al, title);
}
else
{
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);
-
+ AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
+ af.getViewport().setFeaturesDisplayed(fd);
af.changeColour(cs);
- // ((HtmlFile) source).applySettingsToAlignmentView(af);
}
- // else if (source instanceof JSONFile)
- // {
- // ColumnSelection colSel = ((JSONFile) source).getColumnSelection();
- // SequenceI[] hiddenSeqs = ((JSONFile) source).getHiddenSequences();
- // boolean showSeqFeatures = ((HtmlFile) source).isShowSeqFeatures();
- // ColourSchemeI cs = ((HtmlFile) source).getColourScheme();
- // af = new AlignFrame(al, hiddenSeqs, colSel,
- // AlignFrame.DEFAULT_WIDTH,
- // AlignFrame.DEFAULT_HEIGHT);
- // af.getViewport().setShowSequenceFeatures(showSeqFeatures);
- // af.changeColour(cs);
- // // ((JSONFile) source).applySettingsToAlignmentView(af);
- // }
else
{
af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
}
}
}
+ 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);
+ }
+ }
}
-
/**
* DOCUMENT ME!
*