Mapstoragemanager-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
March 2010
- 6 participants
- 152 discussions
r233 - trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui
by dlanglais＠users.nuiton.org March 13, 2010
by dlanglais＠users.nuiton.org March 13, 2010
March 13, 2010
Author: dlanglais
Date: 2010-03-13 13:41:29 +0100 (Sat, 13 Mar 2010)
New Revision: 233
Log:
Oubli de commit un fichier modifi?\195?\169... (build faild)
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-13 04:24:01 UTC (rev 232)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-13 12:41:29 UTC (rev 233)
@@ -288,7 +288,7 @@
* Get the bigTableLoader.
* @return return the bigTableLoader.
*/
- public PluginLoader getBigTableLoader() {
+ public PluginLoader getPluginLoader() {
return pluginLoader;
}
1
0
r232 - in trunk/msm-pluginmanager: . src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 13, 2010
by dlanglais＠users.nuiton.org March 13, 2010
March 13, 2010
Author: dlanglais
Date: 2010-03-13 05:24:01 +0100 (Sat, 13 Mar 2010)
New Revision: 232
Log:
Correction :
- ApplicationEngine : fonction getBigTableLoader() renomm?\195?\169e en getPluginLoader() (un oubli).
Am?\195?\169lioration :
- le pluginLoader est capable de charger des plugins (appel d'une fonction sur l'application principale) ;
- r?\195?\169actualise la liste des boutons correspondants aux plugins charg?\195?\169s au chargement d'un plugin ;
- affiche des informations sur le plugin s?\195?\169lectionn?\195?\169 ;
- permet le chargemenet / d?\195?\169chargement de celui-ci (n?\195?\169anmoins bouton activation/d?\195?\169sactivation non fonctionnels).
Modified:
trunk/msm-pluginmanager/pom.xml
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/pom.xml
===================================================================
--- trunk/msm-pluginmanager/pom.xml 2010-03-13 02:54:51 UTC (rev 231)
+++ trunk/msm-pluginmanager/pom.xml 2010-03-13 04:24:01 UTC (rev 232)
@@ -131,6 +131,29 @@
<!-- ************************************************************* -->
<!-- *** Build Settings ****************************************** -->
<!-- ************************************************************* -->
+ <properties>
+ <maven.test.skip>false</maven.test.skip>
+
+ <!--PluginManager Main Class in JAR -->
+ <maven.jar.main.class>org.nuiton.mapstoragemanager.plugins.pluginmanager.Main</maven.jar.main.class>
+
+ <!-- jaxx configuration -->
+ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
+ <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
+ <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
+
+ <jaxx.extraImportList>
+ static org.nuiton.i18n.I18n.n_
+ </jaxx.extraImportList>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- jaxx help configuration -->
+ <!--jaxx.helpSetName>vradi</jaxx.helpSetName>
+ <jaxx.locale>fr</jaxx.locale>
+ <jaxx.helpTarget>src/main/help</jaxx.helpTarget-->
+
+ </properties>
+
<packaging>jar</packaging>
<build>
@@ -274,9 +297,6 @@
</plugins>
</build>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java
===================================================================
--- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 02:54:51 UTC (rev 231)
+++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 04:24:01 UTC (rev 232)
@@ -16,6 +16,7 @@
import javax.swing.SwingUtilities;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
/**
*
* @author Dorian Langlais
@@ -32,8 +33,8 @@
*/
private static Locale locale = Locale.FRANCE;
- private static void main(String ... args) {
-
+ public static void main(String ... args) {
+//ApplicationEngine.getInstance().getPluginLoader().getAllPlugin(null);
final PluginManager pluginManager = PluginManager.getInstance();
pluginManager.setVisible(true);
@@ -45,55 +46,55 @@
}
});
- 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);
- }
- }
+// 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-13 02:54:51 UTC (rev 231)
+++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/PluginManager.jaxx 2010-03-13 04:24:01 UTC (rev 232)
@@ -1,8 +1,11 @@
-<Application id='pluginManagerFrame' width='500' height='400'>
+<Application id='pluginManagerFrame' width='640' height='480'>
<!-- include java files for treatment -->
<script>
<![CDATA[
+import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine;
+import org.nuiton.mapstoragemanager.core.PluginLoader;
+import org.nuiton.mapstoragemanager.plugins.Plugin;
/**
* classe instance (singleton pattern).
@@ -19,6 +22,110 @@
}
return instance;
}
+
+/**
+ * loadAPlugin.
+ * Call the MSM instance to load a Plugin.
+ */
+public void loadAPlugin() {
+ ApplicationEngine.getInstance().loadAPlugin();
+ refreshPluginList();
+}
+
+ /**
+ * refresh the plugin list.
+ * Call application Engine to get plugin loader and get all plugin to refresh
+ * the frame.
+ */
+ public void refreshPluginList() {
+ ApplicationEngine engine = ApplicationEngine.getInstance();
+ PluginLoader pluginLoader = engine.getPluginLoader();
+ getPluginList().removeAll();
+
+ for(final Plugin plugin : pluginLoader.getAllPlugin(null)) {
+
+ final String pluginName = plugin.getPluginName();
+ final String pluginDescritpion = "";//plugin.getDescription();
+
+ JButton pluginButton = new JButton(pluginName);
+ pluginButton.setSize(100, 20);
+ pluginButton.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+
+ JPanel pluginView = getPluginView();
+ pluginView.setLayout(new BorderLayout());
+
+ pluginView.removeAll();
+ JPanel titre = new JPanel();
+ titre.add(new JLabel(pluginName), BorderLayout.CENTER);
+ pluginView.add(titre, BorderLayout.PAGE_START);
+
+ JPanel description = new JPanel();
+ description.add(new JLabel(" "));
+ description.add(new JLabel(pluginDescritpion));
+ pluginView.add(description, BorderLayout.CENTER);
+
+
+ JPanel southButton = new JPanel();
+ southButton.setLayout(new GridLayout(1,4));
+
+ final JButton buttonActivate = new JButton(_("activate"));
+ final JButton buttonDesactivate = new JButton(_("desactivate"));
+ final JButton buttonLoad = new JButton(_("load"));
+ final JButton buttonUnload = new JButton(_("unload"));
+
+ buttonActivate.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ //TODO;
+ buttonActivate.setEnabled(false);
+ buttonDesactivate.setEnabled(true);
+ }
+ });
+
+ buttonDesactivate.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ //TODO;
+ buttonActivate.setEnabled(true);
+ buttonDesactivate.setEnabled(false);
+ }
+ });
+
+ buttonLoad.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ plugin.load();
+ buttonLoad.setEnabled(false);
+ buttonUnload.setEnabled(true);
+ }
+ });
+
+ buttonUnload.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ plugin.unload();
+ buttonLoad.setEnabled(true);
+ buttonUnload.setEnabled(false);
+ }
+ });
+
+ southButton.add(buttonActivate);
+ southButton.add(buttonDesactivate);
+ southButton.add(buttonLoad);
+ southButton.add(buttonUnload);
+
+ pluginView.add(southButton, BorderLayout.PAGE_END);
+ pluginView.updateUI();
+ }
+ });
+
+ getPluginList().add(pluginButton);
+ }
+ getPluginList().updateUI();
+ }
+
]]>
</script>
@@ -30,14 +137,15 @@
<JMenuBar>
<JMenu id='menuPlugin'>
- <JMenuItem id='menuPluginLoad'/>
- <JMenuItem id='menuPluginShow'/>
+ <JMenuItem id='menuPluginLoad'
+ onActionPerformed='this.loadAPlugin()' />
+ <!--JMenuItem id='menuPluginShow'/-->
</JMenu>
</JMenuBar>
<JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'>
<JPanel layout='{new BorderLayout()}' id='mainPanel'>
- <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='100'>
+ <JSplitPane constraints='BorderLayout.CENTER' dividerLocation='150'>
<JScrollPane>
<VBox layout='{new GridLayout(0,1)}' id='pluginList' />
</JScrollPane>
1
0
r231 - in trunk: msm/src/main/java/org/nuiton/mapstoragemanager/plugins msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 13, 2010
by dlanglais＠users.nuiton.org March 13, 2010
March 13, 2010
Author: dlanglais
Date: 2010-03-13 03:54:51 +0100 (Sat, 13 Mar 2010)
New Revision: 231
Log:
Correction qualit?\195?\169 (imports inutilis?\195?\169s..).
Modified:
trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java
trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java
trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java
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-13 02:19:17 UTC (rev 230)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/OurHashMap2.java 2010-03-13 02:54:51 UTC (rev 231)
@@ -1,6 +1,5 @@
package org.nuiton.mapstoragemanager.plugins;
-import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
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-13 02:19:17 UTC (rev 230)
+++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-13 02:54:51 UTC (rev 231)
@@ -162,7 +162,6 @@
}
if (response == JOptionPane.YES_OPTION) {
- System.out.println("Yes button clicked");
if (nameBase == null) {
JOptionPane.showMessageDialog(MainUI.getInstance(),
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-13 02:19:17 UTC (rev 230)
+++ trunk/msm-fromtoXML/src/main/java/org/nuiton/mapstoragemanager/plugins/importer/FromXML.java 2010-03-13 02:54:51 UTC (rev 231)
@@ -225,7 +225,6 @@
if (!menuImport.isEnabled()) {
menuImport.setEnabled(true);
}
- System.out.println(menuImport.hashCode());
}
/**
Modified: trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java
===================================================================
--- trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 02:19:17 UTC (rev 230)
+++ trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager/Main.java 2010-03-13 02:54:51 UTC (rev 231)
@@ -6,26 +6,21 @@
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
*/
-public class Main {
+public final class Main {
/**
* Logger.
@@ -37,7 +32,7 @@
*/
private static Locale locale = Locale.FRANCE;
- public static void main(String ... args) {
+ private static void main(String ... args) {
final PluginManager pluginManager = PluginManager.getInstance();
pluginManager.setVisible(true);
1
0
r230 - trunk/msm-pluginmanager/src/main/java/org/nuiton/mapstoragemanager/plugins/pluginmanager
by dlanglais＠users.nuiton.org March 13, 2010
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">
+
+ <!-- repository containing the parent pom. -->
+ <repositories>
+ <repository>
+ <id>org.nuiton</id>
+ <url>http://maven.nuiton.org/release</url>
+ </repository>
+ </repositories>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
+ <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>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ <version>${lutinutil.version}</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <!-- JUnit for tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
+
+ <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>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Settings ****************************************** -->
+ <!-- ************************************************************* -->
+ <packaging>jar</packaging>
+
+ <build>
+
+ <!--<plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-deps</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <silent>true</silent>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>false</overWriteSnapshots>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+
+ </plugins>-->
+
+ <pluginManagement>
+ <plugins>
+
+ <!--<plugin>
+ <groupId>org.nuiton</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <configuration>
+ <copyToMETA_INF>true</copyToMETA_INF>
+ </configuration>
+ </plugin>-->
+
+ <!--<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>./lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>-->
+
+ <!-- plugin site -->
+ <!--<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>doxia-module-jrst</artifactId>
+ <version>${jrst.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>-->
+
+ </plugins>
+ </pluginManagement>
+ <plugins>
+
+ <!--<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version></version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> this is used for inheritance merges
+ <phase>package</phase> append to the packaging phase.
+ <goals>
+ <goal>attached</goal> goals == mojos
+ </goals>
+ </execution>
+ </executions>
+ </plugin>-->
+
+ <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'>
+
+ <!-- include java files for treatment -->
+ <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 definition -->
+ <style source='PluginManager.css'/>
+
+ <!-- content -->
+
+ <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
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
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'>
- <!--JMenuItem id='menuConnect'
- onActionPerformed='engine.showToolBar()'/-->
- <JMenu id='menuConnectBis' enabled='false'/>
+ <JMenu id='menuConnect' enabled='false'/>
<JMenuItem id='menuDisconnect' enabled='false'
- onActionPerformed='engine.disposeToolBar()'/>
+ onActionPerformed='engine.disconnection()'/>
<JSeparator/>
- <!--JMenuItem id='menuImport'
- onActionPerformed='engine.showImportFrame()'/>
- <JMenuItem id='menuExport'
- onActionPerformed='engine.showExportFrame()'/>
- <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
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
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
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