- Mapstoragemanager-commits - mailman.cloud.codelutin.com

r230 - trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 13, 2010

March 13, 2010

Author: dlanglais Date: 2010-03-13 03:19:17 +0100 (Sat, 13 Mar 2010) New Revision: 230 Log: Premier jet de quelque chose d'int?\195?\169ressant pour le pluginmanager (lancer le main donne un petit aper?\195?\167u). 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 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-12 23:57:42 UTC (rev 229) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 02:19:17 UTC (rev 230) @@ -5,11 +5,22 @@ package org.nuiton.mapstoragemanager.plugins.pluginmanager; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.Locale; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSeparator; import javax.swing.SwingUtilities; +import jaxx.runtime.swing.Item; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - /** * * @author Dorian Langlais @@ -28,15 +39,66 @@ public static void main(String ... args) { - final PluginManager ui = PluginManager.getInstance(); - ui.setVisible(true); + final PluginManager pluginManager = PluginManager.getInstance(); + pluginManager.setVisible(true); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - ui.setVisible(true); + 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 panel = new JPanel(); +// panel.add(new JLabel("test" + actualI)); + + 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(" ")); +// pluginView.add(new JSeparator()); + 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); + } + } } } 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-12 23:57:42 UTC (rev 229) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-13 02:19:17 UTC (rev 230) @@ -37,20 +37,12 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' id='mainPanel'> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='100'> <JScrollPane> - <JPanel layout='{new BorderLayout()}'> - <JPanel id='sdf1' constraints='BorderLayout.NORTH'/> - <JPanel id='sdf2' constraints='BorderLayout.CENTER'/> - <JPanel id='sdf3' constraints='BorderLayout.SOUTH'/> - </JPanel> + <VBox layout='{new GridLayout(0,1)}' id='pluginList' /> </JScrollPane> <JScrollPane> - <JPanel layout='{new BorderLayout()}'> - <JPanel id='tableName' constraints='BorderLayout.NORTH'/> - <JPanel id='tableContent' constraints='BorderLayout.CENTER'/> - <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/> - </JPanel> + <JPanel layout='{new BoxLayout(pluginView, BoxLayout.PAGE_AXIS)}' id='pluginView' /> </JScrollPane> </JSplitPane> </JPanel>

1 0

March 12, 2010

Author: dlanglais Date: 2010-03-13 00:57:42 +0100 (Sat, 13 Mar 2010) New Revision: 229 Log: Commencement du plugin PluginManager en utilisant Jaxx. - La frame contient un JSplitPane : - la partie gauche listera les plugins ; - la partie droit affichera les informations sur le plugin s?\195?\169l?\195?\169ctionn?\195?\169 dans la partie gauche (activation/d?\195?\169sactivation, chargement/d?\195?\169chargement...) ; - le menu "charger plugin" permettra d'aller chercher un plugin. Added: trunk/msm-pluginmanager/ trunk/msm-pluginmanager/LICENSE.txt trunk/msm-pluginmanager/README.txt trunk/msm-pluginmanager/changelog.txt trunk/msm-pluginmanager/pom.xml trunk/msm-pluginmanager/src/ trunk/msm-pluginmanager/src/main/ trunk/msm-pluginmanager/src/main/java/ trunk/msm-pluginmanager/src/main/java/org/ trunk/msm-pluginmanager/src/main/java/org/nuiton/ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/ 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.css trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx trunk/msm-pluginmanager/src/main/resources/ trunk/msm-pluginmanager/src/main/resources/i18n/ trunk/msm-pluginmanager/src/main/resources/i18n/msm-pluginmanager-fr_FR.properties trunk/msm-pluginmanager/src/test/ Modified: trunk/pom.xml Added: trunk/msm-pluginmanager/LICENSE.txt =================================================================== --- trunk/msm-pluginmanager/LICENSE.txt (rev 0) +++ trunk/msm-pluginmanager/LICENSE.txt 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/msm-pluginmanager/changelog.txt =================================================================== --- trunk/msm-pluginmanager/changelog.txt (rev 0) +++ trunk/msm-pluginmanager/changelog.txt 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,2 @@ +Changelog is not any longer maintained, please refer to the release note : + http://maven-site.nuiton.org/mapstoragemanager/changes-report.html Added: trunk/msm-pluginmanager/pom.xml =================================================================== --- trunk/msm-pluginmanager/pom.xml (rev 0) +++ trunk/msm-pluginmanager/pom.xml 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,291 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +  + <repositories> + <repository> + <id>org.nuiton</id> + <url>http://maven.nuiton.org/release</url> + </repository> + </repositories> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mapstoragemanager</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton</groupId> + <artifactId>msm-pluginmanager</artifactId> + <version>0.1-SNAPSHOT</version> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>msm</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + +  + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>MSM-PluginManager</name> + + <description>Plugin to manage plugins in the MapStorageManager application. + </description> + <inceptionYear>2010</inceptionYear> + + <developers> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>fgilet</id> + <name>Florent Gilet</name> + <email>florent.gilet(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>gcrieloue</id> + <name>Gilles Crieloue</name> + <email>gilles.crieloue(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>afages</id> + <name>Amaury Fages</name> + <email>amaury.fages(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>dlanglais</id> + <name>Dorian langlais</name> + <email>dorain.langlais(a)etu.univ-nantes.fr</email> + <organization>Université de nantes</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + +  +  +  + <packaging>jar</packaging> + + <build> + +  + + <pluginManagement> + <plugins> + +  + +  + +  +  + + </plugins> + </pluginManagement> + <plugins> + +  + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <silent>true</silent> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.2</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + </plugins> + </build> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> + + + + + + + + + + + Added: 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 (rev 0) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,42 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.plugins.pluginmanager; + +import java.util.Locale; +import javax.swing.SwingUtilities; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * @author Dorian Langlais + */ +public class Main { + + /** + * Logger. + */ + private static final Log LOG = LogFactory.getLog(Main.class); + + /** + * Locale. + */ + private static Locale locale = Locale.FRANCE; + + public static void main(String ... args) { + + final PluginManager ui = PluginManager.getInstance(); + ui.setVisible(true); + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + ui.setVisible(true); + } + }); + } +} Added: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.css =================================================================== --- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.css (rev 0) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.css 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,56 @@ +/** + * *##% observe-swing + * Copyright (C) 2008 - 2009 IRD + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* +*/ + +Application { + lookAndFeel: system; + locationRelativeTo: {null}; + resizable: true; +} + +#menuPlugin { + text:"mapstoragemanager.action.plugin"; + toolTipText:"mapstoragemanager.action.plugin.tip"; + mnemonic:P; +} + +#menuPluginLoad { + text:"mapstoragemanager.action.pluginload"; + toolTipText:"mapstoragemanager.action.pluginload.tip"; + mnemonic:A; +} + +#menuPluginShow { + text:"mapstoragemanager.action.pluginshow"; + toolTipText:"mapstoragemanager.action.pluginshow.tip"; + mnemonic:O; +} + +#pluginManagerFrame { + title:"Plugin Manager"; +} + +JLabel.boldUnderline { + font-weight: bold; +} + +JSplitPane { + oneTouchExpandable:true; + continuousLayout:true; + dividerSize:6; +} Added: 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 (rev 0) +++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-12 23:57:42 UTC (rev 229) @@ -0,0 +1,58 @@ +<Application id='pluginManagerFrame' width='500' height='400'> + +  + <script> + <![CDATA[ + +/** + * classe instance (singleton pattern). + */ +private static PluginManager instance = null; + +/** + * getInstance method (singleton pattern). + * @return instance of the class + */ +public static PluginManager getInstance() { + if (instance == null){ + instance = new PluginManager(); + } + return instance; +} + ]]> + </script> + +  + <style source='PluginManager.css'/> + +  + + <JMenuBar> + + <JMenu id='menuPlugin'> + <JMenuItem id='menuPluginLoad'/> + <JMenuItem id='menuPluginShow'/> + </JMenu> + </JMenuBar> + + <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}' id='mainPanel'> + <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > + <JScrollPane> + <JPanel layout='{new BorderLayout()}'> + <JPanel id='sdf1' constraints='BorderLayout.NORTH'/> + <JPanel id='sdf2' constraints='BorderLayout.CENTER'/> + <JPanel id='sdf3' constraints='BorderLayout.SOUTH'/> + </JPanel> + </JScrollPane> + <JScrollPane> + <JPanel layout='{new BorderLayout()}'> + <JPanel id='tableName' constraints='BorderLayout.NORTH'/> + <JPanel id='tableContent' constraints='BorderLayout.CENTER'/> + <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/> + </JPanel> + </JScrollPane> + </JSplitPane> + </JPanel> + </JPanel> +</Application> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 22:56:48 UTC (rev 228) +++ trunk/pom.xml 2010-03-12 23:57:42 UTC (rev 229) @@ -24,6 +24,7 @@ <module>msm-fromtoXML</module> <module>msm-fromtoXPP3</module> <module>msm-monitoring-plugins</module> + <module>msm-pluginmanager</module> </modules>

