12 Mar 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);
         }

    

dlanglais＠users.nuiton.org