Author: fgilet Date: 2010-03-14 17:20:17 +0100 (Sun, 14 Mar 2010) New Revision: 239 Log: plugin monitoring refait Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-14 05:42:23 UTC (rev 238) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/plugins/Monitoring.java 2010-03-14 16:20:17 UTC (rev 239) @@ -9,4 +9,5 @@ * display. */ void display(); + } 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-14 05:42:23 UTC (rev 238) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-14 16:20:17 UTC (rev 239) @@ -51,6 +51,21 @@ } /** +* Access to the config. +* @return instance of the class +*/ +public JPanel getFreePluginPanel(){ + if(getPluginSpace1().getComponentCount()==0){ + return getPluginSpace1(); + }else if(getPluginSpace2().getComponentCount()==0){ + return getPluginSpace2(); + }else if(getPluginSpace3().getComponentCount()==0){ + return getPluginSpace3(); + } + return null; +} + +/** * Dispose UI. */ public void dispose(){ @@ -159,7 +174,11 @@ <JPanel layout='{new BorderLayout()}'> <JPanel id='tableName' constraints='BorderLayout.NORTH'/> <JPanel id='tableContent' constraints='BorderLayout.CENTER'/> - <JPanel id='tableTips' constraints='BorderLayout.SOUTH'/> + <JPanel layout='{new BorderLayout()}' id='tableTips' constraints='BorderLayout.SOUTH'> + <JPanel id='pluginSpace1' constraints='BorderLayout.NORTH'/> + <JPanel id='pluginSpace2' constraints='BorderLayout.CENTER'/> + <JPanel id='pluginSpace3' constraints='BorderLayout.SOUTH'/> + </JPanel> </JPanel> </JScrollPane> </JSplitPane> 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-14 05:42:23 UTC (rev 238) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-14 16:20:17 UTC (rev 239) @@ -1,12 +1,18 @@ package org.nuiton.monitoring; import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.File; import java.text.DecimalFormat; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuItem; import javax.swing.JPanel; import org.nuiton.mapstoragemanager.plugins.Monitoring; +import org.nuiton.mapstoragemanager.ui.MainUI; +import org.nuiton.mapstoragemanager.ui.gui.ApplicationEngine; /** * @@ -27,8 +33,6 @@ */ private static final int FRAME_HEIGHT = 300; - private JFrame diskSpaceFrame; - /** * Constructor. */ @@ -41,13 +45,7 @@ @Override public void display() { - diskSpaceFrame = new JFrame(); - - diskSpaceFrame.setTitle("Plugin ShowDiskSpace"); - diskSpaceFrame.setSize(FRAME_WIDTH, FRAME_HEIGHT); - diskSpaceFrame.setLocationRelativeTo(null); -// this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // exit MSM... - + //creation of content JPanel content = new JPanel(); File f = new File(new File("").getAbsolutePath()).getParentFile(); if (f.exists()) { @@ -107,14 +105,22 @@ "maxMemory : " + maxMemoryMb + " Mb (" + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); - diskSpaceFrame.setContentPane(content); - diskSpaceFrame.pack(); - diskSpaceFrame.setVisible(true); + //position of plugin + JPanel nbFreePluginPanel = MainUI.getInstance().getFreePluginPanel(); + if (nbFreePluginPanel==null){ + this.setContentPane(content); + this.pack(); + this.setVisible(true); + }else{ + nbFreePluginPanel.add(content); + MainUI.getInstance().repaint(); + } } /** * {@inheritDoc} */ + @Override public String getPluginName() { return this.getClass().getSimpleName(); } @@ -122,6 +128,7 @@ /** * {@inheritDoc} */ + @Override public String getDescription() { return "Plugin for MapStorageManager to test with an implementation of " + "the BigTable Specification using HashMap."; @@ -132,22 +139,30 @@ */ @Override public void load() { -// 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(); -// menuConnect.add(menuItem); -// -// if (!menuConnect.isEnabled()) { -// menuConnect.setEnabled(true); -// } - this.display(); + final String pluginName = getPluginName(); + final JMenu menuItem = new JMenu(pluginName); + + JMenuItem menuDisplay = new JMenuItem("Display"); + menuItem.add(menuDisplay); + JMenuItem menuDelete = new JMenuItem("Delete"); + menuItem.add(menuDelete); + + final JMenu menuPlugin = MainUI.getInstance().getMenuPlugin(); + menuPlugin.add(menuItem); + + menuDisplay.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + display(); + } + }); + + menuDelete.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + menuPlugin.remove(menuItem); + } + }); } /** @@ -155,26 +170,5 @@ */ @Override public void unload() { - this.setVisible(false); - this.diskSpaceFrame = null; -// 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); -// } -// } -// -// if (!menuConnect.isEnabled()) { -// menuConnect.setEnabled(true); -// } } }