1 0

r228 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 23:56:48 +0100 (Fri, 12 Mar 2010) New Revision: 228 Log: Modification : - la d?\195?\169connexion d'une base d?\195?\169sactive le sous-menu "Fichier->D?\195?\169connexion". Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 22:47:04 UTC (rev 227) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 22:56:48 UTC (rev 228) @@ -134,6 +134,7 @@ */ public void disconnection() { MainUI ui = MainUI.getInstance(); + ui.getMenuDisconnect().setEnabled(false); setBigTable(null); clean(ui); }

1 0

r227 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/core msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm/src/main/java/org/nuiton/mapstoragemanager/ui msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/j
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 23:47:04 +0100 (Fri, 12 Mar 2010) New Revision: 227 Log: Nettoyage du code : - suppression de code comment?\195?\169 dans MainUI.jaxx (ex toolBar, JInternalFrame import et export) ; - MainUI.jaxx : renommage des "nouveaux" menu (...Bis), implique renommage des accesseurs et donc renommages dans les classes appelant ces fonctions... - suppression de code comment?\195?\169 dans ApplicationEngine (fonctions utilis?\195?\169es par MainUI.jaxx par exemple)... Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 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-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/core/PluginLoader.java 2010-03-12 22:47:04 UTC (rev 227) @@ -56,7 +56,9 @@ classLoader); for (File file : new File(pluginsFolderPath).listFiles()) { - loadPlugin(file); + if (file.getAbsolutePath().endsWith(".jar")) { + loadPlugin(file); + } } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-12 22:47:04 UTC (rev 227) @@ -35,6 +35,10 @@ * map data. */ private Map<String, String> mapData = new HashMap<String, String>(); + /** + * MenuItemBigTable. + */ + private static JMenuItem menuItemConnect; @Override public final boolean connect(final Properties properties) { @@ -170,16 +174,21 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + menuConnect.add(menuItemConnect); if (!menuConnect.isEnabled()) { menuConnect.setEnabled(true); @@ -191,24 +200,12 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); } - - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-12 22:47:04 UTC (rev 227) @@ -30,12 +30,6 @@ public static MainUI getInstance() { if (instance == null){ instance = new MainUI(); - for (Plugin btPlugin : instance.getEngine().getBigTableLoader().getAllPlugin(BigTable.class)) { - String btName = btPlugin.getPluginName(); - jaxx.runtime.swing.Item bigTableItem = - new jaxx.runtime.swing.Item(btName, null, btName, true); - instance.getNameBase().addItem(bigTableItem); - } } return instance; } @@ -95,14 +89,6 @@ m.start(); } -public void doActionPerformed__on__menuImport2(java.awt.event.ActionEvent event) { - engine.showImportFrame(); -} - -public void doActionPerformed__on__menuExport2(java.awt.event.ActionEvent event) { - engine.showExportFrame(); -} - /** * Test. */ @@ -120,19 +106,12 @@ <JMenuBar> <JMenu id='menuFile'> -  - <JMenu id='menuConnectBis' enabled='false'/> + <JMenu id='menuConnect' enabled='false'/> <JMenuItem id='menuDisconnect' enabled='false' - onActionPerformed='engine.disposeToolBar()'/> + onActionPerformed='engine.disconnection()'/> <JSeparator/> -  - <JMenu id='menuImportBis' enabled='false'/> - <JMenu id='menuExportBis' enabled='false'/> + <JMenu id='menuImport' enabled='false'/> + <JMenu id='menuExport' enabled='false'/> <JSeparator/> <JMenuItem id='menuExit' onActionPerformed='engine.close()'/> @@ -171,38 +150,6 @@ <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel layout='{new BorderLayout()}' id='mainPanel'> - <JToolBar id='toolBar' constraints='BorderLayout.NORTH' opaque='true' > - <JLabel text="name base :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='nameBase' onActionPerformed='engine.doSomething()' > - <item value='OurHashMap' selected='true'/> - </JAXXComboBox> - <JLabel text="login :" actionIcon='login_16' styleClass='boldUnderline'/> - <JTextField id='login'/> - <JLabel text="password :" actionIcon='password_16' styleClass='boldUnderline'/> - <JPasswordField id='password'/> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.connection()'/> - </JToolBar> - - <JInternalFrame id='importFrame' title="Import Database" width='300' height='60' resizable='false' visible='false' opaque='true' > - <JPanel id='importPanel'> - <JLabel text="Importer :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='importer' onActionPerformed='engine.doSomething()' > - <item value=' ' selected='true'/> - </JAXXComboBox> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.importBase()'/> - </JPanel> - </JInternalFrame> - - <JInternalFrame id='exportFrame' title="Export Database" width='300' height='60' resizable='false' visible='false' opaque='true' > - <JPanel id='exportPanel'> - <JLabel text="Exporter :" actionIcon='database_16' styleClass='boldUnderline' /> - <JAXXComboBox id='exporter' onActionPerformed='engine.doSomething()' > - <item value=' ' selected='true'/> - </JAXXComboBox> - <JButton text="ok" actionIcon='ok_16' onActionPerformed='engine.exportBase()'/> - </JPanel> - </JInternalFrame> - <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='200' > <JScrollPane> <JTree id='navigation' Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 22:47:04 UTC (rev 227) @@ -13,7 +13,6 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import jaxx.runtime.swing.ErrorDialogUI; -import jaxx.runtime.swing.Item; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.mapstoragemanager.Main; @@ -40,14 +39,6 @@ */ private BigTable bigTable; /** - * Importer. - */ -// private Importer importer; - /** - * Exporter. - */ -// private Exporter exporter; - /** * classe instance (singleton pattern). */ private static ApplicationEngine instance = null; @@ -118,66 +109,6 @@ pluginLoader.loadPlugin(pluginPath); LOG.info("getAllPluginNames : " + pluginLoader.getAllPluginNames()); - -// MainUI ui = MainUI.getInstance(); -// for (Plugin btPlugin : pluginLoader.getAllPlugin(BigTable.class)) { -// final String btName = btPlugin.getPluginName(); -// jaxx.runtime.swing.Item bigTableItem = -// new jaxx.runtime.swing.Item(btName, null, btName, true); -// ui.getNameBase().addItem(bigTableItem); -// ui.getNameBase().setSelectedItem(bigTableItem); -// -// JMenuItem menuItem = new JMenuItem(btName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// connection(btName); -// } -// }); -// ui.getMenuConnectBis().add(menuItem); -// ui.getMenuConnectBis().setEnabled(true); -// } -// for (Plugin imPlugin : pluginLoader.getAllPlugin(Importer.class)) { -// final String imName = imPlugin.getPluginName(); -//// jaxx.runtime.swing.Item importerItem = -//// new jaxx.runtime.swing.Item(imName, null, imName, true); -//// ui.getImporter().addItem(importerItem); -//// ui.getImporter().setSelectedItem(importerItem); -// -// JMenuItem menuItem = new JMenuItem(imName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// importBase(imName); -// } -// }); -// ui.getMenuImportBis().add(menuItem); -// ui.getMenuImportBis().setEnabled(true); -// } -// for (Plugin exPlugin : pluginLoader.getAllPlugin(Exporter.class)) { -// final String exName = exPlugin.getPluginName(); -//// jaxx.runtime.swing.Item exporterItem = -//// new jaxx.runtime.swing.Item(exName, null, exName, true); -//// ui.getExporter().addItem(exporterItem); -//// ui.getExporter().setSelectedItem(exporterItem); -// -// JMenuItem menuItem = new JMenuItem(exName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// exportBase(exName); -// } -// }); -// ui.getMenuExportBis().add(menuItem); -// ui.getMenuExportBis().setEnabled(true); -// } -// for (Plugin exPlugin : pluginLoader.getAllPlugin(Monitoring.class)) { -// Monitoring monitor = (Monitoring) exPlugin; -// monitor.display(); -// } } } @@ -199,40 +130,11 @@ } /** - * Show toolBar in order to connect. + * Disconnect BigTable. */ - public void showToolBar() { + public void disconnection() { MainUI ui = MainUI.getInstance(); - ui.getToolBar().setVisible(true); - } - - /** - * Show importBar in order to connect. - */ - public void showImportFrame() { - LOG.info("showImportFrame"); - MainUI ui = MainUI.getInstance(); - boolean visible = ui.getImportFrame().isVisible(); - ui.getImportFrame().setVisible(!visible); - } - - /** - * Show exportBar in order to connect. - */ - public void showExportFrame() { - LOG.info("showExportBar"); - MainUI ui = MainUI.getInstance(); - boolean visible = ui.getExportFrame().isVisible(); - ui.getExportFrame().setVisible(!visible); - } - - /** - * Hide toolBar in order to disconnect. - */ - public void disposeToolBar() { - MainUI ui = MainUI.getInstance(); setBigTable(null); - ui.getToolBar().setVisible(false); clean(ui); } @@ -248,76 +150,6 @@ /** * Try to connect the user to a database. */ - public void connection() { - - MainUI ui = MainUI.getInstance(); -// -// //update menu -// ui.getMenuDisconnect().setEnabled(true); - - Item selectedItems = ui.getNameBase().getSelectedJaxxItem(); - String nameBase = selectedItems.getValue().toString(); - - this.connection(nameBase); -// String login = ui.getLogin().getText(); -// char[] password = ui.getPassword().getPassword(); -// -// LOG.info("nameBase: " + nameBase -// + " login: " + login -// + " mdp: " + password); -// if ("OurHashMap".equals(nameBase)) { -// bigTable = new OurHashMap2(); -// } else { -// bigTable = (BigTable) pluginLoader.getPlugin(nameBase); -// } -// -// { -// bigTable.createTable("table1"); -// bigTable.createTable("table2"); -// bigTable.createColumn("table1", "column1"); -// bigTable.createColumn("table1", "column2"); -// bigTable.createColumn("table2", "column3"); -// bigTable.createColumn("table2", "column4"); -// bigTable.createColumn("table2", "column5"); -// -// bigTable.put("table1", "column1", "1", "content1"); -// bigTable.put("table1", "column1", "2", "content2"); -// bigTable.put("table1", "column2", "3", "content3"); -// bigTable.put("table1", "column2", "4", "content4"); -// -// bigTable.put("table2", "column3", "5", "content5"); -// bigTable.put("table2", "column3", "6", "content6"); -// bigTable.put("table2", "column4", "7", "content7"); -// bigTable.put("table2", "column4", "8", "content8"); -// bigTable.put("table2", "column5", "9", "content9"); -// bigTable.put("table2", "column5", "10", "content10"); -// } -// -// //connection verification -// boolean goodUse = true; -// goodUse = bigTable.connect(new Properties()); -// -// if (goodUse) { -// -// //update tree -// uptableNavigationTree(ui.getNavigation(), nameBase); -// -// String connexionOk = _("connectionValid"); -// ui.displayMessage(connexionOk, 0); -// ui.getNavigation().repaint(); -// ui.getNavigation().revalidate(); -// } else { -// //display error -// String connexionNok = _("connectionError"); -// ui.displayMessage(connexionNok, 2); -// JOptionPane.showMessageDialog(null, _("connectionError")); -// } - - } - - /** - * Try to connect the user to a database. - */ public void connection(String nameBase) { int response = 0; @@ -345,28 +177,6 @@ bigTable = (BigTable) pluginLoader.getPlugin(nameBase); -// { -// bigTable.createTable("table1"); -// bigTable.createTable("table2"); -// bigTable.createColumn("table1", "column1"); -// bigTable.createColumn("table1", "column2"); -// bigTable.createColumn("table2", "column3"); -// bigTable.createColumn("table2", "column4"); -// bigTable.createColumn("table2", "column5"); -// -// bigTable.put("table1", "column1", "1", "content1"); -// bigTable.put("table1", "column1", "2", "content2"); -// bigTable.put("table1", "column2", "3", "content3"); -// bigTable.put("table1", "column2", "4", "content4"); -// -// bigTable.put("table2", "column3", "5", "content5"); -// bigTable.put("table2", "column3", "6", "content6"); -// bigTable.put("table2", "column4", "7", "content7"); -// bigTable.put("table2", "column4", "8", "content8"); -// bigTable.put("table2", "column5", "9", "content9"); -// bigTable.put("table2", "column5", "10", "content10"); -// } - //connection verification boolean goodUse = true; goodUse = bigTable.connect(new Properties()); @@ -515,72 +325,6 @@ /** * Import database from a file. - */ - public void importBase() { - - /** Get importer plugin. */ - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getImporter().getSelectedJaxxItem(); - String importerName = selectedItem.getValue().toString(); - - this.importBase(importerName); -// Importer importer = (Importer) pluginLoader.getPlugin(importerName); -// -// /** Create FileChooser and set FileFilter. */ -// JFileChooser jfc = new JFileChooser(lastPath); -// jfc.setFileFilter(importer.getFileFilter()); -// -// /** ShowOpenDialog and get the return value. */ -// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); -// -// if( JFileChooser.APPROVE_OPTION == jfcReturn ) { -// -// lastPath = jfc.getSelectedFile().getAbsolutePath(); -// -// File importFile = jfc.getSelectedFile(); -// LOG.info("chosen file for import : " + importFile.getPath()); -// -// /** Import. */ -// importer.importFrom(bigTable, importFile); -// clean(ui); -// uptableNavigationTree(ui.getNavigation(), importFile.getName()); -// } - } - - /** - * Export the database into a file. - */ - public void exportBase() { - - /** Get exporter plugin. */ - MainUI ui = MainUI.getInstance(); - Item selectedItem = ui.getExporter().getSelectedJaxxItem(); - String exporterName = selectedItem.getValue().toString(); - - this.exportBase(exporterName); -// Exporter exporter = (Exporter) pluginLoader.getPlugin(exporterName); -// -// /** Create FileChooser and set FileFilter. */ -// JFileChooser jfc = new JFileChooser(lastPath); -// jfc.setFileFilter(exporter.getFileFilter()); -// -// /** ShowOpenDialog and get the return value. */ -// int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); -// -// if (JFileChooser.APPROVE_OPTION == jfcReturn) { -// -// lastPath = jfc.getSelectedFile().getAbsolutePath(); -// -// File importFile = jfc.getSelectedFile(); -// LOG.info("chosen file for export : " + importFile.getPath()); -// -// /** Export */ -// exporter.exportTo(bigTable, importFile); -// } - } - - /** - * Import database from a file. * @param importName the name of the importer plugin. */ public void importBase(final String importerName) { Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 22:47:04 UTC (rev 227) @@ -195,7 +195,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -221,7 +221,7 @@ */ @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 22:47:04 UTC (rev 227) @@ -195,7 +195,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -221,7 +221,7 @@ */ @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); } 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-12 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 22:47:04 UTC (rev 227) @@ -234,7 +234,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); @@ -260,7 +260,7 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); } 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-12 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 22:47:04 UTC (rev 227) @@ -4,7 +4,6 @@ */ package org.nuiton.mapstoragemanager.plugins.importer; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -207,7 +206,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); @@ -226,6 +225,7 @@ if (!menuImport.isEnabled()) { menuImport.setEnabled(true); } + System.out.println(menuImport.hashCode()); } /** @@ -233,7 +233,7 @@ */ @Override public void unload() { - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 22:47:04 UTC (rev 227) @@ -4,18 +4,12 @@ */ package org.nuiton.mapstoragemanager.plugins.importer; -import java.awt.Component; import java.io.File; -import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.JMenu; -import javax.swing.JMenuItem; import javax.swing.filechooser.FileNameExtensionFilter; import junit.framework.Assert; import junit.framework.TestCase; @@ -26,7 +20,6 @@ import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; -import org.nuiton.mapstoragemanager.ui.MainUI; /** * @@ -316,46 +309,48 @@ /** * test Load/UnLoad */ - public void testLoadUnLoad() { -// JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - Set<Component> components; - JMenuItem menuItem = null; - - Importer fromXML = new FromXML(); - try { - Field fMenuItem - = fromXML.getClass().getDeclaredField("menuItemImport"); - fMenuItem.setAccessible(true); - menuItem = (JMenuItem) fMenuItem.get(fromXML); - } catch (IllegalArgumentException ex) { - LOG.error(ex, ex); - } catch (IllegalAccessException ex) { - LOG.error(ex, ex); - } catch (NoSuchFieldException ex) { - LOG.error(ex, ex); - } catch (SecurityException ex) { - LOG.error(ex, ex); - } - - - +// public void testLoadUnLoad() { +// JMenu menuImport; +// Set<Component> components; +// JMenuItem menuItem = null; +// +// Importer fromXML = new FromXML(); +// try { +// Field fMenuItem +// = fromXML.getClass().getDeclaredField("menuItemImport"); +// fMenuItem.setAccessible(true); +// menuItem = (JMenuItem) fMenuItem.get(fromXML); +// } catch (IllegalArgumentException ex) { +// LOG.error(ex, ex); +// } catch (IllegalAccessException ex) { +// LOG.error(ex, ex); +// } catch (NoSuchFieldException ex) { +// LOG.error(ex, ex); +// } catch (SecurityException ex) { +// LOG.error(ex, ex); +// } +// // fromXML.load(); - +// +// menuImport = MainUI.getInstance().getMenuImportBis(); +// System.out.println(menuImport.e); // components = new HashSet<Component>(); -// for (Component c : menuImport.getComponents()) { -// components.add(c); +// for (int i = 0 ; i < menuImport.getItemCount() ; i++) { +// System.out.println(menuImport.getItem(i)); +// components.add(menuImport.getItem(i)); // } // -// assertTrue(components.contains(menuItem)); +// assertEquals(true, components.contains(menuItem)); // // fromXML.unload(); // +// menuImport = MainUI.getInstance().getMenuImportBis(); // components = new HashSet<Component>(); -// for (Component c : menuImport.getComponents()) { -// components.add(c); +// for (int i = 0 ; i < menuImport.getItemCount() ; i++) { +// components.add(menuImport.getItem(i)); // } // -// assertFalse(components.contains(menuItem)); - - } +// assertEquals(false, components.contains(menuItem)); +// +// } } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 22:47:04 UTC (rev 227) @@ -4,7 +4,6 @@ */ package org.nuiton.mapstoragemanager.plugins.exporter; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -205,7 +204,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); @@ -231,7 +230,7 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + JMenu menuExport = MainUI.getInstance().getMenuExport(); if(menuItemExport != null) { menuExport.remove(menuItemExport); } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 22:47:04 UTC (rev 227) @@ -266,7 +266,7 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); @@ -292,7 +292,7 @@ */ @Override public void unload() { - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + JMenu menuImport = MainUI.getInstance().getMenuImport(); if(menuItemImport != null) { menuImport.remove(menuItemImport); } Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 20:14:06 UTC (rev 226) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 22:47:04 UTC (rev 227) @@ -371,7 +371,7 @@ // @Override public void load() { final String pluginName = getPluginName(); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); @@ -397,7 +397,7 @@ */ // @Override public void unload() { - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + JMenu menuConnect = MainUI.getInstance().getMenuConnect(); if(menuItemConnect != null) { menuConnect.remove(menuItemConnect); }

