X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationExporter.java;h=ffc5c1c5ed9081e76c0e1a6c9918379bddf77387;hb=01cc2ef6f1206fc9839dae4888999f7c791898fd;hp=ceccd97a907f6d5833a60473aed105d10e8f5c81;hpb=2cc0c155f1e785ce3d53529bb4375d4ddf1e8cc9;p=jalview.git

diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java
index ceccd97..ffc5c1c 100755
--- a/src/jalview/gui/AnnotationExporter.java
+++ b/src/jalview/gui/AnnotationExporter.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -61,7 +61,7 @@ public class AnnotationExporter extends JPanel
     frame = new JInternalFrame();
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "", 260, 125);
+    Desktop.addInternalFrame(frame, "", frame.getPreferredSize().width, frame.getPreferredSize().height);
   }
 
   public void exportFeatures(AlignmentPanel ap)
@@ -105,13 +105,13 @@ public class AnnotationExporter extends JPanel
       {
         if (GFFFormat.isSelected())
         {
-          text = new FeaturesFile().printGFFFormat(ap.av.alignment
+          text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
                   .getDataset().getSequencesArray(),
                   getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());// ap.av.featuresDisplayed//);
         }
         else
         {
-          text = new FeaturesFile().printJalviewFormat(ap.av.alignment
+          text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
                   .getDataset().getSequencesArray(),
                   getDisplayedFeatureCols(), true, ap.av.isShowNpFeats()); // ap.av.featuresDisplayed);
         }
@@ -152,13 +152,13 @@ public class AnnotationExporter extends JPanel
     {
       if (GFFFormat.isSelected())
       {
-        text = new FeaturesFile().printGFFFormat(ap.av.alignment
+        text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
                 .getDataset().getSequencesArray(),
                 getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
       }
       else
       {
-        text = new FeaturesFile().printJalviewFormat(ap.av.alignment
+        text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
                 .getDataset().getSequencesArray(),
                 getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
       }
@@ -196,7 +196,7 @@ public class AnnotationExporter extends JPanel
   private Hashtable getDisplayedFeatureCols()
   {
     Hashtable fcols = new Hashtable();
-    if (ap.av.featuresDisplayed==null)
+    if (ap.av.featuresDisplayed == null)
     {
       return fcols;
     }
@@ -225,7 +225,8 @@ public class AnnotationExporter extends JPanel
 
   private void jbInit() throws Exception
   {
-    this.setLayout(flowLayout1);
+    this.setLayout(new BorderLayout());
+    
     toFile.setText("to File");
     toFile.addActionListener(new ActionListener()
     {
@@ -273,8 +274,8 @@ public class AnnotationExporter extends JPanel
     buttonGroup.add(jalviewFormat);
     buttonGroup.add(GFFFormat);
     buttonGroup.add(CSVFormat);
-    this.add(jPanel3, null);
-    this.add(jPanel1, null);
+    this.add(jPanel3, BorderLayout.CENTER);
+    this.add(jPanel1, BorderLayout.SOUTH);
   }
 
   JPanel jPanel1 = new JPanel();