Merge branch 'feature/JAL-3143ensemblJSON' into

Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
	src/jalview/gui/FeatureTypeSettings.java

diff --cc src/jalview/gui/FeatureTypeSettings.java
index 8ea966a,55bc519..a6b986e
--- 1/src/jalview/gui/FeatureTypeSettings.java
--- 2/src/jalview/gui/FeatureTypeSettings.java
+++ b/src/jalview/gui/FeatureTypeSettings.java
@@@ -62,8 -62,8 +62,7 @@@ import javax.swing.JLabel
  import javax.swing.JPanel;
  import javax.swing.JRadioButton;
  import javax.swing.JSlider;
- import javax.swing.JTabbedPane;
  import javax.swing.JTextField;
 -import javax.swing.SwingConstants;
  import javax.swing.border.LineBorder;
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;
@@@ -148,16 -149,16 +147,15 @@@ public class FeatureTypeSettings extend
     * radio button group, to select what to colour by:
     * simple colour, by category (text), or graduated
     */
 -  private JRadioButton simpleColour = new JRadioButton();
 +  JRadioButton simpleColour = new JRadioButton();
  
 -  private JRadioButton byCategory = new JRadioButton();
 +  JRadioButton byCategory = new JRadioButton();
  
 -  private JRadioButton graduatedColour = new JRadioButton();
 +  JRadioButton graduatedColour = new JRadioButton();
  
--  /**
--   * colours and filters are shown in tabbed view or single content pane
--   */
--  JPanel coloursPanel, filtersPanel;
++  JPanel coloursPanel;
++  
++  JPanel filtersPanel;
  
    JPanel singleColour = new JPanel();
  
@@@ -243,28 -230,28 +227,27 @@@
        ex.printStackTrace();
        return;
      }
- 
-     updateColoursTab();
- 
-     updateFiltersTab();
- 
+     
 -    updateColoursTab();
++    updateColoursPanel();
+     
 -    updateFiltersTab();
++    updateFiltersPanel();
+     
      adjusting = false;
- 
+     
      colourChanged(false);
- 
+     
      String title = MessageManager
              .formatMessage("label.display_settings_for", new String[]
              { theType });
-     initDialogFrame(this, true, blocking, title, 500, 500);
- 
+     initDialogFrame(this, true, false, title, 500, 500);
 -    
      waitForInput();
    }
  
    /**
--   * Configures the widgets on the Colours tab according to the current feature
++   * Configures the widgets on the Colours panel according to the current feature
     * colour scheme
     */
--  private void updateColoursTab()
++  private void updateColoursPanel()
    {
      FeatureColourI fc = fr.getFeatureColours().get(featureType);
  
@@@ -416,13 -403,13 +399,13 @@@
      };
  
      /*
--     * first panel/tab: colour options
++     * first panel: colour options
       */
      JPanel coloursPanel = initialiseColoursPanel();
      this.add(coloursPanel, BorderLayout.NORTH);
  
      /*
--     * second panel/tab: filter options
++     * second panel: filter options
       */
      JPanel filtersPanel = initialiseFiltersPanel();
      this.add(filtersPanel, BorderLayout.CENTER);
@@@ -890,7 -870,7 +880,7 @@@
      fr.setColour(featureType, acg);
      ap.paintAlignment(updateStructsAndOverview, updateStructsAndOverview);
  
--    updateColoursTab();
++    updateColoursPanel();
    }
  
    /**
@@@ -1228,7 -1208,7 +1218,7 @@@
     * for adding a condition. This should be called after a filter has been
     * removed, added or amended.
     */
--  private void updateFiltersTab()
++  private void updateFiltersPanel()
    {
      /*
       * clear the panel and list of filter conditions
@@@ -1763,6 -1738,6 +1753,6 @@@
      fr.setFeatureFilter(featureType, combined.isEmpty() ? null : combined);
      ap.paintAlignment(true, true);
  
--    updateFiltersTab();
++    updateFiltersPanel();
    }
  }

diff --cc src/jalview/schemes/FeatureColour.java
Simple merge

diff --cc test/jalview/schemes/FeatureColourTest.java
Simple merge