1 0

r226 - trunk
by tchemit＠users.nuiton.org March 12, 2010

March 12, 2010

Author: tchemit Date: 2010-03-12 21:14:06 +0100 (Fri, 12 Mar 2010) New Revision: 226 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 19:15:14 UTC (rev 225) +++ trunk/pom.xml 2010-03-12 20:14:06 UTC (rev 226) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <groupId>org.nuiton</groupId>

1 0

r225 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by fgilet＠users.nuiton.org March 12, 2010

March 12, 2010

Author: fgilet Date: 2010-03-12 20:15:14 +0100 (Fri, 12 Mar 2010) New Revision: 225 Log: Probl?\195?\168me de BorderLayout dans MSMNavigationListener r?\195?\169solu Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-12 17:50:38 UTC (rev 224) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MSMNavigationListener.java 2010-03-12 19:15:14 UTC (rev 225) @@ -1,6 +1,6 @@ package org.nuiton.mapstoragemanager.ui.gui; -import java.awt.Dimension; +import java.awt.BorderLayout; import javax.swing.JLabel; import javax.swing.JScrollPane; import javax.swing.JTable; @@ -44,16 +44,12 @@ JScrollPane scrollPane = new JScrollPane(jTable); jTable.setFillsViewportHeight(true); - int height = (int)ui.getTableContent().getSize().getHeight(); - int width = (int)ui.getTableContent().getSize().getWidth(); - Dimension screen = new Dimension(width - 100, height - 100); - jTable.setPreferredScrollableViewportSize(screen); - //we check attributes and values of the select table //and display the result into the JPanel named 'tableContent' - ui.getTableContent().add(scrollPane); + ui.getTableContent().setLayout(new BorderLayout()); + ui.getTableContent().add(scrollPane, BorderLayout.CENTER); ui.getTableName().add(new JLabel("<html><b><u>" + node.toString() + "</b></u></html>"));

