JAL-2808 JAL-3058 code tidy for compiler warnings, column constants

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 6fb6123..cc58e2c 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -131,9 +131,9 @@ public class FeatureSettings extends JPanel
    */
   Object[][] originalData;
 
-  private float originalTransparency;
+  float originalTransparency;
 
-  private Map<String, FeatureMatcherSetI> originalFilters;
+  Map<String, FeatureMatcherSetI> originalFilters;
 
   final JInternalFrame frame;
 
@@ -163,7 +163,7 @@ public class FeatureSettings extends JPanel
   /*
    * true when Feature Settings are updating from feature renderer
    */
-  private boolean handlingUpdate = false;
+  boolean handlingUpdate = false;
 
   /*
    * holds {featureCount, totalExtent} for each feature type
@@ -454,14 +454,14 @@ public class FeatureSettings extends JPanel
              * colour will have already been set in the FeatureRenderer
              */
             FeatureColourI fci = fr.getFeatureColours().get(type);
-            table.setValueAt(fci, rowSelected, 1);
+            table.setValueAt(fci, rowSelected, COLOUR_COLUMN);
             table.validate();
           }
           else
           {
             // probably the color chooser!
             table.setValueAt(new FeatureColour(colorChooser.getColor()),
-                    rowSelected, 1);
+                    rowSelected, COLOUR_COLUMN);
             table.validate();
             me.updateFeatureRenderer(
                     ((FeatureTableModel) table.getModel()).getData(),
@@ -1112,7 +1112,7 @@ public class FeatureSettings extends JPanel
    * @param data
    * @param visibleNew
    */
-  private void updateFeatureRenderer(Object[][] data, boolean visibleNew)
+  void updateFeatureRenderer(Object[][] data, boolean visibleNew)
   {
     FeatureSettingsBean[] rowData = getTableAsBeans(data);