Author: tchemit Date: 2008-04-18 21:08:18 +0000 (Fri, 18 Apr 2008) New Revision: 586 Modified: trunk/lutinjaxx/core/pom.xml trunk/lutinjaxx/pom.xml trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: suppression de la dependance a lutinui (juste pour une methode helper)... Modified: trunk/lutinjaxx/core/pom.xml =================================================================== --- trunk/lutinjaxx/core/pom.xml 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/core/pom.xml 2008-04-18 21:08:18 UTC (rev 586) @@ -35,12 +35,7 @@ </plugins> </build> - <dependencies> - <dependency> - <groupId>org.codelutin.ui</groupId> - <artifactId>lutinui</artifactId> - <scope>compile</scope> - </dependency> + <dependencies> <!-- pour acceder aux BeansInfos swing via Introspector --> <dependency> <groupId>com.sun</groupId> Modified: trunk/lutinjaxx/pom.xml =================================================================== --- trunk/lutinjaxx/pom.xml 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/pom.xml 2008-04-18 21:08:18 UTC (rev 586) @@ -161,12 +161,8 @@ <artifactId>lutinutil</artifactId> <version>0.31-SNAPSHOT</version> </dependency> + <dependency> - <groupId>org.codelutin.ui</groupId> - <artifactId>lutinui</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>core</artifactId> <version>0.1-SNAPSHOT</version> @@ -181,7 +177,7 @@ <artifactId>swing</artifactId> <version>0.1-SNAPSHOT</version> </dependency> - <!-- pour acceder aux BeansInfos swing via Introspector --> + <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> @@ -189,7 +185,7 @@ <scope>system</scope> <systemPath>${java.home}/../lib/dt.jar</systemPath> </dependency> - <!-- pour utiliser javaHelp --> + <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> Modified: trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-04-18 20:58:50 UTC (rev 585) +++ trunk/lutinjaxx/runtime/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-04-18 21:08:18 UTC (rev 586) @@ -19,7 +19,6 @@ package jaxx.runtime.builder; import jaxx.runtime.JAXXObject; -import org.codelutin.ui.UIHelper; import jaxx.runtime.swing.JAXXToggleButton; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,6 +29,7 @@ import javax.swing.Action; import javax.swing.Icon; import javax.swing.JComboBox; +import javax.swing.ImageIcon; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -279,10 +279,10 @@ } if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + result.putValue(Action.SMALL_ICON, createImageIcon(anno.smallIcon())); } if (!anno.smallIcon2().isEmpty()) { - result.putValue(Action.SMALL_ICON + "2", UIHelper.createImageIcon(anno.smallIcon2())); + result.putValue(Action.SMALL_ICON + "2", createImageIcon(anno.smallIcon2())); } if (anno.mnemonic() != '\0') { @@ -315,7 +315,7 @@ result.putValue(Action.SHORT_DESCRIPTION, _(anno.shortDescription())); //} if (!anno.smallIcon().isEmpty()) { - result.putValue(Action.SMALL_ICON, UIHelper.createImageIcon(anno.smallIcon())); + result.putValue(Action.SMALL_ICON, createImageIcon(anno.smallIcon())); } if (anno.mnemonic() != '\0') { result.putValue(Action.MNEMONIC_KEY, anno.mnemonic()); @@ -374,4 +374,13 @@ public Set<Map.Entry<String, AbstractAction>> cacheEntrySet() { return cache.entrySet(); } + + 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); + } + } }