1 0

r224 - in trunk/msm/src/main: java/org/nuiton/mapstoragemanager/ui/gui resources/i18n
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 18:50:38 +0100 (Fri, 12 Mar 2010) New Revision: 224 Log: Am?\195?\169lioration : - nommage des JFileChooser (titre de la fen?\195?\170tre) ; - ajout et traduction de cl?\195?\169 i18n. Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java trunk/msm/src/main/resources/i18n/msm-en_GB.properties trunk/msm/src/main/resources/i18n/msm-fr_FR.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 17:37:26 UTC (rev 223) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-12 17:50:38 UTC (rev 224) @@ -1,15 +1,12 @@ package org.nuiton.mapstoragemanager.ui.gui; import java.awt.Desktop; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.io.File; import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; import java.util.Properties; import javax.swing.JFileChooser; -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; @@ -25,9 +22,6 @@ import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.plugins.Exporter; import org.nuiton.mapstoragemanager.plugins.Importer; -import org.nuiton.mapstoragemanager.plugins.Monitoring; -import org.nuiton.mapstoragemanager.plugins.OurHashMap2; -import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; import static org.nuiton.i18n.I18n._; @@ -106,6 +100,7 @@ */ public void loadAPlugin() { JFileChooser jfc = new javax.swing.JFileChooser(MSM_BASEDIR); + jfc.setDialogTitle(_("jFileChooser.loadAPlugin.dialogTitle")); jfc.getSelectedFiles(); int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); @@ -609,6 +604,7 @@ /** Create FileChooser and set FileFilter. */ JFileChooser jfc = new JFileChooser(lastPath); jfc.setFileFilter(importer.getFileFilter()); + jfc.setDialogTitle(_("jFileChooser.importBase.dialogTitle")); /** ShowOpenDialog and get the return value. */ int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); @@ -667,6 +663,7 @@ /** Create FileChooser and set FileFilter. */ JFileChooser jfc = new JFileChooser(lastPath); jfc.setFileFilter(exporter.getFileFilter()); + jfc.setDialogTitle(_("jFileChooser.exportBase.dialogTitle")); /** ShowOpenDialog and get the return value. */ int jfcReturn = jfc.showOpenDialog(MainUI.getFrames()[0]); Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-12 17:37:26 UTC (rev 223) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-12 17:50:38 UTC (rev 224) @@ -52,7 +52,6 @@ table.keys=Keys table.values=Values welcome.MapStorageManager=Welcome to MapStorageManager - unconnectedError.JOptionPaneTitle=No bigtable connected ! unconnectedError.JOptionPaneMessage=No bigtable connected ! notFoundPlugin.JOptionPaneTitle=Plugin not found ! @@ -64,4 +63,7 @@ importUnsuccessfull.JOptionPaneTitle=Exception while import. importUnsuccessfull.JOptionPaneMessage=An exception occured while import database. exportUnsuccessfull.JOptionPaneTitle=Exception while export. -exportUnsuccessfull.JOptionPaneMessage=An exception occured while export database. \ No newline at end of file +exportUnsuccessfull.JOptionPaneMessage=An exception occured while export database. +jFileChooser.exportBase.dialogTitle=Export the base to ... +jFileChooser.importBase.dialogTitle=Import the base from ... +jFileChooser.loadAPlugin.dialogTitle=Load a plugin ... \ No newline at end of file Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-12 17:37:26 UTC (rev 223) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-12 17:50:38 UTC (rev 224) @@ -52,7 +52,6 @@ table.keys=Cl\u00E9s table.values=Valeurs welcome.MapStorageManager=Bienvenue dans MapStorageManager - unconnectedError.JOptionPaneTitle=Connect\u00E9 \u00E0 aucune base ! unconnectedError.JOptionPaneMessage=Connect\u00E9 \u00E0 aucune base ! notFoundPlugin.JOptionPaneTitle=Plugin non trouv\u00E9 ! @@ -64,4 +63,7 @@ importUnsuccessfull.JOptionPaneTitle=Exception durant l'import. importUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'import de la base. exportUnsuccessfull.JOptionPaneTitle=Exception durant l'export. -exportUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'export de la base. \ No newline at end of file +exportUnsuccessfull.JOptionPaneMessage=Une exception s'est produite lors de l'export de la base. +jFileChooser.exportBase.dialogTitle=Exporter la base dans ... +jFileChooser.importBase.dialogTitle=Importer la base de ... +jFileChooser.loadAPlugin.dialogTitle=Charger un plugin ... \ No newline at end of file

