From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 3 Aug 2020 09:40:46 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2983negativeSliderMin' into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~21
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4160e6f1fa6aa45849153cce5794faa93e3a19c4;p=jalview.git

Merge branch 'bug/JAL-2983negativeSliderMin' into develop

 Conflicts:
	src/jalview/gui/FeatureSettings.java
	src/jalview/gui/FeatureTypeSettings.java
---

4160e6f1fa6aa45849153cce5794faa93e3a19c4
diff --cc src/jalview/gui/FeatureSettings.java
index b49593a,3a04b88..e636455
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@@ -150,10 -141,8 +150,10 @@@ public class FeatureSettings extends JP
     */
    Object[][] originalData;
  
-   float originalTransparency;
+   private float originalTransparency;
  
 +  private ViewStyleI originalViewStyle;
 +
    private Map<String, FeatureMatcherSetI> originalFilters;
  
    final JInternalFrame frame;
@@@ -182,15 -167,9 +182,15 @@@
    /*
     * true when Feature Settings are updating from feature renderer
     */
-   boolean handlingUpdate = false;
+   private boolean handlingUpdate = false;
  
    /*
 +   * a change listener to ensure the dialog is updated if
 +   * FeatureRenderer discovers new features
 +   */
 +  private PropertyChangeListener change;
 +
 +  /*
     * holds {featureCount, totalExtent} for each feature type
     */
    Map<String, float[]> typeWidth = null;
diff --cc src/jalview/gui/FeatureTypeSettings.java
index 200911d,92918d4..54eeba7
--- a/src/jalview/gui/FeatureTypeSettings.java
+++ b/src/jalview/gui/FeatureTypeSettings.java
@@@ -168,9 -166,9 +166,9 @@@ public class FeatureTypeSettings extend
  
    private JComboBox<Object> threshold = new JComboBox<>();
  
-   JSlider slider = new JSlider();
+   private Slider slider;
  
 -  private JTextField thresholdValue = new JTextField(20);
 +  JTextField thresholdValue = new JTextField(20);
  
    private JCheckBox thresholdIsMin = new JCheckBox();