/*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)\r
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle\r
* \r
* This file is part of Jalview.\r
* \r
frame = new JInternalFrame();\r
frame.setContentPane(this);\r
frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
- Desktop.addInternalFrame(frame, "", 260, 125);\r
+ Desktop.addInternalFrame(frame, "", frame.getPreferredSize().width, frame.getPreferredSize().height);\r
}\r
\r
public void exportFeatures(AlignmentPanel ap)\r
{\r
if (GFFFormat.isSelected())\r
{\r
- text = new FeaturesFile().printGFFFormat(ap.av.alignment\r
+ text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()\r
.getDataset().getSequencesArray(),\r
getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());// ap.av.featuresDisplayed//);\r
}\r
else\r
{\r
- text = new FeaturesFile().printJalviewFormat(ap.av.alignment\r
+ text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()\r
.getDataset().getSequencesArray(),\r
getDisplayedFeatureCols(), true, ap.av.isShowNpFeats()); // ap.av.featuresDisplayed);\r
}\r
{\r
if (GFFFormat.isSelected())\r
{\r
- text = new FeaturesFile().printGFFFormat(ap.av.alignment\r
+ text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()\r
.getDataset().getSequencesArray(),\r
getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());\r
}\r
else\r
{\r
- text = new FeaturesFile().printJalviewFormat(ap.av.alignment\r
+ text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()\r
.getDataset().getSequencesArray(),\r
getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());\r
}\r
private Hashtable getDisplayedFeatureCols()\r
{\r
Hashtable fcols = new Hashtable();\r
- if (ap.av.featuresDisplayed==null)\r
+ if (ap.av.featuresDisplayed == null)\r
{\r
return fcols;\r
}\r
\r
private void jbInit() throws Exception\r
{\r
- this.setLayout(flowLayout1);\r
+ this.setLayout(new BorderLayout());\r
+ \r
toFile.setText("to File");\r
toFile.addActionListener(new ActionListener()\r
{\r
buttonGroup.add(jalviewFormat);\r
buttonGroup.add(GFFFormat);\r
buttonGroup.add(CSVFormat);\r
- this.add(jPanel3, null);\r
- this.add(jPanel1, null);\r
+ this.add(jPanel3, BorderLayout.CENTER);\r
+ this.add(jPanel1, BorderLayout.SOUTH);\r
}\r
\r
JPanel jPanel1 = new JPanel();\r