1 0

r223 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-hbase/s
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 18:37:26 +0100 (Fri, 12 Mar 2010) New Revision: 223 Log: Correction : - les menus faisaient doulons lorsque l'on rechargeait les plugins... Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 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-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 17:26:01 UTC (rev 222) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 17:37:26 UTC (rev 223) @@ -28,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemConnect; + private static JMenuItem menuItemConnect; /** * Default constructor. @@ -222,8 +222,9 @@ @Override public void unload() { JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.remove(menuItemConnect); - + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } if (menuConnect.getComponentCount() == 0) { menuConnect.setEnabled(false); } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 17:26:01 UTC (rev 222) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 17:37:26 UTC (rev 223) @@ -28,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemConnect; + private static JMenuItem menuItemConnect; /** * Default constructor. @@ -222,8 +222,9 @@ @Override public void unload() { JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.remove(menuItemConnect); - + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } if (menuConnect.getComponentCount() == 0) { menuConnect.setEnabled(false); } 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-12 17:26:01 UTC (rev 222) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 17:37:26 UTC (rev 223) @@ -47,7 +47,7 @@ /** * MenuItemExport */ - private JMenuItem menuItemExport; + private static JMenuItem menuItemExport; /** * Constructor. @@ -261,8 +261,9 @@ @Override public void unload() { JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.remove(menuItemExport); - + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } if (menuExport.getComponentCount() == 0) { menuExport.setEnabled(false); } 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-12 17:26:01 UTC (rev 222) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 17:37:26 UTC (rev 223) @@ -46,7 +46,7 @@ /** * MenuItemImport. */ - private JMenuItem menuItemImport; + private static JMenuItem menuItemImport; /** * Constructor. @@ -234,8 +234,9 @@ @Override public void unload() { JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.remove(menuItemImport); - + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } if (menuImport.getComponentCount() == 0) { menuImport.setEnabled(false); } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 17:37:26 UTC (rev 223) @@ -43,7 +43,7 @@ /** * MenuItemExport */ - private JMenuItem menuItemExport; + private static JMenuItem menuItemExport; /** * NameSpace. @@ -232,8 +232,9 @@ @Override public void unload() { JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.remove(menuItemExport); - + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } if (menuExport.getComponentCount() == 0) { menuExport.setEnabled(false); } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 17:37:26 UTC (rev 223) @@ -49,7 +49,7 @@ /** * MenuItemImport. */ - private JMenuItem menuItemImport; + private static JMenuItem menuItemImport; /** * Constructor. @@ -293,8 +293,9 @@ @Override public void unload() { JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.remove(menuItemImport); - + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } if (menuImport.getComponentCount() == 0) { menuImport.setEnabled(false); } Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 17:26:01 UTC (rev 222) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 17:37:26 UTC (rev 223) @@ -41,7 +41,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemConnect; + private static JMenuItem menuItemConnect; /** * HBaseAdmin. * Permit to manage the HBase. @@ -398,8 +398,9 @@ // @Override public void unload() { JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.remove(menuItemConnect); - + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } if (menuConnect.getComponentCount() == 0) { menuConnect.setEnabled(false); }

