Author: fgilet Date: 2010-03-03 15:16:36 +0100 (Wed, 03 Mar 2010) New Revision: 172 Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 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 Log: MessagePanel am?\195?\169lior?\195?\169 (thread) 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-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/MainUI.jaxx 2010-03-03 14:16:36 UTC (rev 172) @@ -10,7 +10,9 @@ import static org.nuiton.i18n.I18n._; import javax.swing.JLabel; import org.nuiton.mapstoragemanager.MsmConfig; + import org.nuiton.mapstoragemanager.ui.gui.MessageThread; + ApplicationEngine engine = ApplicationEngine.getInstance(); /** @@ -60,20 +62,29 @@ * @param code code error (for images). */ public void displayMessage(String message, int code){ + + //clear the message panel this.getMessagesPanel().removeAll(); - - /* - if (code==0){ - ImageIcon icon = new ImageIcon(getClass().getResource("ok_16.png")); + + //display message + if (code==0){ + String icon ="ok_16"; }else if (code==1){ - ImageIcon icon = new ImageIcon(getClass().getResource("warning_16.png")); + String icon ="warning_16.png"; }else if (code==2){ - ImageIcon icon = new ImageIcon(getClass().getResource("cancel_16.png")); + String icon ="cancel_16.png"; } - */ - //JLabel label = new JLabel(message, icon, SwingConstants.CENTER); + JLabel label = new JLabel(message); + label.setIcon(jaxx.runtime.SwingUtil.getUIManagerActionIcon("ok_16")); this.getMessagesPanel().add(label); + this.getMessagesPanel().repaint(); + this.getMessagesPanel().revalidate(); + + //remove message after a short time + MessageThread m = new MessageThread(); + m.start(); + } /** 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-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/ApplicationEngine.java 2010-03-03 14:16:36 UTC (rev 172) @@ -34,16 +34,6 @@ private static final Log LOG = LogFactory.getLog(ApplicationEngine.class); /** - * current Locale. - */ - private Locale currentLocale; - - /** - * ResourceBundle. - */ - private ResourceBundle messages; - - /** * OurHashMap2. */ private OurHashMap2 ohm; @@ -125,10 +115,8 @@ * @param ui application's ui */ public void clean(final MainUI ui) { - ui.getNavigation().setVisible(false); - ui.getTableContent().setVisible(false); - ui.getTableName().setVisible(false); - ui.getTableTips().setVisible(false); + ui.getNavigation().removeAll(); + ui.getNavigation().setModel(ui.getModelTree()); } /** @@ -184,11 +172,14 @@ } - + 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")); } Added: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java (rev 0) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/gui/MessageThread.java 2010-03-03 14:16:36 UTC (rev 172) @@ -0,0 +1,41 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.nuiton.mapstoragemanager.ui.gui; + +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JLabel; +import org.nuiton.mapstoragemanager.ui.MainUI; + +/** + * + * @author E045231P + */ +public class MessageThread extends Thread { + + /** + * Constructor. + */ + public MessageThread() { + super(); + } + + @Override + public void run() { + MainUI ui = MainUI.getInstance(); + try { + this.sleep(5000); + ui.getMessagesPanel().removeAll(); + ui.getMessagesPanel().add(new JLabel(" ")); + ui.getMessagesPanel().repaint(); + ui.getMessagesPanel().revalidate(); + } catch (InterruptedException ex) { + Logger.getLogger(MessageThread.class.getName()).log(Level.SEVERE, null, ex); + } + + } +} + Modified: trunk/msm/src/main/resources/i18n/msm-en_GB.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/resources/i18n/msm-en_GB.properties 2010-03-03 14:16:36 UTC (rev 172) @@ -1,6 +1,7 @@ Empty=Empty Map\ Storage\ Manager=Map Storage Manager connectionError=The connection attempt to failed, please retry \! +connectionValid=The connection is established jaxxdemo.message.goto.site=Visit site login\ \:=Login mapstoragemanager.action.aboutUs=About us Modified: trunk/msm/src/main/resources/i18n/msm-fr_FR.properties =================================================================== --- trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 12:42:10 UTC (rev 171) +++ trunk/msm/src/main/resources/i18n/msm-fr_FR.properties 2010-03-03 14:16:36 UTC (rev 172) @@ -1,6 +1,7 @@ Empty=Vide Map\ Storage\ Manager=Map Storage Manager connectionError=La connexion \u00E0 \u00E9chou\u00E9e, r\u00E9essayez s'il vous pla\u00EEt \! +connectionValid=La connexion est \u00E9tablie jaxxdemo.message.goto.site=Visitez le site login\ \:=Identifiant mapstoragemanager.action.aboutUs=A propos