JAL-2843 save/restore colour feature by attribute, and feature filters, to Jalview...

[jalview.git] / src / jalview / schemabinding / version2 / FeatureMatcherSet.java

diff --git a/src/jalview/schemabinding/version2/FeatureMatcherSet.java b/src/jalview/schemabinding/version2/FeatureMatcherSet.java
index 893a30d..2d79a98 100644 (file)
--- a/src/jalview/schemabinding/version2/FeatureMatcherSet.java
+++ b/src/jalview/schemabinding/version2/FeatureMatcherSet.java
@@ -34,12 +34,12 @@ public class FeatureMatcherSet implements java.io.Serializable
   /**
    * Field _matchCondition.
    */
-  private jalview.schemabinding.version2.MatchCondition _matchCondition;
+  private MatchCondition _matchCondition;
 
   /**
    * Field _compoundMatcher.
    */
-  private jalview.schemabinding.version2.CompoundMatcher _compoundMatcher;
+  private CompoundMatcher _compoundMatcher;
 
   // ----------------/
   // - Constructors -/
@@ -70,7 +70,7 @@ public class FeatureMatcherSet implements java.io.Serializable
    * 
    * @return the value of field 'CompoundMatcher'.
    */
-  public jalview.schemabinding.version2.CompoundMatcher getCompoundMatcher()
+  public CompoundMatcher getCompoundMatcher()
   {
     return this._compoundMatcher;
   }
@@ -80,7 +80,7 @@ public class FeatureMatcherSet implements java.io.Serializable
    * 
    * @return the value of field 'MatchCondition'.
    */
-  public jalview.schemabinding.version2.MatchCondition getMatchCondition()
+  public MatchCondition getMatchCondition()
   {
     return this._matchCondition;
   }
@@ -145,8 +145,7 @@ public class FeatureMatcherSet implements java.io.Serializable
    * @param compoundMatcher
    *          the value of field 'compoundMatcher'.
    */
-  public void setCompoundMatcher(
-          final jalview.schemabinding.version2.CompoundMatcher compoundMatcher)
+  public void setCompoundMatcher(final CompoundMatcher compoundMatcher)
   {
     this._compoundMatcher = compoundMatcher;
     this._choiceValue = compoundMatcher;
@@ -158,8 +157,7 @@ public class FeatureMatcherSet implements java.io.Serializable
    * @param matchCondition
    *          the value of field 'matchCondition'.
    */
-  public void setMatchCondition(
-          final jalview.schemabinding.version2.MatchCondition matchCondition)
+  public void setMatchCondition(final MatchCondition matchCondition)
   {
     this._matchCondition = matchCondition;
     this._choiceValue = matchCondition;