svn commit: r12541 - trunk/src_new/org/argouml/ui/ActionSetMode.java

Author: tfmorris
Date: 2007-05-04 14:26:44-0700
New Revision: 12541

Modified:
   trunk/src_new/org/argouml/ui/ActionSetMode.java

Log:
Fix ActionSetMode icon loading

Modified: trunk/src_new/org/argouml/ui/ActionSetMode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ActionSetMode.java?view=diff&rev=12541&p1=trunk/src_new/org/argouml/ui/ActionSetMode.java&p2=trunk/src_new/org/argouml/ui/ActionSetMode.java&r1=12540&r2=12541
==============================================================================
--- trunk/src_new/org/argouml/ui/ActionSetMode.java	(original)
+++ trunk/src_new/org/argouml/ui/ActionSetMode.java	2007-05-04 14:26:44-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2003-2006 The Regents of the University of California. All
+// Copyright (c) 2003-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -30,6 +30,7 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
 
+import org.apache.log4j.Logger;
 import org.argouml.application.helpers.ResourceLoaderWrapper;
 import org.argouml.i18n.Translator;
 
@@ -39,6 +40,8 @@
  * @author Jeremy Jones
  */
 public class ActionSetMode extends org.tigris.gef.base.SetModeAction {
+    
+    private static final Logger LOG = Logger.getLogger(ActionSetMode.class);
 
     /**
      * The constructor.
@@ -65,8 +68,9 @@
      * @param name the name of the command that is the tooltip text.
      */
     public ActionSetMode(Class modeClass, String name) {
-        super(modeClass, ResourceLoaderWrapper.getImageBinding(name));
+        super(modeClass);
         putToolTip(name);
+        putIcon(name);
     }
 
     /**
@@ -79,6 +83,7 @@
     public ActionSetMode(Class modeClass, String name, String tooltipkey) {
         super(modeClass, name);
         putToolTip(tooltipkey);
+        putIcon(name);
     }
 
     /**
@@ -110,9 +115,10 @@
      * @param name the name of the command that is the tooltip text.
      */
     public ActionSetMode(Class modeClass, Hashtable modeArgs, String name) {
-    	super(modeClass, ResourceLoaderWrapper.getImageBinding(name));
+    	super(modeClass);
         this.modeArgs = modeArgs;
         putToolTip(name);
+        putIcon(name);
     }
 
     /**
@@ -136,9 +142,9 @@
      */
     public ActionSetMode(Class modeClass, String arg, Object value, 
             String name) {
-        super(modeClass, arg, value, ResourceLoaderWrapper
-                .getImageBinding(name));
+        super(modeClass, arg, value);
         putToolTip(name);
+        putIcon(name);
     }
 
     /**
@@ -168,4 +174,13 @@
     private void putToolTip(String key) {
         putValue(Action.SHORT_DESCRIPTION, Translator.localize(key));
     }
+    
+    private void putIcon(String key) {
+        ImageIcon icon = ResourceLoaderWrapper.lookupIcon(key);
+        if (icon != null) {
+            putValue(Action.SMALL_ICON, icon);
+        } else {
+            LOG.debug("Failed to find icon for key " + key);
+        }
+    }
 }