Author: dlanglais Date: 2010-03-14 06:42:23 +0100 (Sun, 14 Mar 2010) New Revision: 238 Log: Modification mineures. (getLocale() de la classe Main de MSM devenue static). Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-13 22:33:18 UTC (rev 237) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-14 05:42:23 UTC (rev 238) @@ -114,7 +114,7 @@ * Getter locale. * @return locale the current locale. */ - public Locale getLocale() { + public static Locale getLocale() { return locale; } Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 22:33:18 UTC (rev 237) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-14 05:42:23 UTC (rev 238) @@ -13,9 +13,14 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JTextArea; import javax.swing.SwingUtilities; +import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.mapstoragemanager.ui.MainUI; /** * * @author Dorian Langlais @@ -32,12 +37,18 @@ */ private static Locale locale = Locale.FRANCE; - /** - * Main to test the PluginManager alone. - * @param args args. - */ - public static void main(String ... args) { -//ApplicationEngine.getInstance().getPluginLoader().getAllPlugin(null); + private Main() { + + I18n.setInitializer(new DefaultI18nInitializer("msm-pluginmanager-i18n")); + I18n.init(locale); + + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + LOG.warn("Could not find nimbus look-and-feel"); + } + final PluginManager pluginManager = PluginManager.getInstance(); pluginManager.setVisible(true); @@ -48,53 +59,14 @@ pluginManager.setVisible(true); } }); - - JButton[] buttons = new JButton[20]; - for(int i = 0 ; i < buttons.length ; i++) { - final int actualI = i; - - buttons[i] = new JButton("test" + i); - buttons[i].setSize(100, 20); - buttons[i].addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - - JPanel pluginView = pluginManager.getPluginView(); - pluginView.setLayout(new BorderLayout()); - - pluginView.removeAll(); - JLabel titre; - pluginView.add(titre = new JLabel("nom plugin " + actualI), BorderLayout.PAGE_START); - - JPanel description = new JPanel(); - description.add(new JLabel(" ")); - description.add(new JLabel(" ")); - description.add(new JLabel("description plugin " + actualI)); - description.add(new JLabel("test" + actualI)); - description.add(new JLabel("test" + actualI)); - description.add(new JLabel("test" + actualI)); - pluginView.add(description, BorderLayout.CENTER); - - - JPanel buttons2 = new JPanel(); - buttons2.setLayout(new GridLayout(1,4)); - buttons2.add(new JButton("Activer")); - buttons2.add(new JButton("DesActiver")); - buttons2.add(new JButton("Charger")); - buttons2.add(new JButton("DéCharger")); - - pluginView.add(buttons2, BorderLayout.PAGE_END); - pluginView.updateUI(); - } - }); - - pluginManager.getPluginList().add(buttons[i]); - try { - Thread.sleep(100); - pluginManager.getPluginList().updateUI(); - } catch (InterruptedException ex) { - LOG.error(ex, ex); - } - } } + + + /** + * Main to test the PluginManager alone. + * @param args args. + */ + public static void main(String ... args) { + new Main(); + } } Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-13 22:33:18 UTC (rev 237) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-14 05:42:23 UTC (rev 238) @@ -68,7 +68,7 @@ JPanel description = new JPanel(); description.add(new JLabel(" ")); - description.add(new JLabel(pluginDescritpion)); + description.add(new JTextArea(pluginDescritpion)); pluginView.add(description, BorderLayout.CENTER);