Author: tchemit Date: 2008-07-24 18:47:27 +0000 (Thu, 24 Jul 2008) New Revision: 782 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java Log: use UIHelper Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 18:19:27 UTC (rev 781) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 18:47:27 UTC (rev 782) @@ -33,7 +33,6 @@ import javax.swing.AbstractButton; import javax.swing.Action; import javax.swing.Icon; -import javax.swing.ImageIcon; import javax.swing.JComboBox; import javax.swing.JComponent; import java.awt.event.ActionEvent; @@ -170,15 +169,6 @@ return result.toArray(new MyAbstractAction[result.size()]); } - public static ImageIcon createImageIcon(String path) { - java.net.URL imgURL = ActionFactory.class.getResource("/icons/" + path); - if (imgURL != null) { - return new ImageIcon(imgURL); - } else { - throw new RuntimeException("could not find icon " + path); - } - } - /** * @param actionKey le nom de l'action tel que d�finie dans le fichier * de mapping (sans le prefix action.) Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java 2008-07-24 18:19:27 UTC (rev 781) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java 2008-07-24 18:47:27 UTC (rev 782) @@ -16,7 +16,6 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.jaxx.action.ActionConfig; -import org.codelutin.jaxx.action.ActionFactory; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -43,7 +42,7 @@ action.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); //} if (!anno.smallIcon().isEmpty()) { - action.putValue(Action.SMALL_ICON, ActionFactory.createImageIcon(anno.smallIcon())); + action.putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(anno.smallIcon())); } if (anno.mnemonic() != '\0') { action.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java 2008-07-24 18:19:27 UTC (rev 781) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java 2008-07-24 18:47:27 UTC (rev 782) @@ -15,7 +15,6 @@ package org.codelutin.jaxx.action.initializer; import static org.codelutin.i18n.I18n._; -import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.ToggleActionConfig; import javax.swing.AbstractAction; @@ -52,10 +51,10 @@ } if (!anno.smallIcon().isEmpty()) { - action.putValue(Action.SMALL_ICON, ActionFactory.createImageIcon(anno.smallIcon())); + action.putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(anno.smallIcon())); } if (!anno.smallIcon2().isEmpty()) { - action.putValue(Action.SMALL_ICON + "2", ActionFactory.createImageIcon(anno.smallIcon2())); + action.putValue(Action.SMALL_ICON + "2", org.codelutin.jaxx.util.UIHelper.createImageIcon(anno.smallIcon2())); } if (anno.mnemonic() != '\0') {