merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 11 Nov 2015 13:04:11 +0000 (13:04 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 11 Nov 2015 13:04:11 +0000 (13:04 +0000)
1  2 
src/jalview/gui/AlignFrame.java

@@@ -2572,18 -2572,14 +2572,14 @@@ public class AlignFrame extends GAlignF
        TrimRegionCommand trimRegion;
        if (trimLeft)
        {
-         trimRegion = new TrimRegionCommand("Remove Left",
-                 TrimRegionCommand.TRIM_LEFT, seqs, column,
-                 viewport.getAlignment(), viewport.getColumnSelection(),
-                 viewport.getSelectionGroup());
+         trimRegion = new TrimRegionCommand("Remove Left", true, seqs,
+                 column, viewport.getAlignment());
          viewport.setStartRes(0);
        }
        else
        {
-         trimRegion = new TrimRegionCommand("Remove Right",
-                 TrimRegionCommand.TRIM_RIGHT, seqs, column,
-                 viewport.getAlignment(), viewport.getColumnSelection(),
-                 viewport.getSelectionGroup());
+         trimRegion = new TrimRegionCommand("Remove Right", false, seqs,
+                 column, viewport.getAlignment());
        }
  
        statusBar.setText(MessageManager.formatMessage(
            @Override
            public void run()
            {
 +            boolean isNuclueotide = alignPanel.alignFrame
 +                    .getViewport().getAlignment()
 +                    .isNucleotide();
              new jalview.ws.DBRefFetcher(alignPanel.av
 -                    .getSequenceSelection(), alignPanel.alignFrame)
 +                    .getSequenceSelection(),
 +                    alignPanel.alignFrame, null,
 +                    alignPanel.alignFrame.featureSettings,
 +                    isNuclueotide)
                      .fetchDBRefs(false);
            }
          }).start();
                        @Override
                        public void run()
                        {
 +                        boolean isNuclueotide = alignPanel.alignFrame
 +                                .getViewport().getAlignment()
 +                                .isNucleotide();
                          new jalview.ws.DBRefFetcher(alignPanel.av
                                  .getSequenceSelection(),
 -                                alignPanel.alignFrame, dassource)
 +                                alignPanel.alignFrame, dassource,
 +                                alignPanel.alignFrame.featureSettings,
 +                                isNuclueotide)
                                  .fetchDBRefs(false);
                        }
                      }).start();
                        @Override
                        public void run()
                        {
 +                        boolean isNuclueotide = alignPanel.alignFrame
 +                                .getViewport().getAlignment()
 +                                .isNucleotide();
                          new jalview.ws.DBRefFetcher(alignPanel.av
                                  .getSequenceSelection(),
 -                                alignPanel.alignFrame, dassource)
 +                                alignPanel.alignFrame, dassource,
 +                                alignPanel.alignFrame.featureSettings,
 +                                isNuclueotide)
                                  .fetchDBRefs(false);
                        }
                      }).start();
                          @Override
                          public void run()
                          {
 +                          boolean isNuclueotide = alignPanel.alignFrame
 +                                  .getViewport().getAlignment()
 +                                  .isNucleotide();
                            new jalview.ws.DBRefFetcher(alignPanel.av
                                    .getSequenceSelection(),
 -                                  alignPanel.alignFrame, dassrc)
 +                                  alignPanel.alignFrame, dassrc,
 +                                  alignPanel.alignFrame.featureSettings,
 +                                  isNuclueotide)
                                    .fetchDBRefs(false);
                          }
                        }).start();