Changeset 8848

Timestamp:

2004-12-17T15:40:04+13:00 (19 years ago)

Author:

mdewsnip

Message:

Moved some collection tree specific stuff out of here and into CollectionTree. Oh, and fixed a big bug I just added into DragTree :-)

Location:

trunk/gli/src/org/greenstone/gatherer/gui/tree

Files:

• DragTree.java (modified) (1 diff)
• DragTreeCellRenderer.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -65 +65 @@
     public DragTree(String name, TreeModel model, boolean mixed_selection)
     {
-    super(model);
+    super();
     init(name, mixed_selection);
-
-    // Connection
-    setModel(model);
+    if (model != null) {
+        setModel(model);
+    }
     }
 
     public void init(String name, boolean mixed_selection) {
-    if(NO_DRAG_CURSOR == null) {
+    if (NO_DRAG_CURSOR == null) {
         NO_DRAG_CURSOR = DragSource.DefaultMoveNoDrop;
-        //Image image = (Utility.getImage("no_drag_cursor.gif")).getImage();
-        //Point hot_spot = new Point(1,1);
-        //NO_DRAG_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(image, hot_spot, "No_Drag_Cursor");
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTreeCellRenderer.java

@@ -46 +46 @@
 
 public class DragTreeCellRenderer
-    extends DefaultTreeCellRenderer {
-
-    private boolean in_focus = false;
+    extends DefaultTreeCellRenderer
+{
     private Color selection_background;
     private Color selection_foreground;
-
-    //static final private ImageIcon GREY_FOLDER = Utility.getImage("greyfolder.gif", true);
-    //static final private ImageIcon GREEN_FILE = Utility.getImage("greenfile.gif", true);
-    //static final private ImageIcon GREEN_FOLDER = Utility.getImage("greenfolder.gif", true);
 
     public DragTreeCellRenderer() {
@@ -69 +64 @@
 
     /** Configures the renderer based on the passed in components. */
-    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
-    Component tree_cell = null;
-    if(value instanceof FileNode) {
-        ///ystem.err.println("getTreeCellRendererComponent(" + value + ")");
+    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus)
+    {
+    // Rendering FileNodes
+    if (value instanceof FileNode) {
         FileNode node = (FileNode) value;
+        String node_text = node.toString();
 
-        String new_value = null;
-        if(Configuration.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC) && node.getFile() != null && !node.getAllowsChildren()) {
-        new_value = node.toString() + StaticStrings.SPACE_CHARACTER + StaticStrings.LBRACKET_CHARACTER + Utility.formatFileLength(node.getFile().length()) + StaticStrings.RBRACKET_CHARACTER;
-        }
-        else {
-        new_value = node.toString();
+        // Add file sizes if necessary
+        if (Configuration.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC) && node.getFile() != null && !node.getAllowsChildren()) {
+        node_text = node_text + StaticStrings.SPACE_CHARACTER + StaticStrings.LBRACKET_CHARACTER + Utility.formatFileLength(node.getFile().length()) + StaticStrings.RBRACKET_CHARACTER;
         }
 
-        tree_cell = (JLabel) super.getTreeCellRendererComponent(tree, new_value, sel, expanded, leaf, row, hasFocus);
+        return (JLabel) super.getTreeCellRendererComponent(tree, node_text, sel, expanded, leaf, row, hasFocus);
+    }
 
-        /*
-        if(node.getFile() == null || node.isFileSystemRoot()) {
-            ((JLabel)tree_cell).setIcon(GREY_FOLDER);
-        }
-        else if(node.isInCurrentCollection()) {
-            if(!node.getFile().isFile()) {
-            ((JLabel)tree_cell).setIcon(GREEN_FOLDER);
-            }
-            else {
-            ((JLabel)tree_cell).setIcon(GREEN_FILE);
-            }
-        }
-        */
-    }
-    else {
-        tree_cell = (JLabel) super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-    }
-    return tree_cell;
+    // Use default renderer for anything else
+    return (JLabel) super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
     }