merge from develop

[jalview.git] / src / jalview / gui / CutAndPasteTransfer.java

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index e08bfcd..cd5c792 100644 (file)
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -28,6 +28,7 @@ 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;
@@ -206,14 +207,13 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
     if (format == null || format.equalsIgnoreCase("EMPTY DATA FILE"))
     {
       System.err.println(MessageManager
-              .getString("label.null_or_unidentifiable_data"));
+              .getString("label.couldnt_read_data"));
       if (!Jalview.isHeadlessMode())
       {
-        JOptionPane.showMessageDialog(null,
- MessageManager
-                .getString("label.null_or_unidentifiable_data"),
-                MessageManager.getString("label.unidentifiable_data"),
-                JOptionPane.ERROR_MESSAGE);
+        javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                AppletFormatAdapter.SUPPORTED_FORMATS,
+                MessageManager.getString("label.couldnt_read_data"),
+                JOptionPane.WARNING_MESSAGE);
       }
       return;
     }
@@ -295,17 +295,13 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
     else
     {
       System.err.println(MessageManager
-              .getString("label.null_or_invalid_alignment"));
+              .getString("label.couldnt_read_data"));
       if (!Jalview.isHeadlessMode())
       {
-        JOptionPane
-                .showMessageDialog(
-                        null,
-                        MessageManager
-                                .getString("label.null_or_invalid_alignment"),
-                        MessageManager
-                                .getString("label.unable_to_create_alignment"),
-                        JOptionPane.ERROR_MESSAGE);
+        javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                AppletFormatAdapter.SUPPORTED_FORMATS,
+                MessageManager.getString("label.couldnt_read_data"),
+                JOptionPane.WARNING_MESSAGE);
       }
     }
   }