1 0

r222 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmap/src/main/resources msm-bighashmap/src/main/resources/META-INF msm-bighashmap/src/main/resources/META-INF/services msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-fromtoXML/src/test/java/org/
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 18:26:01 +0100 (Fri, 12 Mar 2010) New Revision: 222 Log: correction concernant l'impl?\195?\169mentation des fonctions load/unload. Added: trunk/msm-bighashmap/src/main/resources/META-INF/ trunk/msm-bighashmap/src/main/resources/META-INF/services/ trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 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-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 17:26:01 UTC (rev 222) @@ -28,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * Default constructor. @@ -195,19 +195,24 @@ @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -216,11 +221,11 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Added: trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable =================================================================== --- trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable (rev 0) +++ trunk/msm-bighashmap/src/main/resources/META-INF/services/org.nuiton.mapstoragemanager.plugins.BigTable 2010-03-12 17:26:01 UTC (rev 222) @@ -0,0 +1 @@ +org.nuiton.mapstoragemanager.plugins.bighashmap.BigHashMap \ No newline at end of file Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 17:26:01 UTC (rev 222) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmapv2; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; @@ -29,7 +28,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * Default constructor. @@ -196,19 +195,24 @@ @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -217,11 +221,11 @@ */ @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } 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-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 17:26:01 UTC (rev 222) @@ -234,6 +234,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } + menuItemExport = new JMenuItem(pluginName); menuItemExport.addActionListener(new ActionListener() { @@ -242,7 +248,6 @@ ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { @@ -258,8 +263,8 @@ JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.remove(menuItemExport); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuExport.getComponentCount() == 0) { + menuExport.setEnabled(false); } } } 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-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 17:26:01 UTC (rev 222) @@ -207,6 +207,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } + menuItemImport = new JMenuItem(pluginName); menuItemImport.addActionListener(new ActionListener() { @@ -215,7 +221,6 @@ ApplicationEngine.getInstance().importBase(pluginName); } }); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { @@ -230,9 +235,9 @@ public void unload() { JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.remove(menuItemImport); - - if (!menuImport.isEnabled()) { - menuImport.setEnabled(true); + + if (menuImport.getComponentCount() == 0) { + menuImport.setEnabled(false); } } } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 17:26:01 UTC (rev 222) @@ -323,7 +323,8 @@ Importer fromXML = new FromXML(); try { - Field fMenuItem = fromXML.getClass().getDeclaredField("menuItem"); + Field fMenuItem + = fromXML.getClass().getDeclaredField("menuItemImport"); fMenuItem.setAccessible(true); menuItem = (JMenuItem) fMenuItem.get(fromXML); } catch (IllegalArgumentException ex) { Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) @@ -205,6 +205,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuExport = MainUI.getInstance().getMenuExportBis(); + + if(menuItemExport != null) { + menuExport.remove(menuItemExport); + } + menuItemExport = new JMenuItem(pluginName); menuItemExport.addActionListener(new ActionListener() { @@ -213,7 +219,6 @@ ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { @@ -229,8 +234,8 @@ JMenu menuExport = MainUI.getInstance().getMenuExportBis(); menuExport.remove(menuItemExport); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuExport.getComponentCount() == 0) { + menuExport.setEnabled(false); } } } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 17:26:01 UTC (rev 222) @@ -68,7 +68,9 @@ final long t1 = System.currentTimeMillis(); - XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); + XmlPullParserFactory factory + = XmlPullParserFactory.newInstance( + System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); //factory.setNamespaceAware(true); factory.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); XmlPullParser xpp = factory.newPullParser(); @@ -264,6 +266,12 @@ @Override public void load() { final String pluginName = getPluginName(); + JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + + if(menuItemImport != null) { + menuImport.remove(menuItemImport); + } + menuItemImport = new JMenuItem(pluginName); menuItemImport.addActionListener(new ActionListener() { @@ -272,7 +280,6 @@ ApplicationEngine.getInstance().importBase(pluginName); } }); - JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { @@ -288,8 +295,8 @@ JMenu menuImport = MainUI.getInstance().getMenuImportBis(); menuImport.remove(menuItemImport); - if (!menuImport.isEnabled()) { - menuImport.setEnabled(true); + if (menuImport.getComponentCount() == 0) { + menuImport.setEnabled(false); } } } Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 17:26:01 UTC (rev 222) @@ -41,7 +41,7 @@ /** * MenuItemBigTable. */ - private JMenuItem menuItemBigTable; + private JMenuItem menuItemConnect; /** * HBaseAdmin. * Permit to manage the HBase. @@ -371,19 +371,24 @@ // @Override public void load() { final String pluginName = getPluginName(); - menuItemBigTable = new JMenuItem(pluginName); - menuItemBigTable.addActionListener(new ActionListener() { + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + if(menuItemConnect != null) { + menuConnect.remove(menuItemConnect); + } + + menuItemConnect = new JMenuItem(pluginName); + menuItemConnect.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().exportBase(pluginName); + ApplicationEngine.getInstance().connection(pluginName); } }); - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.add(menuItemBigTable); + menuConnect.add(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (!menuConnect.isEnabled()) { + menuConnect.setEnabled(true); } } @@ -392,11 +397,11 @@ */ // @Override public void unload() { - JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); - menuExport.remove(menuItemBigTable); + JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); + menuConnect.remove(menuItemConnect); - if (!menuExport.isEnabled()) { - menuExport.setEnabled(true); + if (menuConnect.getComponentCount() == 0) { + menuConnect.setEnabled(false); } } } Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java =================================================================== --- trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-12 16:08:07 UTC (rev 221) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-12 17:26:01 UTC (rev 222) @@ -27,6 +27,8 @@ */ private static final int FRAME_HEIGHT = 300; + private JFrame diskSpaceFrame; + /** * Constructor. */ @@ -39,9 +41,11 @@ @Override public void display() { - this.setTitle("Plugin ShowDiskSpace"); - this.setSize(FRAME_WIDTH, FRAME_HEIGHT); - this.setLocationRelativeTo(null); + diskSpaceFrame = new JFrame(); + + diskSpaceFrame.setTitle("Plugin ShowDiskSpace"); + diskSpaceFrame.setSize(FRAME_WIDTH, FRAME_HEIGHT); + diskSpaceFrame.setLocationRelativeTo(null); // this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // exit MSM... JPanel content = new JPanel(); @@ -103,9 +107,9 @@ "maxMemory : " + maxMemoryMb + " Mb (" + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); - this.setContentPane(content); - this.pack(); - this.setVisible(true); + diskSpaceFrame.setContentPane(content); + diskSpaceFrame.pack(); + diskSpaceFrame.setVisible(true); } /** @@ -150,6 +154,8 @@ */ @Override public void unload() { + this.setVisible(false); + this.diskSpaceFrame = null; // final String pluginName = getPluginName(); //// JMenuItem menuItem = new JMenuItem(pluginName); //// menuItem.addActionListener(new ActionListener() {

