Author: echatellier Date: 2010-03-24 14:13:33 +0100 (Wed, 24 Mar 2010) New Revision: 250 Log: Replace RessourceBundle by nuiton-i18n Removed: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.properties trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip_fr.properties Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties Modified: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.java 2010-03-24 13:13:33 UTC (rev 250) @@ -75,8 +75,8 @@ */ private static final int MARGIN = 10; - private static final String MSG = "org.nuiton.widget.tooltip.FocusableTip"; - private static final ResourceBundle msg = ResourceBundle.getBundle(MSG); + //private static final String MSG = "org.nuiton.widget.tooltip.FocusableTip"; + //private static final ResourceBundle msg = ResourceBundle.getBundle(MSG); public FocusableTip(JComponent attachedComponent, HyperlinkListener listener) { @@ -169,15 +169,15 @@ } - /** + /* * Returns localized text for the given key. * * @param key The key into the resource bundle. * @return The localized text. - */ + * static String getString(String key) { return msg.getString(key); - } + }*/ /** Deleted: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.properties =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.properties 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip.properties 2010-03-24 13:13:33 UTC (rev 250) @@ -1 +0,0 @@ -FocusHotkey=Press 'F2' for focus \ No newline at end of file Deleted: trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip_fr.properties =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip_fr.properties 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/java/org/nuiton/widget/tooltip/FocusableTip_fr.properties 2010-03-24 13:13:33 UTC (rev 250) @@ -1 +0,0 @@ -FocusHotkey=Appuyez sur 'F2' pour agrandir \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java =================================================================== --- trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/java/org/nuiton/widget/tooltip/TipWindow.java 2010-03-24 13:13:33 UTC (rev 250) @@ -22,6 +22,8 @@ */ package org.nuiton.widget.tooltip; +import static org.nuiton.i18n.I18n._; + import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; @@ -244,7 +246,7 @@ } else { panel.setOpaque(false); - JLabel label = new JLabel(FocusableTip.getString("FocusHotkey")); + JLabel label = new JLabel(_("nuitonwidgets.tootilp.focushotkey")/*FocusableTip.getString("FocusHotkey")*/); Color fg = UIManager.getColor("Label.disabledForeground"); Font font = textArea.getFont(); font = font.deriveFont(font.getSize2D() - 1.0f); Modified: trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/resources/i18n/nuiton-widgets-en_GB.properties 2010-03-24 13:13:33 UTC (rev 250) @@ -22,3 +22,4 @@ nuitonwidgets.monitor.stream.log=Log stream nuitonwidgets.monitor.stream.output=Output stream nuitonwidgets.monitor.title=Application console +nuitonwidgets.tootilp.focushotkey=Press 'F2' for focus Modified: trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-03-15 14:56:12 UTC (rev 249) +++ trunk/src/main/resources/i18n/nuiton-widgets-fr_FR.properties 2010-03-24 13:13:33 UTC (rev 250) @@ -22,3 +22,4 @@ nuitonwidgets.monitor.stream.log=Logs nuitonwidgets.monitor.stream.output=Sortie standard nuitonwidgets.monitor.title=Moniteur de l'application +nuitonwidgets.tootilp.focushotkey=Appuyez sur 'F2' pour agrandir