JAL-3035 more das bits removed

[jalview.git] / src / jalview / schemabinding / version2 / descriptors / FeatureMatcherSetDescriptor.java

diff --git a/src/jalview/schemabinding/version2/descriptors/FeatureMatcherSetDescriptor.java b/src/jalview/schemabinding/version2/descriptors/FeatureMatcherSetDescriptor.java
index 0584eec..b3d19bb 100644 (file)
--- a/src/jalview/schemabinding/version2/descriptors/FeatureMatcherSetDescriptor.java
+++ b/src/jalview/schemabinding/version2/descriptors/FeatureMatcherSetDescriptor.java
@@ -7,11 +7,14 @@
 
 package jalview.schemabinding.version2.descriptors;
 
+import jalview.schemabinding.version2.CompoundMatcher;
+
 //---------------------------------/
 //- Imported classes and packages -/
 //---------------------------------/
 
 import jalview.schemabinding.version2.FeatureMatcherSet;
+import jalview.schemabinding.version2.MatchCondition;
 
 /**
  * Class FeatureMatcherSetDescriptor.
@@ -68,11 +71,11 @@ public class FeatureMatcherSetDescriptor
 
     // -- _matchCondition
     desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
-            jalview.schemabinding.version2.MatchCondition.class,
-            "_matchCondition", "matchCondition",
+            MatchCondition.class, "_matchCondition", "matchCondition",
             org.exolab.castor.xml.NodeType.Element);
     handler = new org.exolab.castor.xml.XMLFieldHandler()
     {
+      @Override
       public java.lang.Object getValue(java.lang.Object object)
               throws IllegalStateException
       {
@@ -80,23 +83,24 @@ public class FeatureMatcherSetDescriptor
         return target.getMatchCondition();
       }
 
+      @Override
       public void setValue(java.lang.Object object, java.lang.Object value)
               throws IllegalStateException, IllegalArgumentException
       {
         try
         {
           FeatureMatcherSet target = (FeatureMatcherSet) object;
-          target.setMatchCondition(
-                  (jalview.schemabinding.version2.MatchCondition) value);
+          target.setMatchCondition((MatchCondition) value);
         } catch (java.lang.Exception ex)
         {
           throw new IllegalStateException(ex.toString());
         }
       }
 
+      @Override
       public java.lang.Object newInstance(java.lang.Object parent)
       {
-        return new jalview.schemabinding.version2.MatchCondition();
+        return new MatchCondition();
       }
     };
     desc.setHandler(handler);
@@ -112,11 +116,11 @@ public class FeatureMatcherSetDescriptor
     desc.setValidator(fieldValidator);
     // -- _compoundMatcher
     desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(
-            jalview.schemabinding.version2.CompoundMatcher.class,
-            "_compoundMatcher", "compoundMatcher",
+            CompoundMatcher.class, "_compoundMatcher", "compoundMatcher",
             org.exolab.castor.xml.NodeType.Element);
     handler = new org.exolab.castor.xml.XMLFieldHandler()
     {
+      @Override
       public java.lang.Object getValue(java.lang.Object object)
               throws IllegalStateException
       {
@@ -124,23 +128,24 @@ public class FeatureMatcherSetDescriptor
         return target.getCompoundMatcher();
       }
 
+      @Override
       public void setValue(java.lang.Object object, java.lang.Object value)
               throws IllegalStateException, IllegalArgumentException
       {
         try
         {
           FeatureMatcherSet target = (FeatureMatcherSet) object;
-          target.setCompoundMatcher(
-                  (jalview.schemabinding.version2.CompoundMatcher) value);
+          target.setCompoundMatcher((CompoundMatcher) value);
         } catch (java.lang.Exception ex)
         {
           throw new IllegalStateException(ex.toString());
         }
       }
 
+      @Override
       public java.lang.Object newInstance(java.lang.Object parent)
       {
-        return new jalview.schemabinding.version2.CompoundMatcher();
+        return new CompoundMatcher();
       }
     };
     desc.setHandler(handler);
@@ -165,6 +170,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the access mode specified for this class.
    */
+  @Override
   public org.exolab.castor.mapping.AccessMode getAccessMode()
   {
     return null;
@@ -175,6 +181,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the identity field, null if this class has no identity.
    */
+  @Override
   public org.exolab.castor.mapping.FieldDescriptor getIdentity()
   {
     return super.getIdentity();
@@ -185,6 +192,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the Java class represented by this descriptor.
    */
+  @Override
   public java.lang.Class getJavaClass()
   {
     return jalview.schemabinding.version2.FeatureMatcherSet.class;
@@ -195,6 +203,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the namespace prefix to use when marshaling as XML.
    */
+  @Override
   public java.lang.String getNameSpacePrefix()
   {
     return _nsPrefix;
@@ -205,6 +214,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the namespace URI used when marshaling and unmarshaling as XML.
    */
+  @Override
   public java.lang.String getNameSpaceURI()
   {
     return _nsURI;
@@ -216,6 +226,7 @@ public class FeatureMatcherSetDescriptor
    * @return a specific validator for the class described by this
    *         ClassDescriptor.
    */
+  @Override
   public org.exolab.castor.xml.TypeValidator getValidator()
   {
     return this;
@@ -226,6 +237,7 @@ public class FeatureMatcherSetDescriptor
    * 
    * @return the XML Name for the Class being described.
    */
+  @Override
   public java.lang.String getXMLName()
   {
     return _xmlName;
@@ -237,6 +249,7 @@ public class FeatureMatcherSetDescriptor
    * @return true if XML schema definition of this Class is that of a global
    *         element or element with anonymous type definition.
    */
+  @Override
   public boolean isElementDefinition()
   {
     return _elementDefinition;