X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=0c4cd56cb2966d18e66ce9daf73992c586018752;hb=ef14d83cfe8ca0bb2271d50d638516cdc90c2b8b;hp=2b3688fdc75895996ea72b3cf795bd0f459f3175;hpb=07108e505ff923f3b5135ffbdbb79259fe53432e;p=jalview.git

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 2b3688f..0c4cd56 100644
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -30,6 +30,8 @@ import jalview.api.FeatureSettingsControllerI;
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
+import jalview.datamodel.features.FeatureMatcherSet;
+import jalview.datamodel.features.FeatureMatcherSetI;
 import jalview.gui.Help.HelpId;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
@@ -39,8 +41,6 @@ import jalview.util.Format;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.QuickSort;
-import jalview.util.matcher.KeyedMatcherSet;
-import jalview.util.matcher.KeyedMatcherSetI;
 import jalview.viewmodel.AlignmentViewport;
 import jalview.viewmodel.seqfeatures.FeatureRendererModel.FeatureSettingsBean;
 import jalview.ws.DasSequenceFeatureFetcher;
@@ -133,7 +133,7 @@ public class FeatureSettings extends JPanel
 
   private float originalTransparency;
 
-  private Map<String, KeyedMatcherSetI> originalFilters;
+  private Map<String, FeatureMatcherSetI> originalFilters;
 
   final JInternalFrame frame;
 
@@ -210,7 +210,7 @@ public class FeatureSettings extends JPanel
           break;
         case FILTER_COLUMN:
           int row = table.rowAtPoint(e.getPoint());
-          KeyedMatcherSet o = (KeyedMatcherSet) table.getValueAt(row,
+          FeatureMatcherSet o = (FeatureMatcherSet) table.getValueAt(row,
                   column);
           tip = o.isEmpty()
                   ? MessageManager.getString("label.filters_tooltip")
@@ -231,8 +231,8 @@ public class FeatureSettings extends JPanel
     table.setDefaultEditor(FeatureColour.class, new ColorEditor(this));
     table.setDefaultRenderer(FeatureColour.class, new ColorRenderer());
 
-    table.setDefaultEditor(KeyedMatcherSet.class, new FilterEditor(this));
-    table.setDefaultRenderer(KeyedMatcherSet.class, new FilterRenderer());
+    table.setDefaultEditor(FeatureMatcherSet.class, new FilterEditor(this));
+    table.setDefaultRenderer(FeatureMatcherSet.class, new FilterRenderer());
 
     TableColumn colourColumn = new TableColumn(COLOUR_COLUMN, 75,
             new ColorRenderer(), new ColorEditor(this));
@@ -674,9 +674,9 @@ public class FeatureSettings extends JPanel
 
         data[dataIndex][TYPE_COLUMN] = type;
         data[dataIndex][COLOUR_COLUMN] = fr.getFeatureStyle(type);
-        KeyedMatcherSetI featureFilter = fr.getFeatureFilter(type);
+        FeatureMatcherSetI featureFilter = fr.getFeatureFilter(type);
         data[dataIndex][FILTER_COLUMN] = featureFilter == null
-                ? new KeyedMatcherSet()
+                ? new FeatureMatcherSet()
                 : featureFilter;
         data[dataIndex][SHOW_COLUMN] = new Boolean(
                 af.getViewport().getFeaturesDisplayed().isVisible(type));
@@ -701,9 +701,9 @@ public class FeatureSettings extends JPanel
         fr.clearRenderOrder();
         return;
       }
-      KeyedMatcherSetI featureFilter = fr.getFeatureFilter(type);
+      FeatureMatcherSetI featureFilter = fr.getFeatureFilter(type);
       data[dataIndex][FILTER_COLUMN] = featureFilter == null
-              ? new KeyedMatcherSet()
+              ? new FeatureMatcherSet()
               : featureFilter;
       data[dataIndex][SHOW_COLUMN] = new Boolean(true);
       dataIndex++;
@@ -1120,7 +1120,7 @@ public class FeatureSettings extends JPanel
     {
       String type = (String) data[i][TYPE_COLUMN];
       FeatureColourI colour = (FeatureColourI) data[i][COLOUR_COLUMN];
-      KeyedMatcherSetI theFilter = (KeyedMatcherSetI) data[i][FILTER_COLUMN];
+      FeatureMatcherSetI theFilter = (FeatureMatcherSetI) data[i][FILTER_COLUMN];
       Boolean isShown = (Boolean) data[i][SHOW_COLUMN];
       rowData[i] = new FeatureSettingsBean(type, colour, theFilter,
               isShown);
@@ -1674,7 +1674,7 @@ public class FeatureSettings extends JPanel
             Object filter, boolean isSelected, boolean hasFocus, int row,
             int column)
     {
-      KeyedMatcherSetI theFilter = (KeyedMatcherSetI) filter;
+      FeatureMatcherSetI theFilter = (FeatureMatcherSetI) filter;
       setOpaque(true);
       String asText = theFilter.toString();
       setBackground(tbl.getBackground());
@@ -1886,10 +1886,10 @@ public class FeatureSettings extends JPanel
            * update table data without triggering updateFeatureRenderer
            */
           currentColor = fr.getFeatureColours().get(type);
-          KeyedMatcherSetI currentFilter = me.fr.getFeatureFilter(type);
+          FeatureMatcherSetI currentFilter = me.fr.getFeatureFilter(type);
           if (currentFilter == null)
           {
-            currentFilter = new KeyedMatcherSet();
+            currentFilter = new FeatureMatcherSet();
           }
           Object[] data = ((FeatureTableModel) table.getModel())
                   .getData()[rowSelected];
@@ -1948,7 +1948,7 @@ public class FeatureSettings extends JPanel
   {
     FeatureSettings me;
 
-    KeyedMatcherSetI currentFilter;
+    FeatureMatcherSetI currentFilter;
 
     Point lastLocation;
 
@@ -2003,7 +2003,7 @@ public class FeatureSettings extends JPanel
         currentFilter = me.fr.getFeatureFilter(type);
         if (currentFilter == null)
         {
-          currentFilter = new KeyedMatcherSet();
+          currentFilter = new FeatureMatcherSet();
         }
         Object[] data = ((FeatureTableModel) table.getModel())
                 .getData()[rowSelected];
@@ -2024,7 +2024,7 @@ public class FeatureSettings extends JPanel
     public Component getTableCellEditorComponent(JTable theTable, Object value,
             boolean isSelected, int row, int column)
     {
-      currentFilter = (KeyedMatcherSetI) value;
+      currentFilter = (FeatureMatcherSetI) value;
       this.rowSelected = row;
       type = me.table.getValueAt(row, TYPE_COLUMN).toString();
       button.setOpaque(true);