Jalview 2.6 source licence

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

diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java
index 118aab8..de6aaa0 100755 (executable)
--- a/src/jalview/gui/AnnotationExporter.java
+++ b/src/jalview/gui/AnnotationExporter.java
@@ -1,5 +1,5 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)\r
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
  * This file is part of Jalview.\r
@@ -88,8 +88,8 @@ public class AnnotationExporter extends JPanel
 \r
   public void toFile_actionPerformed(ActionEvent e)\r
   {\r
-    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache\r
-            .getProperty("LAST_DIRECTORY"));\r
+    JalviewFileChooser chooser = new JalviewFileChooser(\r
+            jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
 \r
     chooser.setFileView(new JalviewFileView());\r
     chooser.setDialogTitle(features ? "Save Features to File"\r
@@ -177,10 +177,18 @@ public class AnnotationExporter extends JPanel
     }\r
 \r
     CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
-    cap.setText(text);\r
-    Desktop.addInternalFrame(cap, (features ? "Features for - "\r
-            : "Annotations for - ")\r
-            + ap.alignFrame.getTitle(), 600, 500);\r
+    try\r
+    {\r
+      cap.setText(text);\r
+      Desktop.addInternalFrame(cap, (features ? "Features for - "\r
+              : "Annotations for - ") + ap.alignFrame.getTitle(), 600, 500);\r
+    } catch (OutOfMemoryError oom)\r
+    {\r
+      new OOMWarning("generating "\r
+              + (features ? "Features for - " : "Annotations for - ")\r
+              + ap.alignFrame.getTitle(), oom);\r
+      cap.dispose();\r
+    }\r
 \r
     close_actionPerformed(null);\r
   }\r
@@ -188,6 +196,10 @@ public class AnnotationExporter extends JPanel
   private Hashtable getDisplayedFeatureCols()\r
   {\r
     Hashtable fcols = new Hashtable();\r
+    if (ap.av.featuresDisplayed==null)\r
+    {\r
+      return fcols;\r
+    }\r
     Enumeration en = ap.av.featuresDisplayed.keys();\r
     FeatureRenderer fr = ap.seqPanel.seqCanvas.getFeatureRenderer(); // consider\r
                                                                      // higher\r