Changeset 9996

Timestamp:

2005-06-01T14:12:40+12:00 (19 years ago)

Author:

kjdon

Message:

removed the text class variable - we no longer cache the string representation - it can get set wrong sometimes. changed getName to get the metadata name, and added getLevel to return the level string. comparesTo changed to just look at the level info, not the full string - we consider two levels the same if they have the same level, regardless of the meta name

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/Level.java (modified) (8 diffs)

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

@@ -42 +42 @@
     /** The Element this level object will source its information from. */
     private Element element;
-    /** A cached version of the string representation, for speed of painting (given toString() might be called several times during a list repaint). */
-    private String text;
 
     /** Constructor used only during DOMProxyListModel initialization. */
@@ -59 +57 @@
      * @param  name the name of this type as a String
      */
-    public Level(String name) {
-    element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
-    element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
-    text = null;
+    public Level(String level) {
+    this.element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CONTENT_ELEMENT);
+    this.element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, level);
     }
 
@@ -68 +65 @@
      * @param  object the other Object to compare to
      * @return <0 if this level should be before the given object, 0 if they are equal, and >0 if it should be after
+     * since we can only have one instance of a particular level, we don't need to look at the name when comparing.
      */
     public int compareTo(Object object) {
@@ -73 +71 @@
         return -1;
     }
-    return toString().compareTo(object.toString());
+    // hope we never compare a Level with something that is not a Level!
+    return getLevel().compareTo(((Level)object).getLevel());
     }
 
@@ -99 +98 @@
     }
 
-    /** Retrieve the name of this level.
-     * @return the name as a String
+    /** Retrieve the level.
+     * @return the level as a String
      */
-    public String getName() {
+    public String getLevel() {
     return element.getAttribute(CollectionConfiguration.NAME_ATTRIBUTE);
     }
 
-    /** Determine is this command has been assigned, either because it already existed in the collection configuration, or because it has been explicitly set by the user. Non-assigned entries imply they have been added by the GLI to ensure consistancy (and avoid NPE's!)
+    /** Retrieve the display name
+     */
+    public String getName() {
+    CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + getLevel(), false);
+    if(metadatum != null) {
+        return metadatum.getValue(CollectionMeta.TEXT);
+    }
+    return "";
+    }
+    
+   /** Determine is this command has been assigned, either because it already existed in the collection configuration, or because it has been explicitly set by the user. Non-assigned entries imply they have been added by the GLI to ensure consistancy (and avoid NPE's!)
      * @return true if this command has been assigned, false otherwise
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
@@ -129 +138 @@
     public void setElement(Element element) {
     this.element = element;
-    this.text = null;
     }
 
@@ -136 +144 @@
      * @see org.greenstone.gatherer.cdm.CollectionConfiguration
      */
-    public void setName(String name) {
+    public void setLevel(String level) {
     if(element != null) {
-        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, name);
-        this.text = null;
+        element.setAttribute(CollectionConfiguration.NAME_ATTRIBUTE, level);
     }
     }
@@ -148 +155 @@
      */
     public String toString() {
-    if(text == null) {
-        if(element == null) {
-        text = "#Error";
-        }
-        else {
-        String name = getName();
-        StringBuffer text_buffer = new StringBuffer(name);
-        CollectionMeta metadatum = CollectionDesignManager.collectionmeta_manager.getMetadatum(CollectionConfiguration.STOP_CHARACTER + name, false);
-        if(metadatum != null) {
-            text_buffer.append(" \"");
-            text_buffer.append(metadatum.getValue(CollectionMeta.TEXT));
-            text_buffer.append("\"");
-        }
-        text = text_buffer.toString();
-        text_buffer = null;
-        }
+    String text ="";
+    if(element == null) {
+        text = "#Error";
     }
+    else {
+        String level = getLevel();
+        StringBuffer text_buffer = new StringBuffer(level);
+        text_buffer.append(" \"");
+        text_buffer.append(getName());
+        text_buffer.append("\"");
+    
+        text = text_buffer.toString();
+        text_buffer = null;
+    }
+    
     return text;
     }