Author: dlanglais Date: 2010-03-15 19:35:39 +0100 (Mon, 15 Mar 2010) New Revision: 244 Log: Petite modification consistant ?\195?\160 stocker la vue/description d'un plugin afin de ne pas la r?\195?\169construire ?\195?\160 chaque fois que l'on souhaite la voir... Added: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-15 02:37:16 UTC (rev 243) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-15 18:35:39 UTC (rev 244) @@ -68,8 +68,6 @@ // Construction of the document. forEachTable(bigTable, database); - // print the jdom document. -// toSreen(); save(file); } @@ -141,45 +139,28 @@ String content; for (String key : keys) { -// try { - content = bigTable.get(tableName, columnName, key); - if (content != null && !"".equals(content)) { + content = bigTable.get(tableName, columnName, key); + if (content != null && !"".equals(content)) { - // new cell Element. - Element cell = new Element("cell"); - // new attribute which contain the cell key. - Attribute cellKeyAttr = new Attribute("key", key); - cell.setAttribute(cellKeyAttr); + // new cell Element. + Element cell = new Element("cell"); + // new attribute which contain the cell key. + Attribute cellKeyAttr = new Attribute("key", key); + cell.setAttribute(cellKeyAttr); - // we add the cell to the column. - column.addContent(cell); + // we add the cell to the column. + column.addContent(cell); - // new value Element. - Element value = new Element("value"); - value.setText(content); + // new value Element. + Element value = new Element("value"); + value.setText(content); - // we add the value to the cell. - cell.addContent(value); - } -// } catch (NoSuchElementException e) { -// LOG.trace(e, e); -// } + // we add the value to the cell. + cell.addContent(value); + } } } -// /** -// * toSreen(). -// * show the XML content on System.out -// */ -// void toSreen() { -// try { -// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); -// output.output(document, System.out); -// } catch (java.io.IOException e) { -// LOG.error(e, e); -// } -// } - /** * Method to save the file. * @param file the file in which we save the database. Modified: trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java =================================================================== --- trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-15 02:37:16 UTC (rev 243) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-15 18:35:39 UTC (rev 244) @@ -67,8 +67,6 @@ // Construction of the bigtable database. forEachTable(bigTable, racine); - // print the jdomDocument. -// toSreen(); } catch (IOException ex) { LOG.error(ex, ex); } @@ -140,19 +138,6 @@ } } -// /** -// * toSreen(). -// * show the XML content on System.out -// */ -// void toSreen() { -// try { -// XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); -// output.output(document, System.out); -// } catch (java.io.IOException e) { -// LOG.error(e, e); -// } -// } - /** * Method to load the jdom document of the file. * @param file the file from which the database is saved. @@ -185,10 +170,6 @@ */ @Override public final FileFilter getFileFilter() { -// if(fileFilter == null){ -// fileFilter = -// new FileNameExtensionFilter("Fichiers XML", "xml"); -// } return fileFilter; } 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-15 02:37:16 UTC (rev 243) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-15 18:35:39 UTC (rev 244) @@ -58,71 +58,77 @@ public void actionPerformed(ActionEvent e) { - JPanel pluginView = getPluginView(); - pluginView.setLayout(new BorderLayout()); + if (PluginView.get(pluginName) == null) { - pluginView.removeAll(); - JPanel titre = new JPanel(); - titre.add(new JLabel(pluginName), BorderLayout.CENTER); - pluginView.add(titre, BorderLayout.PAGE_START); + JPanel pluginView = new JPanel(new BorderLayout()); - JPanel description = new JPanel(); - description.add(new JLabel(" ")); - description.add(new JTextArea(pluginDescritpion)); - pluginView.add(description, BorderLayout.CENTER); + JPanel titre = new JPanel(); + titre.add(new JLabel(pluginName), BorderLayout.CENTER); + pluginView.add(titre, BorderLayout.PAGE_START); + JPanel description = new JPanel(); + description.add(new JLabel(" ")); + description.add(new JTextArea(pluginDescritpion)); + pluginView.add(description, BorderLayout.CENTER); - JPanel southButton = new JPanel(); - southButton.setLayout(new GridLayout(1,4)); - final JButton buttonActivate = new JButton(_("activate")); - final JButton buttonDesactivate = new JButton(_("desactivate")); - final JButton buttonLoad = new JButton(_("load")); - final JButton buttonUnload = new JButton(_("unload")); + JPanel southButton = new JPanel(); + southButton.setLayout(new GridLayout(1,4)); - buttonActivate.addActionListener(new ActionListener() { + final JButton buttonActivate = new JButton(_("activate")); + final JButton buttonDesactivate = new JButton(_("desactivate")); + final JButton buttonLoad = new JButton(_("load")); + final JButton buttonUnload = new JButton(_("unload")); - public void actionPerformed(ActionEvent e) { - //TODO; - buttonActivate.setEnabled(false); - buttonDesactivate.setEnabled(true); - } - }); + buttonActivate.addActionListener(new ActionListener() { - buttonDesactivate.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //TODO; + buttonActivate.setEnabled(false); + buttonDesactivate.setEnabled(true); + } + }); - public void actionPerformed(ActionEvent e) { - //TODO; - buttonActivate.setEnabled(true); - buttonDesactivate.setEnabled(false); - } - }); + buttonDesactivate.addActionListener(new ActionListener() { - buttonLoad.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //TODO; + buttonActivate.setEnabled(true); + buttonDesactivate.setEnabled(false); + } + }); - public void actionPerformed(ActionEvent e) { - plugin.load(); - buttonLoad.setEnabled(false); - buttonUnload.setEnabled(true); - } - }); + buttonLoad.addActionListener(new ActionListener() { - buttonUnload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + plugin.load(); + buttonLoad.setEnabled(false); + buttonUnload.setEnabled(true); + } + }); - public void actionPerformed(ActionEvent e) { - plugin.unload(); - buttonLoad.setEnabled(true); - buttonUnload.setEnabled(false); - } - }); + buttonUnload.addActionListener(new ActionListener() { - southButton.add(buttonActivate); - southButton.add(buttonDesactivate); - southButton.add(buttonLoad); - southButton.add(buttonUnload); + public void actionPerformed(ActionEvent e) { + plugin.unload(); + buttonLoad.setEnabled(true); + buttonUnload.setEnabled(false); + } + }); - pluginView.add(southButton, BorderLayout.PAGE_END); - pluginView.updateUI(); + southButton.add(buttonActivate); + southButton.add(buttonDesactivate); + southButton.add(buttonLoad); + southButton.add(buttonUnload); + + pluginView.add(southButton, BorderLayout.PAGE_END); + + PluginView.put(pluginName, pluginView); + + } + getPluginView().removeAll(); + getPluginView().add(PluginView.get(pluginName)); + getPluginView().updateUI(); } }); @@ -131,7 +137,6 @@ getPluginList().updateUI(); } - /** * {@inheritDoc} */ Added: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java (rev 0) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginView.java 2010-03-15 18:35:39 UTC (rev 244) @@ -0,0 +1,32 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.plugins.pluginmanager; + +import java.util.HashMap; +import java.util.Map; +import javax.swing.JPanel; + +/** + * + * @author Dorian Langlais + */ +public class PluginView { + + private static final Map<String, JPanel> pluginViews + = new HashMap<String, JPanel>(); + +// public PluginView() { +// pluginViews = new HashMap<String, JPanel>(); +// } + + public static void put(String pluginName, JPanel pluginView) { + pluginViews.put(pluginName, pluginView); + } + + public static JPanel get(String pluginName) { + return pluginViews.get(pluginName); + } +}