psmith      2003/08/28 16:56:57

  Modified:    src/java/org/apache/log4j/chainsaw
                        ReceiverTreeCellRenderer.java
  Log:
  When there is no Receivers defined, it was saying "(Unknow Type)::..." which is a 
bit silly
  
  Also ensured appropriate Icon is used, a couple of spots
  it was using inappropriate icons.
  
  Also added Tooltip text to each Receiver node so the user
  has a bit more idea about what they can do.
  
  Revision  Changes    Path
  1.2       +15 -4     
jakarta-log4j/src/java/org/apache/log4j/chainsaw/ReceiverTreeCellRenderer.java
  
  Index: ReceiverTreeCellRenderer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/ReceiverTreeCellRenderer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReceiverTreeCellRenderer.java     25 Jun 2003 04:05:22 -0000      1.1
  +++ ReceiverTreeCellRenderer.java     28 Aug 2003 23:56:57 -0000      1.2
  @@ -90,7 +90,8 @@
       DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
       Object o = node.getUserObject();
       setText(o.toString());
  -
  +    String tooltip = "";
  +    
       /**
        * Deal with Text
        */
  @@ -110,12 +111,15 @@
         }
   
         buf.append(" ").append("(")
  -         .append(networkBased.isActive() ? "running" : "inactive").append(")");
  +         .append(networkBased.isActive() ? "active" : "inactive").append(")");
   
         setText(buf.toString());
       } else if (
         o == ((ReceiversTreeModel) tree.getModel()).getRootNode().getUserObject()) {
         setText(o.toString());
  +    } else if (o instanceof String) {
  +      setText(o.toString());
  +      setIcon(null);
       } else {
         setText("(Unknown Type) :: " + o);
       }
  @@ -129,8 +133,15 @@
         if (networkBased.isActive()) {
           if ((o instanceof Pauseable) && !((Pauseable) o).isPaused()) {
             setIcon(activeReceiverIcon);
  -        } else {
  +          tooltip +="This item is active, and can be paused";
  +        } 
  +        else if ((o instanceof Pauseable) && ((Pauseable) o).isPaused()) {
             setIcon(inactiveReceiverIcon);
  +          tooltip += "This item is paused, and can be resumed";
  +        }
  +        else {
  +          setIcon(null);
  +          tooltip += " This item cannot be Paused/Resumed";
           }
         } else {
         }
  @@ -138,7 +149,7 @@
         o == ((ReceiversTreeModel) tree.getModel()).getRootNode().getUserObject()) {
         setIcon(rootIcon);
       }
  -
  +    setToolTipText(tooltip);
       return this;
     }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to