From: hansonr <hansonr@stolaf.edu>
Date: Tue, 3 Jul 2018 16:55:32 +0000 (+0100)
Subject: JAL-3026 GD#91 "final" keyword deprecated
X-Git-Tag: Release_2_11_4_0~45^2~18^2~596
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d43e766fa05058226c417d214e0b8d83294ec6e2;p=jalview.git

JAL-3026 GD#91 "final" keyword deprecated

 removed from FeatureTypeSettings
---

diff --git a/src/jalview/gui/FeatureTypeSettings.java b/src/jalview/gui/FeatureTypeSettings.java
index 0f997bf..fa9833b 100644
--- a/src/jalview/gui/FeatureTypeSettings.java
+++ b/src/jalview/gui/FeatureTypeSettings.java
@@ -843,10 +843,10 @@ public class FeatureTypeSettings extends JalviewDialog
    * @param key
    *          message bundle key for the dialog title
    */
-  private void showColourChooser(final JPanel colourPanel, String key)
+  private void showColourChooser(JPanel colourPanel, String key)
   {
     // TODO 'final' is (currently) required here for SwingJS to work
-    final JColorChooser colorChooser = new JColorChooser();
+    JColorChooser colorChooser = new JColorChooser(); 
     colorChooser.setColor(colourPanel.getBackground());
 
     ActionListener listener = new ActionListener()
@@ -962,7 +962,7 @@ public class FeatureTypeSettings extends JalviewDialog
      */
     float minValue = min;
     float maxValue = max;
-    final int thresholdOption = threshold.getSelectedIndex();
+    int thresholdOption = threshold.getSelectedIndex();
     if (thresholdIsMin.isSelected()
             && thresholdOption == ABOVE_THRESHOLD_OPTION)
     {
@@ -1345,7 +1345,7 @@ public class FeatureTypeSettings extends JalviewDialog
      * drop-down choice of attribute, with description as a tooltip 
      * if we can obtain it
      */
-    final JComboBox<String> attCombo = populateAttributesDropdown(attNames,
+    JComboBox<String> attCombo = populateAttributesDropdown(attNames,
             true, true);
     String filterBy = setSelectedAttribute(attCombo, filter);
 
diff --git a/swingjs/net.sf.j2s.core.jar b/swingjs/net.sf.j2s.core.jar
index 0aa84ff..93a70ee 100644
Binary files a/swingjs/net.sf.j2s.core.jar and b/swingjs/net.sf.j2s.core.jar differ