Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 10 Jun 2015 14:23:52 +0000 (15:23 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 10 Jun 2015 14:23:52 +0000 (15:23 +0100)
1  2 
src/jalview/gui/AlignFrame.java

@@@ -1098,6 -1098,11 +1098,6 @@@ public class AlignFrame extends GAlignF
                  .lastIndexOf(java.io.File.separatorChar) + 1);
        }
  
 -      /*
 -       * First save any linked Chimera session.
 -       */
 -      Desktop.instance.saveChimeraSessions(file);
 -
        success = new Jalview2XML().saveAlignment(this, file, shortName);
  
        statusBar.setText(MessageManager.formatMessage(
          alignmentToExport = viewport.getAlignment();
          alignmentStartEnd = getStartEnd(alignmentStartEnd, viewport
                  .getColumnSelection().getHiddenColumns());
+         viewport.setIncludeHiddenRegion(false);
        }
        else
        {
          // export all region including visible
          alignmentToExport = hiddenSeqs.getFullAlignment();
+         viewport.setIncludeHiddenRegion(true);
        }
      }
  
    {
      AlignmentI al = viewport.getAlignment();
      HiddenSequences hiddenSeqs = al.getHiddenSequences();
+     boolean hasHiddenRows = false;
      for (SequenceI seq : al.getSequencesArray())
        {
          if (seq.isHidden())
          {
          hiddenSeqs.hideSequence(seq);
+         hasHiddenRows = true;
          }
        }
+     viewport.setHasHiddenRows(hasHiddenRows);
+     firePropertyChange("alignment", null, al.getSequences());
    }
  }