PATCH-1559330: PHPDoc comments are garbled in function hover. Applied patch .

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.quantum.sql / src / com / quantum / view / bookmark / TreeNode.java

diff --git a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
index 7552995..e4130b0 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
+++ b/archive/net.sourceforge.phpeclipse.quantum.sql/src/com/quantum/view/bookmark/TreeNode.java
@@ -5,7 +5,7 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Vector;
 
-import com.quantum.QuantumPlugin;
+import com.quantum.ImageStore;
 import com.quantum.model.Bookmark;
 import com.quantum.model.BookmarkHolder;
 import com.quantum.model.NotConnectedException;
@@ -36,7 +36,7 @@ public abstract class TreeNode
        public abstract String getName();
 
     public Bookmark getBookmark() {
-        return getParent().getBookmark();
+        return getParent() == null ? null : getParent().getBookmark();
     }
     
     public String getLabelName() {
@@ -47,7 +47,7 @@ public abstract class TreeNode
         * @return an Image object to appear in the view, null if not found
         */
     public Image getImage() {
-       return QuantumPlugin.getImage(getImageName());
+       return ImageStore.getImage(getImageName());
     }
 
     /**
@@ -61,7 +61,7 @@ public abstract class TreeNode
      */
     public int compareTo(Object object) {
         TreeNode that = (TreeNode) object;
-        return this.getLabelName().compareTo(that.getLabelName());
+        return this.getLabelName().toLowerCase().compareTo(that.getLabelName().toLowerCase());
     }
     
     public String toString() {
@@ -99,6 +99,7 @@ public abstract class TreeNode
     protected void dispose() {
         this.disposed = true;
         removeAllChildren();
+//        this.parent = null;
     }
     protected void removeAllChildren() {
         for (Iterator i = this.children.iterator(); i.hasNext();) {
@@ -115,6 +116,7 @@ public abstract class TreeNode
         return null;
     }
     protected abstract void initializeChildren() throws SQLException, NotConnectedException;
+    
     public void reload() throws NotConnectedException, SQLException {
         if (isInitialized()) {
             initializeChildren();