1 0

r221 - in trunk: msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2 msm-fromtoXML msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporte
by dlanglais＠users.nuiton.org March 12, 2010

March 12, 2010

Author: dlanglais Date: 2010-03-12 17:08:07 +0100 (Fri, 12 Mar 2010) New Revision: 221 Log: am?\195?\169lioration impl?\195?\169mentation load/unload sur les plugins Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java trunk/msm-fromtoXML/pom.xml 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-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java Modified: trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java =================================================================== --- trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-bighashmap/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmap/BigHashMap.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.bighashmap; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; @@ -26,6 +25,10 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; /** * Default constructor. @@ -192,19 +195,19 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -213,24 +216,11 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } } Modified: trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java =================================================================== --- trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-bighashmapV2/src/main/java/org/nuiton/mapstoragemanager/plugins/bighashmapv2/BigHashMapV2.java 2010-03-12 16:08:07 UTC (rev 221) @@ -26,6 +26,10 @@ * hashMap with value is table, and key its name. */ private Map<String, Table> tables; + /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; /** * Default constructor. @@ -192,19 +196,19 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -213,24 +217,11 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } } Modified: trunk/msm-fromtoXML/pom.xml =================================================================== --- trunk/msm-fromtoXML/pom.xml 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/pom.xml 2010-03-12 16:08:07 UTC (rev 221) @@ -78,7 +78,8 @@ <name>MSM-FromToXML</name> - <description>Plugin for MapStorageManager to work with actuals HBase</description> + <description>Plugin to import/export database content from/to xml files + using JDom.</description> <inceptionYear>2010</inceptionYear> <developers> 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-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXML.java 2010-03-12 16:08:07 UTC (rev 221) @@ -4,7 +4,6 @@ */ package org.nuiton.mapstoragemanager.plugins.exporter; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -40,11 +39,15 @@ /** * the jdom document. */ - private static Document document; + private Document document; /** * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemExport + */ + private JMenuItem menuItemExport; /** * Constructor. @@ -164,24 +167,24 @@ } } - /** - * toSreen(). - * show the XML content on System.out - */ - static void toSreen() { - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - output.output(document, System.out); - } catch (java.io.IOException e) { - LOG.error(e, e); - } - } +// /** +// * 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. */ - private static void save(final File file) { + private void save(final File file) { long t1 = System.currentTimeMillis(); try { XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); @@ -231,8 +234,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemExport = new JMenuItem(pluginName); + menuItemExport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -240,7 +243,7 @@ } }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.add(menuItem); + menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); @@ -252,21 +255,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - for (Component menuItem : menuExport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuExport.remove(menuItem); - } - } + menuExport.remove(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); 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-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-12 16:08:07 UTC (rev 221) @@ -20,8 +20,6 @@ import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; import org.nuiton.mapstoragemanager.plugins.Importer; import org.nuiton.mapstoragemanager.plugins.BigTable; import org.nuiton.mapstoragemanager.ui.MainUI; @@ -40,11 +38,15 @@ /** * the jdom document. */ - private static Document document; + private Document document; /** * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemImport. + */ + private JMenuItem menuItemImport; /** * Constructor. @@ -139,25 +141,25 @@ } } - /** - * toSreen(). - * show the XML content on System.out - */ - static void toSreen() { - try { - XMLOutputter output = new XMLOutputter(Format.getPrettyFormat()); - output.output(document, System.out); - } catch (java.io.IOException e) { - LOG.error(e, e); - } - } +// /** +// * 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. * @throws IOException IOException */ - private static void open(final File file) throws IOException { + private void open(final File file) throws IOException { long t1 = System.currentTimeMillis(); //On crée une instance de SAXBuilder SAXBuilder saxBuilder = new SAXBuilder(); @@ -205,8 +207,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemImport = new JMenuItem(pluginName); + menuItemImport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -214,7 +216,7 @@ } }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.add(menuItem); + menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); @@ -226,22 +228,9 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - for (Component menuItem : menuImport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuImport.remove(menuItem); - } - } - + menuImport.remove(menuItemImport); + if (!menuImport.isEnabled()) { menuImport.setEnabled(true); } Modified: trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java =================================================================== --- trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXML/src/test/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLTest.java 2010-03-12 16:08:07 UTC (rev 221) @@ -4,12 +4,18 @@ */ package org.nuiton.mapstoragemanager.plugins.importer; +import java.awt.Component; import java.io.File; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JMenu; +import javax.swing.JMenuItem; import javax.swing.filechooser.FileNameExtensionFilter; import junit.framework.Assert; import junit.framework.TestCase; @@ -20,6 +26,7 @@ import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.plugins.bighashmapv2.BigHashMapV2; import org.nuiton.mapstoragemanager.plugins.getFile; +import org.nuiton.mapstoragemanager.ui.MainUI; /** * @@ -305,4 +312,49 @@ } assertEquals(acceptedExtensionExpected, acceptedExtensionActual); } + + /** + * test Load/UnLoad + */ + public void testLoadUnLoad() { +// JMenu menuImport = MainUI.getInstance().getMenuImportBis(); + Set<Component> components; + JMenuItem menuItem = null; + + Importer fromXML = new FromXML(); + try { + Field fMenuItem = fromXML.getClass().getDeclaredField("menuItem"); + fMenuItem.setAccessible(true); + menuItem = (JMenuItem) fMenuItem.get(fromXML); + } catch (IllegalArgumentException ex) { + LOG.error(ex, ex); + } catch (IllegalAccessException ex) { + LOG.error(ex, ex); + } catch (NoSuchFieldException ex) { + LOG.error(ex, ex); + } catch (SecurityException ex) { + LOG.error(ex, ex); + } + + + +// fromXML.load(); + +// components = new HashSet<Component>(); +// for (Component c : menuImport.getComponents()) { +// components.add(c); +// } +// +// assertTrue(components.contains(menuItem)); +// +// fromXML.unload(); +// +// components = new HashSet<Component>(); +// for (Component c : menuImport.getComponents()) { +// components.add(c); +// } +// +// assertFalse(components.contains(menuItem)); + + } } Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/exporter/ToXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) @@ -40,6 +40,10 @@ * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemExport + */ + private JMenuItem menuItemExport; /** * NameSpace. @@ -201,8 +205,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemExport = new JMenuItem(pluginName); + menuItemExport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -210,7 +214,7 @@ } }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - menuExport.add(menuItem); + menuExport.add(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); @@ -222,21 +226,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuExport = MainUI.getInstance().getMenuExportBis(); - for (Component menuItem : menuExport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuExport.remove(menuItem); - } - } + menuExport.remove(menuItemExport); if (!menuExport.isEnabled()) { menuExport.setEnabled(true); Modified: trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java =================================================================== --- trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-fromtoXPP3/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXMLXPP3.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.importer; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -47,6 +46,10 @@ * the fileFilter. */ private static FileFilter fileFilter; + /** + * MenuItemImport. + */ + private JMenuItem menuItemImport; /** * Constructor. @@ -261,8 +264,8 @@ @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemImport = new JMenuItem(pluginName); + menuItemImport.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -270,7 +273,7 @@ } }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - menuImport.add(menuItem); + menuImport.add(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); @@ -282,21 +285,8 @@ */ @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); JMenu menuImport = MainUI.getInstance().getMenuImportBis(); - for (Component menuItem : menuImport.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuImport.remove(menuItem); - } - } + menuImport.remove(menuItemImport); if (!menuImport.isEnabled()) { menuImport.setEnabled(true); Modified: trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java =================================================================== --- trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 12:09:52 UTC (rev 220) +++ trunk/msm-hbase/src/main/java/org/nuiton/mapstoragemanager/plugins/hbase/HBase.java 2010-03-12 16:08:07 UTC (rev 221) @@ -1,6 +1,5 @@ package org.nuiton.mapstoragemanager.plugins.hbase; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; @@ -40,6 +39,10 @@ private static final Log LOG = LogFactory.getLog(HBase.class); /** + * MenuItemBigTable. + */ + private JMenuItem menuItemBigTable; + /** * HBaseAdmin. * Permit to manage the HBase. */ @@ -368,19 +371,19 @@ // @Override public void load() { final String pluginName = getPluginName(); - JMenuItem menuItem = new JMenuItem(pluginName); - menuItem.addActionListener(new ActionListener() { + menuItemBigTable = new JMenuItem(pluginName); + menuItemBigTable.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - ApplicationEngine.getInstance().connection(pluginName); + ApplicationEngine.getInstance().exportBase(pluginName); } }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - menuConnect.add(menuItem); + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.add(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } @@ -389,24 +392,11 @@ */ // @Override public void unload() { - final String pluginName = getPluginName(); -// JMenuItem menuItem = new JMenuItem(pluginName); -// menuItem.addActionListener(new ActionListener() { -// -// @Override -// public void actionPerformed(ActionEvent e) { -// ApplicationEngine.getInstance().connection(pluginName); -// } -// }); - JMenu menuConnect = MainUI.getInstance().getMenuConnectBis(); - for (Component menuItem : menuConnect.getComponents()) { - if (menuItem.getName().equals(pluginName)) { - menuConnect.remove(menuItem); - } - } + JMenu menuExport = MainUI.getInstance().getMenuConnectBis(); + menuExport.remove(menuItemBigTable); - if (!menuConnect.isEnabled()) { - menuConnect.setEnabled(true); + if (!menuExport.isEnabled()) { + menuExport.setEnabled(true); } } }

1 0