From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 28 Nov 2014 16:01:47 +0000 (+0000)
Subject: Merge branch 'JAL-1517_release282' into develop
X-Git-Tag: Jalview_2_9~136
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bde9f99880a7fc3a9574447ac0860f56d06d9cab;hp=-c;p=jalview.git

Merge branch 'JAL-1517_release282' into develop
---

bde9f99880a7fc3a9574447ac0860f56d06d9cab
diff --combined src/jalview/gui/AlignFrame.java
index 4f174d3,50043e6..9f5b8f0
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -55,7 -55,6 +55,7 @@@ import jalview.datamodel.SequenceGroup
  import jalview.datamodel.SequenceI;
  import jalview.io.AlignmentProperties;
  import jalview.io.AnnotationFile;
 +import jalview.io.BioJsHTMLOutput;
  import jalview.io.FeaturesFile;
  import jalview.io.FileLoader;
  import jalview.io.FormatAdapter;
@@@ -1235,12 -1234,6 +1235,12 @@@ public class AlignFrame extends GAlignF
              alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
    }
  
 +  @Override
 +  public void bioJSMenuItem_actionPerformed(ActionEvent e)
 +  {
 +    new BioJsHTMLOutput(alignPanel,
 +            alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
 +  }
    public void createImageMap(File file, String image)
    {
      alignPanel.makePNGImageMap(file, image);
@@@ -4196,28 -4189,17 +4196,17 @@@
      else if (viewport.getSelectionGroup() != null
              && viewport.getSelectionGroup().getSize() == 1)
      {
-       int option = JOptionPane
-               .showConfirmDialog(
- this,
-                       "More than one sequece group selection is required for this Job, click \n'Cancel' to edit your selection or 'Ok' to submit the entire sequence.",
-                       "Invalid selection",
-                       JOptionPane.OK_CANCEL_OPTION);
+       int option = JOptionPane.showConfirmDialog(this,
+               MessageManager.getString("warn.oneseq_msainput_selection"),
+               MessageManager.getString("label.invalid_selection"),
+               JOptionPane.OK_CANCEL_OPTION);
        if (option == JOptionPane.OK_OPTION)
        {
          msa = viewport.getAlignmentView(false);
        }
      }
      else
      {
-       /*
-        * Vector seqs = viewport.getAlignment().getSequences();
-        * 
-        * if (seqs.size() > 1) { msa = new SequenceI[seqs.size()];
-        * 
-        * for (int i = 0; i < seqs.size(); i++) { msa[i] = (SequenceI)
-        * seqs.elementAt(i); } }
-        */
        msa = viewport.getAlignmentView(false);
      }
      return msa;