Author: fgilet Date: 2010-03-18 15:35:50 +0100 (Thu, 18 Mar 2010) New Revision: 261 Log: Petits changements sur plugin Monitoring Panel de message mieux g?\195?\169rer Modified: trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx trunk/msm/src/main/resources/msm.properties Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/Main.java 2010-03-18 14:35:50 UTC (rev 261) @@ -95,7 +95,7 @@ } n_("messageEntry"); String message = _("messageEntry"); - ui.displayMessage(message, 1); + ui.displayMessage(message, 0); } /** 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-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-18 14:35:50 UTC (rev 261) @@ -89,16 +89,17 @@ this.getMessagesPanel().removeAll(); //display message - if (code==0){ - String icon ="ok_16"; + String icon = "ok_16"; + if (code==0){ + icon ="ok_16"; }else if (code==1){ - String icon ="warning_16.png"; + icon ="warning_16"; }else if (code==2){ - String icon ="cancel_16.png"; + icon ="cancel_16"; } JLabel label = new JLabel(message); - label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon(icon)); this.getMessagesPanel().add(label); this.getMessagesPanel().repaint(); this.getMessagesPanel().revalidate(); Modified: trunk/msm/src/main/resources/msm.properties =================================================================== --- trunk/msm/src/main/resources/msm.properties 2010-03-18 14:09:27 UTC (rev 260) +++ trunk/msm/src/main/resources/msm.properties 2010-03-18 14:35:50 UTC (rev 261) @@ -1,5 +1,9 @@ icon.action.ok_16=ok_16.png icon.action.ok_32=ok_32.png +icon.action.warning_16=warning_16.png +icon.action.warning_32=warning_32.png +icon.action.cancel_16=cancel_16.png +icon.action.cancel_32=cancel_32.png icon.action.database_16=database_16.png icon.action.database_32=database_32.png icon.action.login_16=login_16.png 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-18 14:09:27 UTC (rev 260) +++ trunk/msm-monitoring-plugins/src/main/java/org/nuiton/monitoring/ShowDiskSpace.java 2010-03-18 14:35:50 UTC (rev 261) @@ -10,6 +10,7 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPanel; +import javax.swing.JSeparator; import org.nuiton.mapstoragemanager.plugins.Plugin; import org.nuiton.mapstoragemanager.ui.MainUI; @@ -42,6 +43,16 @@ private static JMenuItem menuItemPlugin; /** + * Active Panel. + */ + private JPanel nbFreePluginPanel; + + /** + * Lock to avoid multi plugin. + */ + private boolean instance = false; + + /** * Constructor. */ public ShowDiskSpace() { @@ -52,6 +63,7 @@ */ // @Override public void display() { + instance=true; //creation of content JPanel content = new JPanel(); @@ -116,15 +128,14 @@ + new DecimalFormat("0.00").format(maxMemoryGb) + " Gb)")); //position of plugin - JPanel nbFreePluginPanel = MainUI.getInstance().getFreePluginPanel(); + nbFreePluginPanel = MainUI.getInstance().getFreePluginPanel(); if (nbFreePluginPanel==null){ this.setContentPane(content); this.pack(); this.setVisible(true); }else{ nbFreePluginPanel.add(content); - nbFreePluginPanel.repaint(); - nbFreePluginPanel.revalidate(); + refresh(); } } @@ -161,6 +172,9 @@ final JMenuItem menuItemDisplay = new JMenuItem("Display"); menuItemPlugin.add(menuItemDisplay); + final JMenuItem menuItemHide = new JMenuItem("Hide"); + menuItemPlugin.add(menuItemHide); + menuItemPlugin.add(new JSeparator()); final JMenuItem menuItemDelete = new JMenuItem("Delete"); menuItemPlugin.add(menuItemDelete); @@ -169,9 +183,20 @@ menuItemDisplay.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - display(); + if(!instance){ + display(); + }else{ + MainUI.getInstance().displayMessage("Le plugin est déjà activé", 1); + } } }); + + menuItemHide.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + hideContent(); + } + }); menuItemDelete.addActionListener(new ActionListener() { @Override @@ -191,5 +216,25 @@ menuPlugin.remove(menuItemPlugin); menuItemPlugin = null; } + nbFreePluginPanel.removeAll(); + instance=false; + refresh(); } + + /** + * Hide content + */ + public void hideContent() { + nbFreePluginPanel.removeAll(); + instance=false; + refresh(); + } + + /** + * Refresh content. + */ + private void refresh(){ + nbFreePluginPanel.repaint(); + nbFreePluginPanel.revalidate(); + } }