Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Apr 2020 17:54:49 +0000 (18:54 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Apr 2020 17:54:49 +0000 (18:54 +0100)
update for 2.11.1 release

43 files changed:
1  2 
help/help/help.jhm
help/help/helpTOC.xml
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/Jalview.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/Desktop.java
src/jalview/gui/EditNameDialog.java
src/jalview/gui/JvSwingUtils.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/Preferences.java
src/jalview/gui/RestInputParamEditDialog.java
src/jalview/gui/SplitFrame.java
src/jalview/gui/UserQuestionnaireCheck.java
src/jalview/gui/WsPreferences.java
src/jalview/io/AlignmentFileReaderI.java
src/jalview/io/AlignmentFileWriterI.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/jbgui/GCutAndPasteTransfer.java
src/jalview/jbgui/GPreferences.java
src/jalview/project/Jalview2XML.java
src/jalview/util/StringUtils.java
src/jalview/ws/rest/clientdefs/ShmrRestClient.java
test/jalview/analysis/AlignmentGenerator.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/datamodel/SequenceTest.java
test/jalview/gui/AlignViewportTest.java
test/jalview/gui/PairwiseAlignmentPanelTest.java
test/jalview/gui/PopupMenuTest.java
test/jalview/io/StockholmFileTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/OverviewResColourFinderTest.java
test/jalview/renderer/ResidueColourFinderTest.java
test/jalview/renderer/seqfeatures/FeatureColourFinderTest.java
test/jalview/util/StringUtilsTest.java

Simple merge
Simple merge
@@@ -135,9 -131,9 +135,11 @@@ action.select_highlighted_columns = Sel
  tooltip.select_highlighted_columns = Press B to mark highlighted columns, Ctrl-(or Cmd)-B to toggle, and Alt-B to mark all but highlighted columns 
  action.deselect_all = Deselect all
  action.invert_selection = Invert selection
 +action.filter_by_evalue = Filter by E-Value
 +action.filter_by_score = Filter by Score
  action.using_jmol = Using Jmol
+ action.undo_changes_to_feature_settings = Undo all unapplied changes to feature settings
+ action.undo_changes_to_feature_settings_and_close_the_dialog = Undo all pending changes and close the feature settings dialog
  action.link = Link
  action.group_link = Group Link
  action.show_chain = Show Chain
@@@ -1489,3 -1410,5 +1495,6 @@@ label.show_linked_features = Show {0} f
  label.on_top = on top
  label.include_linked_features = Include {0} features
  label.include_linked_tooltip = Include visible {0} features<br>converted to local sequence coordinates
+ label.features_not_shown = {0} feature(s) not shown
+ label.no_features_to_sort_by = No features to sort by
++
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -28,8 -28,8 +28,6 @@@ import jalview.io.StructureFile
  import jalview.structure.StructureSelectionManager;
  import jalview.util.MessageManager;
  
--import javax.swing.JOptionPane;
--
  /**
   * GUI related routines for associating PDB files with sequences
   * 
@@@ -29,8 -28,7 +29,6 @@@ import jalview.api.analysis.SimilarityP
  import jalview.bin.Cache;
  import jalview.datamodel.SequenceGroup;
  import jalview.util.MessageManager;
- import jalview.viewmodel.AlignmentViewport;
--
  import java.awt.BorderLayout;
  import java.awt.Color;
  import java.awt.Component;
Simple merge
@@@ -28,7 -28,7 +28,6 @@@ import java.awt.Font
  import javax.swing.JButton;
  import javax.swing.JComponent;
  import javax.swing.JLabel;
--import javax.swing.JOptionPane;
  import javax.swing.JPanel;
  import javax.swing.JTextField;
  
Simple merge
@@@ -58,33 -81,6 +83,9 @@@ import jalview.util.StringUtils
  import jalview.util.UrlLink;
  import jalview.viewmodel.seqfeatures.FeatureRendererModel;
  
- import java.awt.Color;
- import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
 +import java.io.IOException;
 +import java.net.MalformedURLException;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.BitSet;
- import java.util.Collection;
- import java.util.Collections;
- import java.util.Hashtable;
- import java.util.LinkedHashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.Objects;
- import java.util.SortedMap;
- import java.util.TreeMap;
- import java.util.Vector;
- import javax.swing.ButtonGroup;
- import javax.swing.JCheckBoxMenuItem;
- import javax.swing.JColorChooser;
- import javax.swing.JMenu;
- import javax.swing.JMenuItem;
- import javax.swing.JPopupMenu;
- import javax.swing.JRadioButtonMenuItem;
 +
  /**
   * The popup menu that is displayed on right-click on a sequence id, or in the
   * sequence alignment.
Simple merge
@@@ -30,7 -30,7 +30,6 @@@ import jalview.ws.rest.RestServiceDescr
  import java.util.ArrayList;
  import java.util.Hashtable;
  
--import javax.swing.JOptionPane;
  import javax.swing.JPanel;
  import javax.swing.event.ListSelectionEvent;
  
   */
  package jalview.gui;
  
 +import jalview.api.AlignViewportI;
+ import jalview.api.AlignViewControllerGuiI;
+ import jalview.api.FeatureSettingsControllerI;
  import jalview.api.SplitContainerI;
+ import jalview.controller.FeatureSettingsControllerGuiI;
  import jalview.datamodel.AlignmentI;
  import jalview.jbgui.GAlignFrame;
  import jalview.jbgui.GSplitFrame;
@@@ -26,8 -26,8 +26,6 @@@ import java.io.BufferedReader
  import java.io.InputStreamReader;
  import java.net.URL;
  
--import javax.swing.JOptionPane;
--
  public class UserQuestionnaireCheck implements Runnable
  {
    /**
@@@ -37,7 -37,7 +37,6 @@@ import java.util.List
  import java.util.Vector;
  
  import javax.swing.JLabel;
--import javax.swing.JOptionPane;
  import javax.swing.JPanel;
  import javax.swing.JTable;
  import javax.swing.JTextField;
@@@ -20,8 -20,8 +20,6 @@@
   */
  package jalview.io;
  
--import jalview.api.AlignExportSettingI;
--import jalview.api.AlignmentViewPanel;
  import jalview.api.FeatureSettingsModelI;
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.SequenceI;
@@@ -22,8 -22,8 +22,6 @@@ package jalview.io
  
  import jalview.api.AlignExportSettingI;
  import jalview.api.AlignmentViewPanel;
--import jalview.api.FeatureSettingsModelI;
--import jalview.datamodel.AlignmentI;
  import jalview.datamodel.SequenceI;
  
  public interface AlignmentFileWriterI
   */
  package jalview.io;
  
+ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.Comparator;
+ import java.util.LinkedHashMap;
+ import java.util.List;
+ import java.util.Map;
  import jalview.api.FeatureColourI;
 +import jalview.datamodel.AlignmentAnnotation;
  import jalview.datamodel.DBRefEntry;
  import jalview.datamodel.DBRefSource;
  import jalview.datamodel.GeneLociI;
@@@ -377,10 -478,9 +479,10 @@@ public class SequenceAnnotationRepor
      if (sequence.getDescription() != null)
      {
        tmp = sequence.getDescription();
-       sb.append("<br>").append(tmp);
+       sb.append(tmp);
        maxWidth = Math.max(maxWidth, tmp.length());
      }
 +
      SequenceI ds = sequence;
      while (ds.getDatasetSequence() != null)
      {
Simple merge
@@@ -25,7 -25,7 +25,6 @@@ import jalview.util.MessageManager
  
  import java.awt.BorderLayout;
  import java.awt.Font;
--import java.awt.Toolkit;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.awt.event.MouseEvent;
Simple merge
Simple merge
Simple merge
index a10931b,0000000..986d760
mode 100644,000000..100644
--- /dev/null
@@@ -1,58 -1,0 +1,54 @@@
 +package jalview.ws.rest.clientdefs;
 +
 +import jalview.io.packed.DataProvider.JvDataType;
 +import jalview.util.MessageManager;
 +import jalview.ws.rest.InputType;
 +import jalview.ws.rest.RestClient;
 +import jalview.ws.rest.RestServiceDescription;
- import jalview.ws.rest.params.Alignment;
- import jalview.ws.rest.params.JobConstant;
- import jalview.ws.rest.params.SeqGroupIndexVector;
 +import java.util.Hashtable;
 +
 +public class ShmrRestClient
 +{
 +
 +  public static RestClient makeShmmrRestClient()
 +  {
 +    String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = MessageManager
 +            .getString("label.multiharmony");
 +    Hashtable<String, InputType> iparams = new Hashtable<String, InputType>();
 +    jalview.ws.rest.params.JobConstant toolp;
 +    // toolp = new jalview.ws.rest.JobConstant("tool","jalview");
 +    // iparams.put(toolp.token, toolp);
 +    // toolp = new jalview.ws.rest.params.JobConstant("mbjob[method]","shmr");
 +    // iparams.put(toolp.token, toolp);
 +    // toolp = new
 +    // jalview.ws.rest.params.JobConstant("mbjob[description]","step 1");
 +    // iparams.put(toolp.token, toolp);
 +    // toolp = new jalview.ws.rest.params.JobConstant("start_search","1");
 +    // iparams.put(toolp.token, toolp);
 +    // toolp = new jalview.ws.rest.params.JobConstant("blast","0");
 +    // iparams.put(toolp.token, toolp);
 +  
 +    jalview.ws.rest.params.Alignment aliinput = new jalview.ws.rest.params.Alignment();
 +    // SHMR server has a 65K limit for content pasted into the 'ali' parameter,
 +    // so we always upload our files.
 +    aliinput.token = "ali_file";
 +    aliinput.writeAsFile = true;
 +    iparams.put(aliinput.token, aliinput);
 +    jalview.ws.rest.params.SeqGroupIndexVector sgroups = new jalview.ws.rest.params.SeqGroupIndexVector();
 +    sgroups.setMinsize(2);
 +    sgroups.min = 2;// need at least two group defined to make a partition
 +    iparams.put("groups", sgroups);
 +    sgroups.token = "groups";
 +    sgroups.sep = " ";
 +    RestServiceDescription shmrService = new RestServiceDescription(
 +            action,
 +            description,
 +            name,
 +            "http://zeus.few.vu.nl/programs/shmrwww/index.php?tool=jalview",// ?tool=jalview&mbjob[method]=shmr&mbjob[description]=step1",
 +            "?tool=jalview", iparams, true, false, '-');
 +    // a priori knowledge of the data returned from the service
 +    shmrService.addResultDatatype(JvDataType.ANNOTATION);
 +    return new RestClient(shmrService);
 +  }
 +
 +}
@@@ -24,7 -24,7 +24,6 @@@ import jalview.datamodel.Alignment
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.Sequence;
  import jalview.datamodel.SequenceI;
--import jalview.gui.JvOptionPane;
  import jalview.io.FastaFile;
  
  import java.io.File;
@@@ -33,8 -33,8 +32,6 @@@ import java.io.PrintStream
  import java.util.Arrays;
  import java.util.Random;
  
--import org.testng.annotations.BeforeClass;
--
  /**
   * Generates, and outputs in Fasta format, a random peptide or nucleotide alignment for given
   * sequence length and count. Will regenerate the same alignment each time if
@@@ -27,7 -27,7 +27,6 @@@ import static org.testng.AssertJUnit.as
  import static org.testng.AssertJUnit.assertSame;
  import static org.testng.AssertJUnit.assertTrue;
  
--import jalview.analysis.AlignmentUtils.DnaVariant;
  import jalview.datamodel.AlignedCodonFrame;
  import jalview.datamodel.Alignment;
  import jalview.datamodel.AlignmentAnnotation;
@@@ -41,7 -41,7 +40,6 @@@ import jalview.datamodel.SearchResultsI
  import jalview.datamodel.Sequence;
  import jalview.datamodel.SequenceFeature;
  import jalview.datamodel.SequenceI;
--import jalview.datamodel.features.SequenceFeatures;
  import jalview.gui.JvOptionPane;
  import jalview.io.AppletFormatAdapter;
  import jalview.io.DataSourceType;
@@@ -55,7 -55,7 +53,6 @@@ import jalview.util.MappingUtils
  import java.io.IOException;
  import java.util.ArrayList;
  import java.util.Arrays;
--import java.util.LinkedHashMap;
  import java.util.List;
  import java.util.Map;
  import java.util.TreeMap;
@@@ -27,7 -27,14 +27,15 @@@ import static org.testng.AssertJUnit.as
  import static org.testng.AssertJUnit.assertSame;
  import static org.testng.AssertJUnit.assertTrue;
  
 +import jalview.api.AlignViewportI;
+ import java.util.ArrayList;
+ import java.util.List;
+ import org.testng.Assert;
+ import org.testng.annotations.BeforeClass;
+ import org.testng.annotations.BeforeMethod;
+ import org.testng.annotations.Test;
  import jalview.bin.Cache;
  import jalview.bin.Jalview;
  import jalview.datamodel.AlignedCodonFrame;
@@@ -47,17 -54,8 +55,9 @@@ import jalview.schemes.ColourSchemeI
  import jalview.schemes.PIDColourScheme;
  import jalview.structure.StructureSelectionManager;
  import jalview.util.MapList;
 +import jalview.viewmodel.AlignmentViewport;
  import jalview.viewmodel.ViewportRanges;
  
- import java.util.ArrayList;
- import java.util.List;
- import org.testng.Assert;
- import org.testng.annotations.BeforeClass;
- import org.testng.annotations.BeforeMethod;
- import org.testng.annotations.Test;
  public class AlignViewportTest
  {
  
@@@ -7,14 -6,13 +7,12 @@@ import jalview.datamodel.AlignmentI
  import jalview.datamodel.SequenceGroup;
  import jalview.io.DataSourceType;
  import jalview.io.FileLoader;
- import jalview.viewmodel.AlignmentViewport;
--
  import javax.swing.JTextArea;
  
 -import junit.extensions.PA;
 -
  import org.testng.annotations.Test;
  
 +import junit.extensions.PA;
 +
  public class PairwiseAlignmentPanelTest
  {
    @Test(groups = "Functional")
Simple merge
@@@ -75,23 -90,6 +90,8 @@@ import jalview.util.matcher.Condition
  import jalview.viewmodel.AlignmentViewport;
  import jalview.viewmodel.seqfeatures.FeatureRendererModel;
  
- import java.awt.Color;
- import java.io.File;
- import java.io.IOException;
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import javax.swing.JInternalFrame;
- import org.testng.Assert;
- import org.testng.AssertJUnit;
- import org.testng.annotations.BeforeClass;
- import org.testng.annotations.Test;
 +import junit.extensions.PA;
 +
  @Test(singleThreaded = true)
  public class Jalview2xmlTests extends Jalview2xmlBase
  {
@@@ -34,8 -33,7 +34,6 @@@ import jalview.gui.JvOptionPane
  import jalview.schemes.ColourSchemeI;
  import jalview.schemes.UserColourScheme;
  import jalview.schemes.ZappoColourScheme;
- import jalview.viewmodel.AlignmentViewport;
--
  import java.awt.Color;
  import java.util.ArrayList;
  
@@@ -31,8 -30,7 +31,6 @@@ import jalview.gui.AlignViewport
  import jalview.gui.JvOptionPane;
  import jalview.schemes.UserColourScheme;
  import jalview.schemes.ZappoColourScheme;
- import jalview.viewmodel.AlignmentViewport;
--
  import java.awt.Color;
  
  import org.testng.annotations.BeforeClass;
@@@ -11,8 -10,7 +11,6 @@@ import jalview.api.FeatureColourI
  import jalview.datamodel.SequenceFeature;
  import jalview.datamodel.SequenceI;
  import jalview.gui.AlignFrame;
--import jalview.gui.AlignViewport;
- import jalview.gui.FeatureRenderer;
  import jalview.io.DataSourceType;
  import jalview.io.FileLoader;
  import jalview.schemes.FeatureColour;