Changeset 9192

Timestamp:

2005-02-25T14:57:52+13:00 (19 years ago)

Author:

mdewsnip

Message:

Was using a Troolean unnecessarily.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Subcollection.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/Subcollection.java

@@ -29 +29 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.StaticStrings;
-import org.greenstone.gatherer.util.Troolean;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -41 +40 @@
     implements Comparable, DOMProxyListEntry {
     /** A <i>boolean</i> which is <i>true</i> if the condition is an include one, <i>false</i> otherwise. */
-    private Troolean include = new Troolean();
+    private boolean include = true;
     /** The DOM Element this Subcollection is based upon. */
     private Element element = null;
@@ -75 +74 @@
     // Cache the details
     this.flags = flags;
-    this.include.set(include);
+    this.include = include;
     this.name = name;
     this.pattern = pattern;
@@ -179 +178 @@
      */
     public boolean isInclusive() {
-    if(!include.isDecided() && element != null) {
-        include.set(element.getAttribute(StaticStrings.TYPE_ATTRIBUTE).equals(StaticStrings.INCLUDE_STR));
-    }
-    return include.isTrue();
+    if (element != null) {
+        include = element.getAttribute(StaticStrings.TYPE_ATTRIBUTE).equals(StaticStrings.INCLUDE_STR);
+    }
+
+    return include;
     }
 
@@ -193 +193 @@
     public void setElement(Element element) {
     this.element = element;
-    include.reset();
+    include = true;
     flags = null;
     name = null;
@@ -213 +213 @@
     if(element != null) {
         // Change element
-        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, (new_include ? StaticStrings.INCLUDE_STR : StaticStrings.EXCLUDE_STR));
-        include.set(new_include);
+        include = new_include;
+        element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, (include ? StaticStrings.INCLUDE_STR : StaticStrings.EXCLUDE_STR));
         text = null;
     }