diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2008-12-09 21:28:54 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2008-12-09 21:28:54 +0000 |
| commit | 9daa19303fa336ed1051c6847fb63f8d46842492 (patch) | |
| tree | 8a411f516d6afb72640ddb6c27507a918140385a /src/net/java/sip/communicator | |
| parent | 331d75a93a6f83444b5d295c1697d6e707c19d46 (diff) | |
| download | jitsi-9daa19303fa336ed1051c6847fb63f8d46842492.zip jitsi-9daa19303fa336ed1051c6847fb63f8d46842492.tar.gz jitsi-9daa19303fa336ed1051c6847fb63f8d46842492.tar.bz2 | |
Language resources updated.
Diffstat (limited to 'src/net/java/sip/communicator')
191 files changed, 2469 insertions, 2168 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java index b247dd0..ffd1f5e 100644 --- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java +++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.account.*; @@ -924,8 +923,10 @@ public class UIServiceImpl if (isTransparentWindowEnabled) { new ErrorDialog(mainFrame, - Messages.getI18NString("error").getText(), - Messages.getI18NString("transparencyNotEnabled").getText()) + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources() + .getI18NString("service.gui.TRANSPARENCY_NOT_ENABLED")) .showDialog(); } diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java index 8f3966d..bc4da54 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java @@ -13,7 +13,7 @@ import java.io.*; import javax.swing.*; import javax.swing.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; @@ -36,7 +36,7 @@ public class ErrorDialog private Logger logger = Logger.getLogger(ErrorDialog.class); private JButton okButton = new JButton( - Messages.getI18NString("ok").getText()); + GuiActivator.getResources().getI18NString("service.gui.OK")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ERROR_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java index caa7fa5..b01924f 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java @@ -12,7 +12,7 @@ import java.lang.reflect.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -30,13 +30,14 @@ public class MessageDialog implements ActionListener { private JButton cancelButton = new JButton( - Messages.getI18NString("cancel").getText()); + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JButton okButton = new JButton( - Messages.getI18NString("ok").getText()); + GuiActivator.getResources().getI18NString("service.gui.OK")); - private JCheckBox doNotAskAgain = - new SIPCommCheckBox(Messages.getI18NString("doNotAskAgain").getText()); + private JCheckBox doNotAskAgain = new JCheckBox( + GuiActivator.getResources() + .getI18NString("service.gui.DO_NOT_ASK_AGAIN")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.WARNING_ICON))); @@ -172,8 +173,8 @@ public class MessageDialog if(!isCancelButtonEnabled) { - doNotAskAgain.setText( - Messages.getI18NString("doNotShowAgain").getText()); + doNotAskAgain.setText(GuiActivator.getResources() + .getI18NString("service.gui.DO_NOT_SHOW_AGAIN")); buttonsPanel.remove(cancelButton); } diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java index 10ae623..5b45f35 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java @@ -14,7 +14,8 @@ import java.util.*; import javax.swing.*; import javax.swing.border.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.util.swing.*; @@ -469,11 +470,12 @@ public class Wizard nextButton.addActionListener(wizardController); cancelButton.addActionListener(wizardController); - backButton - .setMnemonic(Messages.getI18NString("previous").getMnemonic()); - nextButton.setMnemonic(Messages.getI18NString("next").getMnemonic()); - cancelButton - .setMnemonic(Messages.getI18NString("cancel").getMnemonic()); + backButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.PREVIOUS")); + nextButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.NEXT")); + cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); // Create the buttons with a separator above them, then place them // on the east side of the panel with a small amount of space between @@ -511,10 +513,14 @@ public class Wizard static { - BACK_TEXT = Messages.getI18NString("previous").getText(); - NEXT_TEXT = Messages.getI18NString("next").getText(); - CANCEL_TEXT = Messages.getI18NString("cancel").getText(); - FINISH_TEXT = Messages.getI18NString("finish").getText(); + BACK_TEXT + = GuiActivator.getResources().getI18NString("service.gui.PREVIOUS"); + NEXT_TEXT + = GuiActivator.getResources().getI18NString("service.gui.NEXT"); + CANCEL_TEXT + = GuiActivator.getResources().getI18NString("service.gui.CANCEL"); + FINISH_TEXT + = GuiActivator.getResources().getI18NString("service.gui.FINISH"); } public BufferedImage getWizzardIcon() diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java index d4e652b..9793a18 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java @@ -9,9 +9,9 @@ package net.java.sip.communicator.impl.gui.customcontrols.wizard; import java.awt.event.*; -import net.java.sip.communicator.service.gui.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.service.gui.*; /** * This class is responsible for reacting to events generated by pushing any @@ -82,10 +82,11 @@ public class WizardController implements ActionListener { //validation or account initialization. If this is what happened here //just show an error and leave everything on the same page so that //the user would have the chance to correct errors. - new ErrorDialog(null, - Messages.getI18NString("error").getText(), - ex.getMessage(), - ex).showDialog(); + new ErrorDialog( + null, + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + ex.getMessage(), + ex).showDialog(); return; } diff --git a/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java b/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java deleted file mode 100644 index 83bf110..0000000 --- a/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package net.java.sip.communicator.impl.gui.i18n; - -public class I18NString -{ - - private String text; - - private char mnemonic; - - public char getMnemonic() - { - return mnemonic; - } - - public void setMnemonic(char mnemonic) - { - this.mnemonic = mnemonic; - } - - public String getText() - { - return text; - } - - public void setText(String text) - { - this.text = text; - } -} diff --git a/src/net/java/sip/communicator/impl/gui/i18n/Messages.java b/src/net/java/sip/communicator/impl/gui/i18n/Messages.java deleted file mode 100644 index 8f1a053..0000000 --- a/src/net/java/sip/communicator/impl/gui/i18n/Messages.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package net.java.sip.communicator.impl.gui.i18n; - -import java.text.*; -import java.util.*; - -import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.service.resources.*; - -/** - * The Messages class manages the access to the internationalization properties - * files. - * - * @author Yana Stamcheva - */ -public class Messages { - - /** - * Returns an internationalized string corresponding to the given key. - * @param key The key of the string. - * @return An internationalized string corresponding to the given key. - */ - public static I18NString getI18NString(String key) { - I18NString i18nString = new I18NString(); - - try { - ResourceManagementService resources = GuiActivator.getResources(); - String resourceString = resources.getI18NString(key); - char mnemonic = resources.getI18nMnemonic(key); - - if(mnemonic > 0) - i18nString.setMnemonic(mnemonic); - i18nString.setText(resourceString); - - } catch (MissingResourceException e) { - i18nString.setText('!' + key + '!'); - } - - return i18nString; - } - - /** - * Returns an internationalized string corresponding to the given key, by - * replacing all occurrences of '?' with the given string param. - * - * @param key The key of the string. - * @param params the params, that should replace {1}, {2}, etc. in the - * string given by the key parameter - * @return An internationalized string corresponding to the given key, by - * replacing all occurrences of '?' with the given string param. - */ - public static I18NString getI18NString(String key, String[] params) { - I18NString i18nString = new I18NString(); - - try { - ResourceManagementService resources = GuiActivator.getResources(); - String resourceString = resources.getI18NString(key); - - // Escape the single quote - resourceString = resourceString.replaceAll("'", "''"); - resourceString = - MessageFormat.format(resourceString, (Object[]) params); - - char mnemonic = resources.getI18nMnemonic(key); - - if(mnemonic > 0) - i18nString.setMnemonic(mnemonic); - i18nString.setText(resourceString); - - } catch (MissingResourceException e) { - i18nString.setText('!' + key + '!'); - } - - return i18nString; - } -} diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 13911e4..5433d6e 100755 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -18,7 +18,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.call.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; @@ -160,7 +159,8 @@ public class MainFrame this.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); this.setKeybindingInput(KeybindingSet.Category.MAIN); - this.addKeybindingAction("main-rename", new RenameAction()); + this.addKeybindingAction("plugin.keybindings.MAIN_RENAME", + new RenameAction()); TransparentPanel northPanel = new TransparentPanel(new BorderLayout()); @@ -196,7 +196,7 @@ public class MainFrame moreActionsPanel.add(moreActionsLabel); moreActionsLabel.setToolTipText(GuiActivator.getResources() - .getI18NString("openTools")); + .getI18NString("service.gui.OPEN_TOOLS")); moreActionsLabel.addMouseListener(new ActionMenuMouseListener()); @@ -1453,9 +1453,11 @@ public class MainFrame if (ConfigurationManager.isQuitWarningShown()) { MessageDialog dialog = - new MessageDialog(null, Messages.getI18NString( - "close").getText(), Messages.getI18NString( - "hideMainWindow").getText(), false); + new MessageDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.CLOSE"), + GuiActivator.getResources().getI18NString( + "service.gui.HIDE_MAIN_WINDOW"), false); if (dialog.showDialog() == MessageDialog.OK_DONT_ASK_CODE) ConfigurationManager.setQuitWarningShown(false); diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java index 2be2ecc..c9ff6ac 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java @@ -10,8 +10,8 @@ import java.util.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; @@ -37,8 +37,9 @@ public class AccountRegSummaryPage private AccountRegWizardContainerImpl wizardContainer; - private JLabel pageTitleLabel = - new JLabel(Messages.getI18NString("summary").getText(), JLabel.CENTER); + private JLabel pageTitleLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.SUMMARY"), + JLabel.CENTER); /** * Creates an <tt>AccountRegSummaryPage</tt>. diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java index eb275ea..9406f0a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java @@ -14,7 +14,6 @@ import javax.imageio.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.wizard.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.gui.*; @@ -48,8 +47,8 @@ public class AccountRegWizardContainerImpl { super(mainFrame); - this.setTitle(Messages.getI18NString("accountRegistrationWizard") - .getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.ACCOUNT_REGISTRATION_WIZARD")); this.summaryPage = new AccountRegSummaryPage(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java index 9316f25..e0fbf4f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java @@ -15,8 +15,9 @@ import javax.imageio.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; + import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.gui.*; @@ -43,9 +44,11 @@ public class AccountsConfigurationForm private final JPanel accountsPanel = new TransparentPanel(); - private final JButton newButton; + private final JButton newButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT")); - private final JButton saveButton; + private final JButton saveButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.SAVE")); private final Map<ProtocolProviderService, AccountPanel> accounts = new Hashtable<ProtocolProviderService, AccountPanel>(); @@ -69,16 +72,18 @@ public class AccountsConfigurationForm this.add(scrollPane, BorderLayout.CENTER); this.add(buttonsPanel, BorderLayout.SOUTH); - I18NString newString = Messages.getI18NString("newAccount"); - newButton = new JButton(newString.getText()); newButton.addActionListener(this); - this.newButton.setMnemonic(newString.getMnemonic()); - buttonsPanel.add(newButton); - - I18NString saveString = Messages.getI18NString("save"); - saveButton = new JButton(saveString.getText()); saveButton.addActionListener(this); - saveButton.setMnemonic(saveString.getMnemonic()); + + this.newButton.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.NEW_ACCOUNT")); + + this.saveButton.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.SAVE")); + + buttonsPanel.add(newButton); buttonsPanel.add(saveButton); scrollPane.getViewport().add(wrapAccountsPanel); @@ -138,13 +143,11 @@ public class AccountsConfigurationForm private JPasswordField passwordField = new JPasswordField(); - private I18NString modifyString = Messages.getI18NString("settings"); - - private I18NString removeString = Messages.getI18NString("remove"); - - private JButton modifyButton = new JButton(modifyString.getText()); + private JButton modifyButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.MODIFY")); - private JButton removeButton = new JButton(removeString.getText()); + private JButton removeButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.REMOVE")); private GridBagConstraints constraints = new GridBagConstraints(); @@ -263,9 +266,12 @@ public class AccountsConfigurationForm if (providerFactory != null) { int result = - JOptionPane.showConfirmDialog(this, Messages - .getI18NString("removeAccountMessage").getText(), - Messages.getI18NString("removeAccount").getText(), + JOptionPane.showConfirmDialog( + this, + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_ACCOUNT_MESSAGE"), + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_ACCOUNT"), JOptionPane.YES_NO_OPTION); if (result == JOptionPane.YES_OPTION) @@ -304,8 +310,8 @@ public class AccountsConfigurationForm (AccountRegWizardContainerImpl) GuiActivator.getUIService() .getAccountRegWizardContainer(); - wizard.setTitle(Messages.getI18NString( - "accountRegistrationWizard").getText()); + wizard.setTitle(GuiActivator.getResources().getI18NString( + "service.gui.ACCOUNT_REGISTRATION_WIZARD")); wizard.modifyAccount(protocolProvider); wizard.showDialog(false); @@ -320,7 +326,7 @@ public class AccountsConfigurationForm */ public String getTitle() { - return Messages.getI18NString("accounts").getText(); + return GuiActivator.getResources().getI18NString("service.gui.ACCOUNTS"); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java index 10f4243..92fcafe 100644 --- a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java @@ -13,7 +13,6 @@ import java.util.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; @@ -38,18 +37,18 @@ public class NewAccountDialog = new TransparentPanel(new BorderLayout()); private JLabel networkLabel = new JLabel( - Messages.getI18NString("network").getText()); + GuiActivator.getResources().getI18NString("service.gui.NETWORK")); private JComboBox networkComboBox = new JComboBox(); private JButton advancedButton = new JButton( - Messages.getI18NString("advanced").getText()); + GuiActivator.getResources().getI18NString("service.gui.ADVANCED")); private JButton addAccountButton = new JButton( - Messages.getI18NString("add").getText()); + GuiActivator.getResources().getI18NString("service.gui.ADD")); private JButton cancelButton = new JButton( - Messages.getI18NString("cancel").getText()); + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel rightButtonPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0)); @@ -63,7 +62,8 @@ public class NewAccountDialog { super(GuiActivator.getUIService().getMainFrame()); - this.setTitle(Messages.getI18NString("newAccount").getText()); + this.setTitle( + GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT")); this.getContentPane().add(mainPanel); @@ -263,8 +263,9 @@ public class NewAccountDialog { wizard.setModification(false); - wizardContainer.setTitle(Messages.getI18NString( - "accountRegistrationWizard").getText()); + wizardContainer.setTitle( + GuiActivator.getResources().getI18NString( + "service.gui.ACCOUNT_REGISTRATION_WIZARD")); wizardContainer.setCurrentWizard(wizard); diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java index 07720a3..6fe313c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -49,17 +50,14 @@ public class AuthorizationRequestedDialog private JLabel iconLabel = new JLabel(new ImageIcon( ImageLoader.getImage(ImageLoader.AUTHORIZATION_ICON))); - private I18NString acceptString = Messages.getI18NString("accept"); - - private I18NString rejectString = Messages.getI18NString("reject"); - - private I18NString ignoreString = Messages.getI18NString("ignore"); + private JButton acceptButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.ACCEPT")); - private JButton acceptButton = new JButton(acceptString.getText()); + private JButton rejectButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.REJECT")); - private JButton rejectButton = new JButton(rejectString.getText()); - - private JButton ignoreButton = new JButton(ignoreString.getText()); + private JButton ignoreButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.IGNORE")); private JScrollPane requestScrollPane = new JScrollPane(); @@ -69,7 +67,8 @@ public class AuthorizationRequestedDialog new TransparentPanel(new GridLayout(0, 1, 5, 5)); private String title - = Messages.getI18NString("authorizationRequested").getText(); + = GuiActivator.getResources() + .getI18NString("service.gui.AUTHORIZATION_REQUESTED"); private Object lock = new Object(); @@ -89,13 +88,15 @@ public class AuthorizationRequestedDialog this.setModal(false); this.setTitle(title); - + titleLabel.setHorizontalAlignment(JLabel.CENTER); titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f)); titleLabel.setText(title); - infoTextArea.setText(Messages.getI18NString("authorizationRequestedInfo", - new String[]{contact.getDisplayName()}).getText()); + infoTextArea.setText( + GuiActivator.getResources().getI18NString( + "service.gui.AUTHORIZATION_REQUESTED_INFO", + new String[]{contact.getDisplayName()})); this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f)); this.infoTextArea.setLineWrap(true); @@ -109,49 +110,51 @@ public class AuthorizationRequestedDialog this.northPanel.add(iconLabel, BorderLayout.WEST); this.northPanel.add(titlePanel, BorderLayout.CENTER); - if(request.getReason() != null && !request.getReason().equals("")) { - + if(request.getReason() != null && !request.getReason().equals("")) + { this.requestScrollPane.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(3, 3, 3, 3), SIPCommBorders.getBoldRoundBorder())); - + this.requestPane.setEditable(false); this.requestPane.setOpaque(false); this.requestPane.setText(request.getReason()); - + this.requestScrollPane.getViewport().add(requestPane); this.reasonsPanel.add(requestScrollPane); - this.mainPanel.setPreferredSize(new Dimension(550, 300)); + this.mainPanel.setPreferredSize(new Dimension(550, 300)); } else { this.mainPanel.setPreferredSize(new Dimension(550, 200)); } - - - this.acceptButton.setName("accept"); + + this.acceptButton.setName("service.gui.ACCEPT"); this.rejectButton.setName("reject"); this.ignoreButton.setName("ignore"); - + this.getRootPane().setDefaultButton(acceptButton); this.acceptButton.addActionListener(this); this.rejectButton.addActionListener(this); this.ignoreButton.addActionListener(this); - - this.acceptButton.setMnemonic(acceptString.getMnemonic()); - this.rejectButton.setMnemonic(rejectString.getMnemonic()); - this.ignoreButton.setMnemonic(ignoreString.getMnemonic()); - + + this.acceptButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.ACCEPT")); + this.rejectButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.REJECT")); + this.ignoreButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.IGNORE")); + this.buttonsPanel.add(acceptButton); this.buttonsPanel.add(rejectButton); this.buttonsPanel.add(ignoreButton); - + this.mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); this.mainPanel.add(northPanel, BorderLayout.NORTH); this.mainPanel.add(reasonsPanel, BorderLayout.CENTER); this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH); - + this.getContentPane().add(mainPanel); } @@ -159,11 +162,14 @@ public class AuthorizationRequestedDialog * Shows this modal dialog. * @return the result code, which shows what was the choice of the user */ - public int showDialog() { + public int showDialog() + { this.setVisible(true); - synchronized (lock) { - try { + synchronized (lock) + { + try + { lock.wait(); } catch (InterruptedException e) { @@ -183,7 +189,7 @@ public class AuthorizationRequestedDialog JButton button = (JButton)e.getSource(); String name = button.getName(); - if (name.equals("accept")) { + if (name.equals("service.gui.ACCEPT")) { this.result = ACCEPT_CODE; } else if (name.equals("reject")) { diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java index 508a408..b65dbab 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -28,9 +29,8 @@ public class AuthorizationResponseDialog extends SIPCommDialog private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); - private I18NString okString = Messages.getI18NString("ok"); - - private JButton okButton = new JButton(okString.getText()); + private JButton okButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.OK")); private JScrollPane responseScrollPane = new JScrollPane(); @@ -46,8 +46,9 @@ public class AuthorizationResponseDialog extends SIPCommDialog private JLabel titleLabel = new JLabel(); private String title - = Messages.getI18NString("authorizationResponse").getText(); - + = GuiActivator.getResources() + .getI18NString("service.gui.AUTHORIZATION_RESPONSE"); + /** * Constructs the <tt>RequestAuthorisationDialog</tt>. * @@ -68,17 +69,19 @@ public class AuthorizationResponseDialog extends SIPCommDialog titleLabel.setText(title); this.mainPanel.setPreferredSize(new Dimension(400, 250)); - + AuthorizationResponse.AuthorizationResponseCode responseCode = response.getResponseCode(); if(responseCode.equals(AuthorizationResponse.ACCEPT)) { infoTextArea.setText(contact.getDisplayName() + " " - + Messages.getI18NString("authAccepted").getText()); + + GuiActivator.getResources().getI18NString( + "service.gui.AUTHORIZATION_ACCEPTED")); } else if(responseCode.equals(AuthorizationResponse.REJECT)) { infoTextArea.setText(contact.getDisplayName() + " " - + Messages.getI18NString("authRejected").getText()); + + GuiActivator.getResources() + .getI18NString("service.gui.AUTHENTICATION_REJECTED")); } if(response.getReason() != null && !response.getReason().equals("")) { @@ -117,7 +120,8 @@ public class AuthorizationResponseDialog extends SIPCommDialog this.okButton.requestFocus(); this.okButton.setName("ok"); - this.okButton.setMnemonic(okString.getMnemonic()); + this.okButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.OK")); this.getRootPane().setDefaultButton(okButton); this.okButton.addActionListener(this); @@ -128,7 +132,7 @@ public class AuthorizationResponseDialog extends SIPCommDialog this.mainPanel.add(northPanel, BorderLayout.NORTH); this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH); - this.getContentPane().add(mainPanel); + this.getContentPane().add(mainPanel); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java index 1ed011d..5c3adda 100644 --- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; @@ -34,7 +35,8 @@ public class RequestAuthorizationDialog private JTextArea infoTextArea = new JTextArea(); private JLabel requestLabel = new JLabel( - Messages.getI18NString("typeYourRequest").getText() + ": "); + GuiActivator.getResources() + .getI18NString("service.gui.TYPE_YOUR_REQUEST") + ": "); private JTextField requestField = new JTextField(); @@ -43,13 +45,13 @@ public class RequestAuthorizationDialog private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); - private I18NString requestString = Messages.getI18NString("request"); - - private I18NString cancelString = Messages.getI18NString("cancel"); + private String cancelString + = GuiActivator.getResources().getI18NString("service.gui.CANCEL"); - private JButton requestButton = new JButton(requestString.getText()); + private JButton requestButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.REQUEST")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton(cancelString); private JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10)); @@ -62,8 +64,8 @@ public class RequestAuthorizationDialog private JLabel titleLabel = new JLabel(); - private String title - = Messages.getI18NString("requestAuthorization").getText(); + private String title = GuiActivator.getResources() + .getI18NString("service.gui.REQUEST_AUTHORIZATION"); private AuthorizationRequest request; @@ -85,7 +87,7 @@ public class RequestAuthorizationDialog this.setModal(false); this.setTitle(title); - + titleLabel.setHorizontalAlignment(JLabel.CENTER); titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f)); titleLabel.setText(title); @@ -94,15 +96,16 @@ public class RequestAuthorizationDialog this.request = request; - infoTextArea.setText(Messages.getI18NString("requestAuthorizationInfo", - new String[]{contact.getDisplayName()}).getText()); + infoTextArea.setText(GuiActivator.getResources().getI18NString( + "service.gui.REQUEST_AUTHORIZATION_MSG", + new String[]{contact.getDisplayName()})); this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f)); this.infoTextArea.setLineWrap(true); this.infoTextArea.setOpaque(false); this.infoTextArea.setWrapStyleWord(true); this.infoTextArea.setEditable(false); - + this.titlePanel.add(titleLabel); this.titlePanel.add(infoTextArea); @@ -122,15 +125,17 @@ public class RequestAuthorizationDialog this.buttonsPanel.add(cancelButton); this.getRootPane().setDefaultButton(requestButton); - this.requestButton.setMnemonic(requestString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.requestButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.REQUEST")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); this.mainPanel.add(northPanel, BorderLayout.NORTH); this.mainPanel.add(requestPanel, BorderLayout.CENTER); this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH); - this.getContentPane().add(mainPanel); + this.getContentPane().add(mainPanel); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java index fc1e390..f16637f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.swing.*; @@ -45,7 +44,8 @@ public class CallDialog { this.callPanel = callPanel; - this.setTitle(GuiActivator.getResources().getI18NString("call")); + this.setTitle( + GuiActivator.getResources().getI18NString("service.gui.CALL")); this.setPreferredSize(new Dimension(500, 400)); @@ -60,7 +60,8 @@ public class CallDialog dialButton.setName(DIAL_BUTTON); - dialButton.setToolTipText(Messages.getI18NString("dialpad").getText()); + dialButton.setToolTipText( + GuiActivator.getResources().getI18NString("service.gui.DIALPAD")); dialButton.addActionListener(this); @@ -71,7 +72,7 @@ public class CallDialog hangupButton.setName(HANGUP_BUTTON); hangupButton.setToolTipText( - Messages.getI18NString("hangUp").getText()); + GuiActivator.getResources().getI18NString("service.gui.HANG_UP")); hangupButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java index 54c83dd..53e7673 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java @@ -261,7 +261,7 @@ public class CallManager logger.error("The call could not be created: " + e); new ErrorDialog(null, - GuiActivator.getResources().getI18NString("error"), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), e.getMessage(), ErrorDialog.ERROR).showDialog(); } @@ -270,7 +270,7 @@ public class CallManager logger.error("The call could not be created: " + e); new ErrorDialog(null, - GuiActivator.getResources().getI18NString("error"), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), e.getMessage(), ErrorDialog.ERROR).showDialog(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java index b19648e..59845ab 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java @@ -14,7 +14,7 @@ import javax.swing.*; import javax.swing.Timer; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; + import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.event.*; @@ -328,19 +328,22 @@ public class CallParticipantPanel secureButton.setActionCommand("startSecureMode"); secureButton.setName("secureButton"); - secureButton.setToolTipText(Messages.getI18NString( - "toggleOnSecurity").getText()); + secureButton.setToolTipText( + GuiActivator.getResources().getI18NString( + "impl.media.security.TOGGLE_ON_SECURITY")); return secureButton; } } return null; } - public void changeSecureCallButton(boolean onOff) { + public void changeSecureCallButton(boolean onOff) + { secureButton.updateSecureButton(onOff); } - public void changeZrtpPanel(SecurityGUIEventZrtp securityEvent) { + public void changeZrtpPanel(SecurityGUIEventZrtp securityEvent) + { Call call = callParticipant.getCall(); if (call != null) { @@ -710,7 +713,7 @@ public class CallParticipantPanel .getImage(ImageLoader.ENTER_FULL_SCREEN_BUTTON))); button.setToolTipText(GuiActivator.getResources().getI18NString( - "CallParticipantPanel_enterFullScreenButtonToolTipText")); + "service.gui.ENTER_FULL_SCREEN_TOOL_TIP")); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) @@ -728,7 +731,7 @@ public class CallParticipantPanel .getImage(ImageLoader.EXIT_FULL_SCREEN_BUTTON))); button.setToolTipText(GuiActivator.getResources().getI18NString( - "CallParticipantPanel_exitFullScreenButtonToolTipText")); + "service.gui.EXIT_FULL_SCREEN_TOOL_TIP")); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) diff --git a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java index 6f4b916..41f8bc2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java @@ -39,7 +39,7 @@ public class HoldButton setModel(new HoldButtonModel(callParticipant)); setToolTipText(GuiActivator.getResources().getI18NString( - "HoldButton_toolTipText")); + "service.gui.HOLD_BUTTON_TOOL_TIP")); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java index 84c6571..049bc5f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java @@ -16,7 +16,6 @@ import javax.swing.event.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; @@ -65,7 +64,9 @@ public class MainCallPanel = new TransparentPanel(new BorderLayout()); private JLabel callViaLabel - = new JLabel(Messages.getI18NString("callVia").getText() + " "); + = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.CALL_VIA") + + " "); private TransparentPanel callViaPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT, 0, 4)); @@ -113,7 +114,7 @@ public class MainCallPanel dialButton.setName(DIAL_BUTTON); callButton.setToolTipText( - Messages.getI18NString("call").getText()); + GuiActivator.getResources().getI18NString("service.gui.CALL")); callButton.addActionListener(this); dialButton.addActionListener(this); @@ -157,12 +158,12 @@ public class MainCallPanel { new ErrorDialog( this.mainFrame, - Messages.getI18NString("warning").getText(), - Messages.getI18NString( - "contactNotSupportingTelephony", + GuiActivator.getResources() + .getI18NString("service.gui.WARNING"), + GuiActivator.getResources().getI18NString( + "service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY", new String[] - { ((MetaContact) o).getDisplayName() }) - .getText()) + { ((MetaContact) o).getDisplayName() })) .showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java index f86f98a..c4ce822 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java @@ -37,7 +37,7 @@ public class MuteButton setModel(new MuteButtonModel(callParticipant)); setToolTipText(GuiActivator.getResources().getI18NString( - "MuteButton_toolTipText")); + "service.gui.MUTE_BUTTON_TOOL_TIP")); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java index 7dc8d04..5ceb010 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java @@ -151,14 +151,15 @@ public class ReceivedCallDialog text = callLabel.getText() + participant.getDisplayName() + " " - + GuiActivator.getResources().getI18NString("isCalling"); + + GuiActivator.getResources().getI18NString("service.gui.IS_CALLING"); imageIcon = getParticipantImage(participant); } } if (hasMoreParticipants) - text += GuiActivator.getResources().getI18NString("areCalling"); + text += GuiActivator.getResources() + .getI18NString("service.gui.ARE_CALLING"); callLabel.setIcon(imageIcon); callLabel.setText(text); diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java index f1cd898..7226b07 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java @@ -10,7 +10,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; @@ -84,7 +85,7 @@ public class SecureButton // We deactivate the tooltip at the moment, because the // secure mode cannot be toggled off //this.setToolTipText( - // Messages.getI18NString("toggleOffSecurity").getText()); + // GuiActivator.getResources().getI18NString("impl.media.security.TOGGLE_OFF_SECURITY").getText()); this.setToolTipText(null); } else @@ -93,7 +94,8 @@ public class SecureButton new ImageIcon( ImageLoader.getImage(ImageLoader.SECURE_BUTTON_OFF))); this.setToolTipText( - Messages.getI18NString("toggleOnSecurity").getText()); + GuiActivator.getResources() + .getI18NString("impl.media.security.TOGGLE_ON_SECURITY")); } } } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java index e39d052..fe7e59e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java @@ -54,7 +54,7 @@ public class TransferCallButton this.callParticipant = callParticipant; setToolTipText(GuiActivator.getResources().getI18NString( - "TransferCallButton_toolTipText")); + "service.gui.TRANSFER_BUTTON_TOOL_TIP")); addActionListener(new ActionListener() { diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java index 9493c2a..9d0d9df 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java @@ -12,8 +12,8 @@ import java.awt.event.*; import javax.swing.*;
import javax.swing.event.*;
+import net.java.sip.communicator.impl.gui.*;
import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
import net.java.sip.communicator.impl.gui.lookandfeel.*;
import net.java.sip.communicator.util.swing.*;
@@ -41,7 +41,8 @@ public class TransferCallDialog {
super(owner);
- setTitle(Messages.getI18NString("transferCallTitle").getText());
+ setTitle(GuiActivator.getResources()
+ .getI18NString("service.gui.TRANSFER_CALL_TITLE"));
JPanel mainPanel = new TransparentPanel(new BorderLayout(5, 5));
mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -52,8 +53,9 @@ public class TransferCallDialog mainPanel.add(contentPanel, BorderLayout.NORTH);
JLabel targetLabel =
- new JLabel(Messages.getI18NString("transferCallTargetLabel")
- .getText());
+ new JLabel(
+ GuiActivator.getResources().getI18NString("service.gui.TO"));
+
contentPanel.add(targetLabel);
targetComboBox = new SIPCommSmartComboBox();
@@ -65,11 +67,15 @@ public class TransferCallDialog mainPanel.add(buttonPanel, BorderLayout.SOUTH);
okButton =
- new JButton(Messages.getI18NString("transferCallButton").getText());
+ new JButton(GuiActivator.getResources()
+ .getI18NString("service.gui.TRANSFER"));
+
buttonPanel.add(okButton);
getRootPane().setDefaultButton(okButton);
- cancelButton = new JButton(Messages.getI18NString("cancel").getText());
+ cancelButton = new JButton(
+ GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
+
buttonPanel.add(cancelButton);
/*
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java index fbd1fdc..b5bba70 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java @@ -11,8 +11,8 @@ import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; @@ -32,17 +32,11 @@ public class ChatContactRightButtonMenu { private Logger logger = Logger.getLogger(ChatContactRightButtonMenu.class); - private I18NString kickString - = Messages.getI18NString("kick"); - - private I18NString banString - = Messages.getI18NString("ban"); - private JMenuItem kickItem = new JMenuItem( - kickString.getText()); + GuiActivator.getResources().getI18NString("service.gui.KICK")); private JMenuItem banItem = new JMenuItem( - banString.getText()); + GuiActivator.getResources().getI18NString("service.gui.BAN")); private static String KICK_OPERATION = "Kick"; @@ -78,11 +72,11 @@ public class ChatContactRightButtonMenu this.kickItem.setName("kick"); this.banItem.setName("ban"); - this.kickItem - .setMnemonic(kickString.getMnemonic()); + this.kickItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.KICK")); - this.banItem - .setMnemonic(banString.getMnemonic()); + this.banItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.BAN")); this.kickItem.addActionListener(this); this.banItem.addActionListener(this); @@ -113,22 +107,24 @@ public class ChatContactRightButtonMenu ImageLoader.getImage(ImageLoader.REASON_DIALOG_ICON))); private JLabel infoLabel = new JLabel( - Messages.getI18NString("specifyReason").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SPECIFY_REASON")); private JLabel reasonLabel = new JLabel( - Messages.getI18NString("reason").getText() + ":"); + GuiActivator.getResources() + .getI18NString("service.gui.REASON") + ":"); private JTextField reasonField = new JTextField(); private JButton okButton = new JButton( - Messages.getI18NString("ok").getText()); + GuiActivator.getResources().getI18NString("service.gui.OK")); private JButton cancelButton = new JButton( - Messages.getI18NString("cancel").getText()); + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - + private JPanel titlePanel = new JPanel(new BorderLayout(10, 10)); private JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); @@ -139,13 +135,14 @@ public class ChatContactRightButtonMenu { super(chatPanel.getChatWindow()); - this.setTitle(Messages.getI18NString("reason").getText()); + this.setTitle( + GuiActivator.getResources().getI18NString("service.gui.REASON")); this.operationType = operation; this.buttonsPanel.add(okButton); this.buttonsPanel.add(cancelButton); - + okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -161,11 +158,12 @@ public class ChatContactRightButtonMenu if(chatRoom == null) { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("error").getText(), - Messages.getI18NString("chatRoomNotJoined") - .getText()) + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources() + .getI18NString("service.gui.CHAT_ROOM_NOT_JOINED")) .setVisible(true); - + return; } @@ -248,10 +246,11 @@ public class ChatContactRightButtonMenu { ErrorDialog errorDialog = new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("kickFailed").getText(), - Messages.getI18NString( - "kickFailedNotEnoughPermissions", - new String[]{chatContact.getName()}).getText(), + GuiActivator.getResources() + .getI18NString("service.gui.KICK_FAILED"), + GuiActivator.getResources().getI18NString( + "service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS", + new String[]{chatContact.getName()}), e); errorDialog.showDialog(); @@ -260,17 +259,21 @@ public class ChatContactRightButtonMenu == OperationFailedException.FORBIDDEN) { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("kickFailed").getText(), - Messages.getI18NString("kickFailedNotAllowed", - new String[]{chatContact.getName()}).getText(), + GuiActivator.getResources() + .getI18NString("service.gui.KICK_FAILED"), + GuiActivator.getResources() + .getI18NString("service.gui.KICK_FAILED_NOT_ALLOWED", + new String[]{chatContact.getName()}), e).showDialog(); } else { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("kickFailed").getText(), - Messages.getI18NString("kickFailedGeneralError", - new String[]{chatContact.getName()}).getText(), + GuiActivator.getResources() + .getI18NString("service.gui.KICK_FAILED"), + GuiActivator.getResources() + .getI18NString("service.gui.KICK_FAILED_GENERAL_ERROR", + new String[]{chatContact.getName()}), e).showDialog(); } } @@ -304,33 +307,37 @@ public class ChatContactRightButtonMenu catch (OperationFailedException e) { logger.error("Failed to ban participant.", e); - + + String errorTitle = GuiActivator.getResources() + .getI18NString("service.gui.BAN_FAILED"); + if (e.getErrorCode() == OperationFailedException.NOT_ENOUGH_PRIVILEGES) { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("banFailed").getText(), - Messages.getI18NString("banFailedNotEnoughPermissions", - new String[]{chatContact.getName()}) - .getText(), + errorTitle, + GuiActivator.getResources().getI18NString( + "service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS", + new String[]{chatContact.getName()}), e).showDialog(); } else if (e.getErrorCode() == OperationFailedException.FORBIDDEN) { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("banFailed").getText(), - Messages.getI18NString("banFailedNotAllowed", - new String[]{chatContact.getName()}).getText(), + errorTitle, + GuiActivator.getResources().getI18NString( + "service.gui.BAN_FAILED_NOT_ALLOWED", + new String[]{chatContact.getName()}), e).showDialog(); } else { new ErrorDialog(chatPanel.getChatWindow(), - Messages.getI18NString("banFailed").getText(), - Messages.getI18NString("banFailedGeneralError", - new String[]{chatContact.getName()}) - .getText(), + errorTitle, + GuiActivator.getResources().getI18NString( + "service.gui.BAN_FAILED_GENERAL_ERROR", + new String[]{chatContact.getName()}), e).showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java index e6a3a88..b53287d 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java @@ -20,7 +20,6 @@ import javax.swing.text.html.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; import net.java.sip.communicator.impl.gui.main.chat.menus.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -118,10 +117,13 @@ public class ChatConversationPanel ToolTipManager.sharedInstance().registerComponent(chatEditorPane); - I18NString copyLinkString = Messages.getI18NString("copyLink"); + String copyLinkString + = GuiActivator.getResources().getI18NString("service.gui.COPY_LINK"); + copyLinkItem = - new JMenuItem(copyLinkString.getText(), new ImageIcon(ImageLoader - .getImage(ImageLoader.COPY_ICON))); + new JMenuItem(copyLinkString, + new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON))); + copyLinkItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -135,10 +137,15 @@ public class ChatConversationPanel } }); - I18NString openLinkString = Messages.getI18NString("openInBrowser"); + String openLinkString + = GuiActivator.getResources().getI18NString( + "service.gui.OPEN_IN_BROWSER"); + openLinkItem = - new JMenuItem(openLinkString.getText(), new ImageIcon(ImageLoader - .getImage(ImageLoader.BROWSER_ICON))); + new JMenuItem( + openLinkString, + new ImageIcon(ImageLoader.getImage(ImageLoader.BROWSER_ICON))); + openLinkItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -147,8 +154,13 @@ public class ChatConversationPanel } }); - openLinkItem.setMnemonic(openLinkString.getMnemonic()); - copyLinkItem.setMnemonic(copyLinkString.getMnemonic()); + openLinkItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic( + "service.gui.OPEN_IN_BROWSER")); + + copyLinkItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic( + "service.gui.COPY_LINK")); /* * Tooltip on hyperlinks - JDK 1.5+ @@ -270,10 +282,12 @@ public class ChatConversationPanel + msgHeaderID + "\" date=\"" + msgDate + "\">"; - + endHeaderTag = "</h3>"; - chatString += timeString + Messages.getI18NString("me").getText() + chatString += timeString + + GuiActivator.getResources() + .getI18NString("service.gui.ME") + " at " + GuiUtils.formatTime(date) + endHeaderTag + startDivTag + startPlainTextTag + formatMessage(message, contentType) + endPlainTextTag @@ -323,7 +337,8 @@ public class ChatConversationPanel .getImage(ImageLoader.EXCLAMATION_MARK)) + "' </IMG>"; chatString += errorIcon - + Messages.getI18NString("msgDeliveryFailure").getText() + + GuiActivator.getResources() + .getI18NString("service.gui.MSG_DELIVERY_FAILURE") + endHeaderTag + "<h5>" + message + "</h5>"; } else if (messageType.equals(Constants.HISTORY_INCOMING_MESSAGE)) @@ -349,7 +364,9 @@ public class ChatConversationPanel endHeaderTag = "</h3>"; - chatString += timeString + Messages.getI18NString("me").getText() + chatString += timeString + + GuiActivator.getResources() + .getI18NString("service.gui.ME") + " at " + GuiUtils.formatTime(date) + endHeaderTag + startHistoryDivTag + startPlainTextTag + formatMessage(message, contentType) + endPlainTextTag diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java index 892bf41..1c7241a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java @@ -13,13 +13,13 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.*; import java.util.*; + import javax.swing.*; import javax.swing.text.*; import javax.swing.text.html.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -54,8 +54,8 @@ public class ChatPanel private final JSplitPane messagePane = new JSplitPane(JSplitPane.VERTICAL_SPLIT); - private final JCheckBox sendSmsCheckBox = - new SIPCommCheckBox(Messages.getI18NString("sendAsSms").getText()); + private final JCheckBox sendSmsCheckBox = new JCheckBox( + GuiActivator.getResources().getI18NString("service.gui.SEND_AS_SMS")); private JSplitPane topSplitPane; @@ -819,8 +819,9 @@ public class ChatPanel smsChatTransport.getName(), new Date(System.currentTimeMillis()), Constants.ERROR_MESSAGE, - Messages.getI18NString("sendSmsNotSupported") - .getText(), "plain/text"); + GuiActivator.getResources().getI18NString( + "service.gui.SEND_SMS_NOT_SUPPORTED"), + "plain/text"); return; } @@ -883,8 +884,9 @@ public class ChatPanel chatSession.getCurrentChatTransport().getName(), new Date(System.currentTimeMillis()), Constants.ERROR_MESSAGE, - Messages.getI18NString("msgSendConnectionProblem") - .getText(), "text"); + GuiActivator.getResources().getI18NString( + "service.gui.MSG_SEND_CONNECTION_PROBLEM"), + "text"); } catch (Exception ex) { @@ -903,9 +905,10 @@ public class ChatPanel chatSession.getCurrentChatTransport().getName(), new Date(System.currentTimeMillis()), Constants.ERROR_MESSAGE, - Messages.getI18NString("msgDeliveryUnknownError", - new String[]{ex.getMessage()}) - .getText(), "text"); + GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_UNKNOWN_ERROR", + new String[]{ex.getMessage()}), + "text"); } if (chatSession.getCurrentChatTransport().allowsTypingNotifications()) @@ -931,8 +934,9 @@ public class ChatPanel transportSelectorBox = new ChatTransportSelectorBox( this, chatSession, chatSession.getCurrentChatTransport()); - sendViaLabel - = new JLabel(Messages.getI18NString("sendVia").getText()); + sendViaLabel = new JLabel( + GuiActivator.getResources().getI18NString( + "service.gui.SEND_VIA")); } JPanel sendPanel = getChatSendPanel().getSendPanel(); @@ -985,8 +989,9 @@ public class ChatPanel contact.getDisplayName(), new Date(System.currentTimeMillis()), Constants.ACTION_MESSAGE, - Messages.getI18NString("smsSuccessfullySent") - .getText(), "text"); + GuiActivator.getResources().getI18NString( + "service.gui.SMS_SUCCESSFULLY_SENT"), + "text"); } public void messageDeliveryFailed(MessageDeliveryFailedEvent evt) @@ -1005,29 +1010,30 @@ public class ChatPanel if (evt.getErrorCode() == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED) { - errorMsg = Messages.getI18NString( - "msgDeliveryOfflineNotSupported").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_NOT_SUPPORTED"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.NETWORK_FAILURE) { - errorMsg = Messages.getI18NString("msgNotDelivered").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_NOT_DELIVERED"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED) { - errorMsg = Messages.getI18NString( - "msgSendConnectionProblem").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_SEND_CONNECTION_PROBLEM"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.INTERNAL_ERROR) { - errorMsg = Messages.getI18NString( - "msgDeliveryInternalError").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_INTERNAL_ERROR"); } else { - errorMsg = Messages.getI18NString( - "msgDeliveryFailedUnknownError").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_UNKNOWN_ERROR"); } processMessage( @@ -1211,9 +1217,9 @@ public class ChatPanel chatTransport.getName(), new Date(System.currentTimeMillis()), Constants.STATUS_MESSAGE, - Messages.getI18NString("statusChangedChatMessage", - new String[]{chatTransport.getStatus().getStatusName()}) - .getText(), + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGED_CHAT_MESSAGE", + new String[]{chatTransport.getStatus().getStatusName()}), "text/plain"); getChatConversationPanel().appendMessageToEnd(message); @@ -1362,9 +1368,10 @@ public class ChatPanel chatSession.getChatName(), new Date(System.currentTimeMillis()), Constants.STATUS_MESSAGE, - Messages.getI18NString("chatRoomSubjectChanged", - new String []{chatSession.getChatName(), - subject}).getText(), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_SUBJECT_CHANGED", + new String []{ chatSession.getChatName(), + subject}), ChatConversationPanel.TEXT_CONTENT_TYPE); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java index 48fddc3..58997e5 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java @@ -11,7 +11,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.swing.*; @@ -48,8 +48,8 @@ public class ChatSendPanel { super(new BorderLayout(5, 0)); - I18NString sendString = Messages.getI18NString("send"); - sendButton = new JButton(sendString.getText()); + sendButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.SEND")); this.chatPanel = chatPanel; @@ -61,7 +61,8 @@ public class ChatSendPanel this.add(sendPanel, BorderLayout.EAST); this.sendButton.addActionListener(this); - this.sendButton.setMnemonic(sendString.getMnemonic()); + this.sendButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.SEND")); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index 88c017a..237cacc 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -136,10 +136,10 @@ public class ChatWindow this.initPluginComponents(); this.setKeybindingInput(KeybindingSet.Category.CHAT); - this.addKeybindingAction("chat-nextTab", new ForwordTabAction()); - this.addKeybindingAction("chat-previousTab", new BackwordTabAction()); - this.addKeybindingAction("chat-copy", new CopyAction()); - this.addKeybindingAction("chat-paste", new PasteAction()); + this.addKeybindingAction("plugin.keybindings.CHAT_NEXT_TAB", new ForwordTabAction()); + this.addKeybindingAction("plugin.keybindings.CHAT_PREVIOUS_TAB", new BackwordTabAction()); + this.addKeybindingAction("plugin.keybindings.CHAT_COPY", new CopyAction()); + this.addKeybindingAction("plugin.keybindings.CHAT_PASTE", new PasteAction()); this.addKeybindingAction("chat-openSmilies", new OpenSmileyAction()); this.addKeybindingAction("chat-openHistory", new OpenHistoryAction()); this.addKeybindingAction("chat-close", new CloseAction()); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java index 22b450f..d2c169c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java @@ -10,9 +10,8 @@ import java.util.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.GuiActivator; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; @@ -188,11 +187,17 @@ public class ChatWindowManager if (!chatPanel.isWriteAreaEmpty()) { - SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages - .getI18NString("nonEmptyChatWindowClose").getText()); - int answer = JOptionPane.showConfirmDialog(chatWindow, - msgText, Messages.getI18NString("warning").getText(), - JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + SIPCommMsgTextArea msgText = new SIPCommMsgTextArea( + GuiActivator.getResources().getI18NString( + "service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE")); + + int answer = JOptionPane.showConfirmDialog( + chatWindow, + msgText, + GuiActivator.getResources().getI18NString( + "service.gui.WARNING"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); if (answer == JOptionPane.OK_OPTION) { @@ -202,12 +207,18 @@ public class ChatWindowManager else if (System.currentTimeMillis() - chatWindow .getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000) { - SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages - .getI18NString("closeChatAfterNewMsg").getText()); - - int answer = JOptionPane.showConfirmDialog(chatWindow, - msgText, Messages.getI18NString("warning").getText(), - JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + SIPCommMsgTextArea msgText + = new SIPCommMsgTextArea(GuiActivator.getResources() + .getI18NString( + "service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE")); + + int answer = JOptionPane.showConfirmDialog( + chatWindow, + msgText, + GuiActivator.getResources() + .getI18NString("service.gui.WARNING"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); if (answer == JOptionPane.OK_OPTION) closeChatPanel(chatPanel); @@ -231,11 +242,16 @@ public class ChatWindowManager if (!chatPanel.isWriteAreaEmpty()) { - SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages - .getI18NString("nonEmptyChatWindowClose").getText()); - int answer = JOptionPane.showConfirmDialog(chatWindow, - msgText, Messages.getI18NString("warning").getText(), - JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + SIPCommMsgTextArea msgText = new SIPCommMsgTextArea( + GuiActivator.getResources().getI18NString( + "service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE")); + int answer = JOptionPane.showConfirmDialog( + chatWindow, + msgText, + GuiActivator.getResources() + .getI18NString("service.gui.WARNING"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); if (answer == JOptionPane.OK_OPTION) { @@ -245,11 +261,15 @@ public class ChatWindowManager else if (System.currentTimeMillis() - chatWindow .getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000) { - SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages - .getI18NString("closeChatAfterNewMsg").getText()); - - int answer = JOptionPane.showConfirmDialog(chatWindow, - msgText, Messages.getI18NString("warning").getText(), + SIPCommMsgTextArea msgText = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE")); + + int answer = JOptionPane.showConfirmDialog( + chatWindow, + msgText, + GuiActivator.getResources() + .getI18NString("service.gui.WARNING"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (answer == JOptionPane.OK_OPTION) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java index ef64326..31300c2 100755 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java @@ -17,7 +17,6 @@ import javax.swing.undo.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.menus.*; import net.java.sip.communicator.impl.gui.main.chat.toolBars.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -163,7 +162,9 @@ public class ChatWritePanel KeyEvent.SHIFT_DOWN_MASK), "newLine"); chatPanel.getChatSendPanel().getSendButton().setToolTipText( - "<html>" + Messages.getI18NString("sendMessage").getText() + "<html>" + + GuiActivator.getResources() + .getI18NString("service.gui.SEND_MESSAGE") + " - Enter <br> " + "Use Ctrl-Enter or Shift-Enter to make a new line" + "</html>"); @@ -176,7 +177,8 @@ public class ChatWritePanel chatPanel.getChatSendPanel().getSendButton() .setToolTipText( - Messages.getI18NString("sendMessage").getText() + GuiActivator.getResources() + .getI18NString("service.gui.SEND_MESSAGE") + " Ctrl-Enter"); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java index 5878124..13db4d9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java @@ -56,7 +56,7 @@ public class MetaContactChatContact String name = metaContact.getDisplayName(); if (name == null || name.length() < 1) - name = GuiActivator.getResources().getI18NString("unknown"); + name = GuiActivator.getResources().getI18NString("service.gui.UNKNOWN"); return name; } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java index a648b29..2afe27d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java @@ -12,7 +12,6 @@ import java.util.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.contactlist.event.*; @@ -113,7 +112,7 @@ public class MetaContactChatSession if (displayName != null && displayName.length() > 0) return metaContact.getDisplayName(); - return Messages.getI18NString("unknown").getText(); + return GuiActivator.getResources().getI18NString("service.gui.UNKNOWN"); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java index 6348c0d..362f672 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java @@ -12,7 +12,8 @@ import java.util.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.swing.*; @@ -29,21 +30,22 @@ public class SendSmsDialog { private Logger logger = Logger.getLogger(SendSmsDialog.class); - private String title = Messages.getI18NString("sendSms").getText(); + private String title + = GuiActivator.getResources().getI18NString("service.gui.SEND_SMS"); private JLabel phoneNumberLabel = new JLabel( - Messages.getI18NString("enterPhoneNumber").getText()); + GuiActivator.getResources().getI18NString("service.gui.ENTER_PHONE_NUMBER")); private JTextField phoneNumberBox = new JTextField(); private JTextArea detailsArea = new JTextArea( - Messages.getI18NString("sendSmsDetails").getText()); + GuiActivator.getResources().getI18NString("service.gui.SEND_SMS_DETAILS")); private JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); private JButton sendButton = new JButton( - Messages.getI18NString("send").getText()); + GuiActivator.getResources().getI18NString("service.gui.SEND")); private JPanel buttonPanel = new JPanel( new FlowLayout(FlowLayout.RIGHT)); @@ -141,8 +143,9 @@ public class SendSmsDialog phoneNumber, new Date(System.currentTimeMillis()), Constants.ERROR_MESSAGE, - Messages.getI18NString("smsSendConnectionProblem") - .getText(), "text"); + GuiActivator.getResources() + .getI18NString("service.gui.SMS_SEND_CONNECTION_PROBLEM"), + "text"); } catch (Exception ex) { @@ -161,9 +164,10 @@ public class SendSmsDialog phoneNumber, new Date(System.currentTimeMillis()), Constants.ERROR_MESSAGE, - Messages.getI18NString("msgDeliveryUnknownError", - new String[]{ex.getMessage()}) - .getText(), "text"); + GuiActivator.getResources() + .getI18NString("service.gui.MSG_DELIVERY_UNKNOWN_ERROR", + new String[]{ex.getMessage()}), + "text"); } this.dispose(); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java index f98b17d..26b275d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java @@ -11,7 +11,7 @@ import java.awt.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; @@ -44,7 +44,8 @@ public class ChatContactCellRenderer if (displayName == null || displayName.length() < 1) { - displayName = Messages.getI18NString("unknown").getText(); + displayName = GuiActivator.getResources() + .getI18NString("service.gui.UNKNOWN"); } this.nameLabel.setFont(this.getFont().deriveFont(Font.PLAIN)); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java index 54f208e..a6d0d1a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java @@ -13,7 +13,6 @@ import java.util.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.chat.*; @@ -36,10 +35,10 @@ public class ChatInviteDialog private JTextArea reasonArea = new JTextArea(); private JButton inviteButton = new JButton( - GuiActivator.getResources().getI18NString("invite")); + GuiActivator.getResources().getI18NString("service.gui.INVITE")); private JButton cancelButton = new JButton( - GuiActivator.getResources().getI18NString("cancel")); + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private DefaultListModel contactListModel = new DefaultListModel(); @@ -61,8 +60,8 @@ public class ChatInviteDialog this.setModal(false); - String title - = Messages.getI18NString("inviteContactToChat").getText(); + String title = GuiActivator.getResources() + .getI18NString("service.gui.INVITE_CONTACT_TO_CHAT"); this.setTitle(title); @@ -78,12 +77,13 @@ public class ChatInviteDialog BorderFactory.createEmptyBorder(15, 15, 15, 15)); this.reasonArea.setBorder(BorderFactory.createTitledBorder( - GuiActivator.getResources().getI18NString("inviteReason"))); + GuiActivator.getResources() + .getI18NString("service.gui.INVITE_REASON"))); JTextArea infoTextArea = new JTextArea(); - infoTextArea.setText( - Messages.getI18NString("inviteContactFormInfo").getText()); + infoTextArea.setText(GuiActivator.getResources() + .getI18NString("service.gui.INVITE_CONTACT_MSG")); infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f)); infoTextArea.setLineWrap(true); @@ -108,9 +108,9 @@ public class ChatInviteDialog this.getRootPane().setDefaultButton(inviteButton); inviteButton.setMnemonic( - GuiActivator.getResources().getI18nMnemonic("invite")); + GuiActivator.getResources().getI18nMnemonic("service.gui.INVITE")); cancelButton.setMnemonic( - GuiActivator.getResources().getI18nMnemonic("cancel")); + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); MainFrame mainFrame = GuiActivator.getUIService().getMainFrame(); @@ -179,10 +179,10 @@ public class ChatInviteDialog JPanel addRemoveButtonsPanel = new JPanel(new GridLayout(0, 2, 5, 5)); JButton addContactButton = new JButton( - GuiActivator.getResources().getI18NString("add")); + GuiActivator.getResources().getI18NString("service.gui.ADD")); JButton removeContactButton = new JButton( - GuiActivator.getResources().getI18NString("remove")); + GuiActivator.getResources().getI18NString("service.gui.REMOVE")); addRemoveButtonsPanel.add(addContactButton); addRemoveButtonsPanel.add(removeContactButton); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java index edd5f06..3c6f611 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java @@ -13,8 +13,8 @@ import java.util.*; import javax.swing.*; import javax.swing.text.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.swing.*; @@ -35,10 +35,10 @@ public class ChatRoomConfigurationWindow private JPanel mainPanel = new JPanel(); private JButton saveButton = new JButton( - Messages.getI18NString("apply").getText()); + GuiActivator.getResources().getI18NString("service.gui.APPLY")); private JButton cancelButton = new JButton( - Messages.getI18NString("cancel").getText()); + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JPanel roomOptionsPanel = new JPanel(new GridLayout(0, 1)); @@ -62,11 +62,12 @@ public class ChatRoomConfigurationWindow { this.configForm = configForm; - this.setTitle(Messages.getI18NString( - "chatRoomConfiguration", new String[]{chatRoomName}).getText()); + this.setTitle(GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_CONFIGURATION", + new String[]{chatRoomName})); - titlePanel.setTitleText(Messages.getI18NString( - "configuration").getText()); + titlePanel.setTitleText(GuiActivator.getResources().getI18NString( + "service.gui.SETTINGS")); this.generalScrollPane.setPreferredSize(new Dimension(550, 500)); this.generalScrollPane.setHorizontalScrollBarPolicy( @@ -92,11 +93,11 @@ public class ChatRoomConfigurationWindow BorderLayout.NORTH); this.tabbedPane.add( - Messages.getI18NString("general").getText(), + GuiActivator.getResources().getI18NString("service.gui.GENERAL"), generalScrollPane); this.tabbedPane.add( - Messages.getI18NString("options").getText(), + GuiActivator.getResources().getI18NString("service.gui.OPTIONS"), optionsScrollPane); this.getContentPane().add(titlePanel, BorderLayout.NORTH); @@ -106,7 +107,8 @@ public class ChatRoomConfigurationWindow this.roomOptionsPanel.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(15, 15, 15, 15), BorderFactory.createTitledBorder( - Messages.getI18NString("chatRoomOptions").getText()))); + GuiActivator.getResources() + .getI18NString("service.gui.CHAT_ROOM_OPTIONS")))); this.loadConfigurationForm(); } @@ -391,9 +393,10 @@ public class ChatRoomConfigurationWindow { new ErrorDialog( ChatRoomConfigurationWindow.this, - Messages.getI18NString("error").getText(), - Messages.getI18NString( - "chatRoomConfigFormSubmitFailed").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED"), e).showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java index 2ac73ca..69c7aca 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java @@ -11,8 +11,8 @@ import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; @@ -30,7 +30,7 @@ public class ChatRoomSubjectPanel private Logger logger = Logger.getLogger(ChatRoomSubjectPanel.class); private JLabel subjectLabel = new JLabel( - Messages.getI18NString("subject").getText() + ": "); + GuiActivator.getResources().getI18NString("service.gui.SUBJECT") + ": "); private JTextField subjectField = new JTextField(); @@ -119,11 +119,11 @@ public class ChatRoomSubjectPanel { new ErrorDialog( chatWindow, - Messages.getI18NString("warning").getText(), - Messages.getI18NString( - "chatRoomOpenConfigForbidden", - new String[]{chatSession.getChatName()}) - .getText(), + GuiActivator.getResources() + .getI18NString("service.gui.WARNING"), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN", + new String[]{chatSession.getChatName()}), ErrorDialog.WARNING) .showDialog(); } @@ -131,12 +131,12 @@ public class ChatRoomSubjectPanel { new ErrorDialog( chatWindow, - Messages.getI18NString("error").getText(), - Messages.getI18NString( - "chatRoomOpenConfigFailed", + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_CONFIGURATION_FAILED", new String[]{ - chatSession.getChatName()}) - .getText(), + chatSession.getChatName()}), e).showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java index 29c90ca..4eb6113 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java @@ -56,7 +56,7 @@ public class ConferenceChatContact String name = chatRoomMember.getName(); if (name == null || name.length() < 1) - name = GuiActivator.getResources().getI18NString("unknown"); + name = GuiActivator.getResources().getI18NString("service.gui.UNKNOWN"); return name; } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java index b3d605d..3b0a816 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java @@ -13,7 +13,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.*; @@ -24,7 +23,7 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; -import org.jdesktop.swingworker.SwingWorker; +import org.jdesktop.swingworker.*; import org.osgi.framework.*; /** @@ -213,8 +212,10 @@ public class ConferenceChatManager chatWindowManager.openChat(chatPanel, false); // Fire notification - String title = Messages.getI18NString("msgReceived", - new String[]{sourceMember.getName()}).getText(); + String title + = GuiActivator.getResources().getI18NString( + "service.gui.MSG_RECEIVED", + new String[]{sourceMember.getName()}); NotificationManager.fireChatNotification( sourceChatRoom, @@ -242,29 +243,30 @@ public class ConferenceChatManager if (evt.getErrorCode() == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED) { - errorMsg = Messages.getI18NString( - "msgDeliveryOfflineNotSupported").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_NOT_SUPPORTED"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.NETWORK_FAILURE) { - errorMsg = Messages.getI18NString("msgNotDelivered").getText(); + errorMsg = GuiActivator.getResources() + .getI18NString("service.gui.MSG_NOT_DELIVERED"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED) { - errorMsg = Messages.getI18NString( - "msgSendConnectionProblem").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_SEND_CONNECTION_PROBLEM"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.INTERNAL_ERROR) { - errorMsg = Messages.getI18NString( - "msgDeliveryInternalError").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_INTERNAL_ERROR"); } else { - errorMsg = Messages.getI18NString( - "msgDeliveryFailedUnknownError").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_UNKNOWN_ERROR"); } ChatWindowManager chatWindowManager @@ -348,11 +350,11 @@ public class ConferenceChatManager { new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("error").getText(), - Messages.getI18NString("failedToJoinChatRoom", - new String[]{sourceChatRoom.getName()}) - .getText() + evt.getReason()) - .showDialog(); + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.FAILED_TO_JOIN_CHAT_ROOM", + new String[]{sourceChatRoom.getName()}) + evt.getReason()) + .showDialog(); } else if (evt.getEventType().equals( LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT)) @@ -445,9 +447,9 @@ public class ConferenceChatManager { new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("warning").getText(), - Messages.getI18NString("haveToBeConnectedToJoin") - .getText()) + GuiActivator.getResources().getI18NString("service.gui.WARNING"), + GuiActivator.getResources().getI18NString( + "haveToBeConnectedToJoin")) .showDialog(); return; @@ -488,10 +490,10 @@ public class ConferenceChatManager new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("error").getText(), - Messages.getI18NString( - "createChatRoomError", - new String[]{chatRoomName}).getText(), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.CREATE_CHAT_ROOM_ERROR", + new String[]{chatRoomName}), ex) .showDialog(); } @@ -501,10 +503,10 @@ public class ConferenceChatManager new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("error").getText(), - Messages.getI18NString( - "createChatRoomError", - new String[]{chatRoomName}).getText(), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.CREATE_CHAT_ROOM_ERROR", + new String[]{chatRoomName}), ex) .showDialog(); } @@ -538,9 +540,8 @@ public class ConferenceChatManager { new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("warning").getText(), - Messages.getI18NString("haveToBeConnectedToJoin") - .getText()) + GuiActivator.getResources().getI18NString("service.gui.WARNING"), + GuiActivator.getResources().getI18NString("haveToBeConnectedToJoin")) .showDialog(); return; @@ -660,12 +661,12 @@ public class ConferenceChatManager else new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("error").getText(), - Messages.getI18NString("chatRoomNotExist", + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_NOT_EXIST", new String[]{chatRoomName, chatRoomProvider.getProtocolProvider() - .getAccountID().getService()}) - .getText()) + .getAccountID().getService()})) .showDialog(); } @@ -682,9 +683,9 @@ public class ConferenceChatManager { new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("warning").getText(), - Messages.getI18NString("haveToBeConnectedToLeave") - .getText()) + GuiActivator.getResources().getI18NString("service.gui.WARNING"), + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=")) .showDialog(); return; @@ -1027,28 +1028,29 @@ public class ConferenceChatManager { errorMessage = GuiActivator.getResources() - .getI18NString("chatRoomRegistrationRequired", + .getI18NString( + "service.gui.CHAT_ROOM_REGISTRATION_REQUIRED", new String[]{chatRoomWrapper.getChatRoomName()}); } else if(returnCode.equals(PROVIDER_NOT_REGISTERED)) { errorMessage = GuiActivator.getResources() - .getI18NString("chatRoomNotConnected", + .getI18NString("service.gui.CHAT_ROOM_NOT_CONNECTED", new String[]{chatRoomWrapper.getChatRoomName()}); } else if(returnCode.equals(SUBSCRIPTION_ALREADY_EXISTS)) { errorMessage = GuiActivator.getResources() - .getI18NString("chatRoomAlreadyJoined", + .getI18NString("service.gui.CHAT_ROOM_ALREADY_JOINED", new String[]{chatRoomWrapper.getChatRoomName()}); } else { errorMessage = GuiActivator.getResources() - .getI18NString("failedToJoinChatRoom", + .getI18NString("service.gui.FAILED_TO_JOIN_CHAT_ROOM", new String[]{chatRoomWrapper.getChatRoomName()}); } @@ -1057,7 +1059,7 @@ public class ConferenceChatManager { new ErrorDialog( GuiActivator.getUIService().getMainFrame(), - Messages.getI18NString("error").getText(), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), errorMessage).showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java index 3fc147c..c0f150d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java @@ -11,7 +11,6 @@ import java.util.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.msghistory.*; @@ -385,8 +384,9 @@ public class ConferenceChatSession sessionRenderer.addChatContact(chatContact); - statusMessage = Messages.getI18NString("chatRoomUserJoined", - new String[] {sourceChatRoom.getName()}).getText(); + statusMessage = GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_USER_JOINED", + new String[] {sourceChatRoom.getName()}); sessionRenderer.updateChatContactStatus(chatContact, statusMessage); } @@ -396,20 +396,23 @@ public class ConferenceChatSession { if(eventType.equals(ChatRoomMemberPresenceChangeEvent.MEMBER_LEFT)) { - statusMessage = Messages.getI18NString("chatRoomUserLeft", - new String[] {sourceChatRoom.getName()}).getText(); + statusMessage = GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_USER_LEFT", + new String[] {sourceChatRoom.getName()}); } else if(eventType.equals( ChatRoomMemberPresenceChangeEvent.MEMBER_KICKED)) { - statusMessage = Messages.getI18NString("chatRoomUserKicked", - new String[] {sourceChatRoom.getName()}).getText(); + statusMessage = GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_USER_KICKED", + new String[] {sourceChatRoom.getName()}); } else if(eventType.equals( ChatRoomMemberPresenceChangeEvent.MEMBER_QUIT)) { - statusMessage = Messages.getI18NString("chatRoomUserQuit", - new String[] {sourceChatRoom.getName()}).getText(); + statusMessage = GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_USER_QUIT", + new String[] {sourceChatRoom.getName()}); } Iterator<ConferenceChatContact> chatContactsIter diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java index 37795a5..b4bce6a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java @@ -12,7 +12,6 @@ import java.awt.event.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.swing.*; @@ -33,7 +32,7 @@ public class InvitationReceivedDialog private JPanel reasonPanel = new JPanel(new BorderLayout()); private JLabel reasonLabel = new JLabel( - Messages.getI18NString("reason").getText() + ": "); + GuiActivator.getResources().getI18NString("service.gui.REASON") + ": "); private JTextField reasonField = new JTextField(); @@ -41,17 +40,14 @@ public class InvitationReceivedDialog private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - private I18NString acceptString = Messages.getI18NString("accept"); + private JButton acceptButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.ACCEPT")); - private I18NString rejectString = Messages.getI18NString("reject"); + private JButton rejectButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.REJECT")); - private I18NString ignoreString = Messages.getI18NString("ignore"); - - private JButton acceptButton = new JButton(acceptString.getText()); - - private JButton rejectButton = new JButton(rejectString.getText()); - - private JButton ignoreButton = new JButton(ignoreString.getText()); + private JButton ignoreButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.IGNORE")); private JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); @@ -60,8 +56,8 @@ public class InvitationReceivedDialog private JLabel iconLabel = new JLabel(new ImageIcon( ImageLoader.getImage(ImageLoader.INVITE_DIALOG_ICON))); - private String title - = Messages.getI18NString("invitationReceived").getText(); + private String title = GuiActivator.getResources() + .getI18NString("service.gui.INVITATION_RECEIVED"); /** * The <tt>ChatRoomInvitation</tt> for which this dialog is. @@ -108,17 +104,17 @@ public class InvitationReceivedDialog this.mainPanel.setPreferredSize(new Dimension(400, 230)); infoTextArea.setText( - Messages.getI18NString("invitationReceivedFormInfo", + GuiActivator.getResources().getI18NString("service.gui.INVITATION_RECEIVED_MSG", new String[] { invitation.getInviter(), - invitation.getTargetChatRoom().getName()}) - .getText()); + invitation.getTargetChatRoom().getName()})); if(invitation.getReason() != null && invitation.getReason() != "") { invitationReasonTextArea.setText(invitation.getReason()); invitationReasonTextArea.setBorder( BorderFactory.createTitledBorder( - Messages.getI18NString("invitation").getText())); + GuiActivator.getResources() + .getI18NString("service.gui.INVITATION"))); this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER); } @@ -146,9 +142,12 @@ public class InvitationReceivedDialog this.buttonsPanel.add(ignoreButton); this.getRootPane().setDefaultButton(acceptButton); - this.acceptButton.setMnemonic(acceptString.getMnemonic()); - this.rejectButton.setMnemonic(rejectString.getMnemonic()); - this.ignoreButton.setMnemonic(ignoreString.getMnemonic()); + this.acceptButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.ACCEPT")); + this.rejectButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.REJECT")); + this.ignoreButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.IGNORE")); this.mainPanel.setBorder( BorderFactory.createEmptyBorder(15, 15, 15, 15)); @@ -157,7 +156,7 @@ public class InvitationReceivedDialog this.mainPanel.add(dataPanel, BorderLayout.CENTER); this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH); - this.getContentPane().add(mainPanel); + this.getContentPane().add(mainPanel); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java index 24fe4ae..3063da7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java @@ -11,8 +11,8 @@ import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; /** * The <tt>HistoryMenu</tt> is the main menu in the history window. @@ -21,17 +21,13 @@ import net.java.sip.communicator.impl.gui.i18n.*; */ public class HistoryMenu extends SIPCommMenu - implements ActionListener { + implements ActionListener +{ + private JMenuItem emptyMenuItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.EMPTY_HISTORY")); - private I18NString emptyHistoryString - = Messages.getI18NString("emptyHistory"); - - private I18NString closeString - = Messages.getI18NString("close"); - - private JMenuItem emptyMenuItem = new JMenuItem(emptyHistoryString.getText()); - - private JMenuItem closeMenuItem = new JMenuItem(closeString.getText()); + private JMenuItem closeMenuItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.CLOSE")); private JFrame parentWindow; @@ -41,22 +37,25 @@ public class HistoryMenu */ public HistoryMenu(JFrame parentWindow) { - super(Messages.getI18NString("history").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.HISTORY")); this.parentWindow = parentWindow; this.emptyMenuItem.setName("empty"); - this.closeMenuItem.setName("close"); - - this.emptyMenuItem.setMnemonic(emptyHistoryString.getMnemonic()); - this.closeMenuItem.setMnemonic(closeString.getMnemonic()); + this.closeMenuItem.setName("service.gui.CLOSE"); + + this.emptyMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic( + "service.gui.EMPTY_HISTORY")); + this.closeMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE")); this.emptyMenuItem.addActionListener(this); this.closeMenuItem.addActionListener(this); - + this.add(emptyMenuItem); this.add(closeMenuItem); - + //disable meni items that are not yet implemented this.emptyMenuItem.setEnabled(false); } @@ -71,7 +70,7 @@ public class HistoryMenu if (menuName.equalsIgnoreCase("empty")) { //TODO: Implement - "empty" history. - } else if (menuName.equalsIgnoreCase("close")) { + } else if (menuName.equalsIgnoreCase("service.gui.CLOSE")) { this.parentWindow.setVisible(false); this.parentWindow.dispose(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java index 3c125a6..1dd3e61 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java @@ -17,7 +17,6 @@ import javax.swing.text.*; import javax.swing.text.html.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -70,7 +69,7 @@ public class HistoryWindow private Hashtable dateHistoryTable = new Hashtable(); private JLabel readyLabel = new JLabel( - Messages.getI18NString("ready").getText()); + GuiActivator.getResources().getI18NString("service.gui.READY")); private String searchKeyword; @@ -117,9 +116,9 @@ public class HistoryWindow { MetaContact metaContact = (MetaContact) historyContact; - this.setTitle(Messages.getI18NString( - "historyContact", - new String[]{metaContact.getDisplayName()}).getText()); + this.setTitle(GuiActivator.getResources().getI18NString( + "service.gui.HISTORY_CONTACT", + new String[]{metaContact.getDisplayName()})); Iterator protoContacts = metaContact.getContacts(); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java index df62720..2d5ff22 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java @@ -12,7 +12,7 @@ import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -28,14 +28,14 @@ public class SearchPanel implements ActionListener, DocumentListener { + private static final String searchString + = GuiActivator.getResources().getI18NString("service.gui.SEARCH"); - private I18NString searchString = Messages.getI18NString("search"); - - private JButton searchButton = new JButton(searchString.getText(), - new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON))); + private JButton searchButton = new JButton( + searchString, + new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON))); - private JLabel searchLabel - = new JLabel(searchString.getText() + ": "); + private JLabel searchLabel = new JLabel(searchString + ": "); private JTextField searchTextField = new JTextField(); @@ -44,37 +44,37 @@ public class SearchPanel /* private JRadioButton todayMessagesRadio = new JRadioButton(Messages - .getString("today")); + .getString("service.gui.TODAY")); private JRadioButton yesterdayMessagesRadio = new JRadioButton(Messages - .getString("yesterday")); //$NON-NLS-1$ + .getString("service.gui.YESTERDAY")); //$NON-NLS-1$ private JRadioButton allMessagesRadio = new JRadioButton(Messages - .getString("all")); //$NON-NLS-1$ + .getString("service.gui.ALL")); //$NON-NLS-1$ private ButtonGroup radiosGroup = new ButtonGroup(); private JLabel dateLabel - = new JLabel(Messages.getString("date") + ": "); //$NON-NLS-1$ + = new JLabel(Messages.getString("service.gui.DATE") + ": "); //$NON-NLS-1$ private JTextField dateTextField = new JTextField(10); private JLabel hourLabel - = new JLabel(Messages.getString("hour") + ": "); //$NON-NLS-1$ + = new JLabel(Messages.getString("service.gui.HOUR") + ": "); //$NON-NLS-1$ private JTextField hourTextField = new JTextField(10); private JLabel lastNMessagesLabel = new JLabel( - Messages.getString("last") + ": "); //$NON-NLS-1$ + Messages.getString("service.gui.LAST") + ": "); //$NON-NLS-1$ private JTextField lastNMessagesTextField = new JTextField(10); private SIPCommButton extendedSearchButton = new SIPCommButton - (Messages.getString("extendedCriteria"), //$NON-NLS-1$ + (Messages.getString("service.gui.EXTENDED_CRITERIA"), //$NON-NLS-1$ Constants.RIGHT_ARROW_ICON, Constants.RIGHT_ARROW_ROLLOVER_ICON); private SIPCommButton extendedSearchOpenedButton = new SIPCommButton - (Messages.getString("extendedCriteria"), //$NON-NLS-1$ + (Messages.getString("service.gui.EXTENDED_CRITERIA"), //$NON-NLS-1$ Constants.BOTTOM_ARROW_ICON, Constants.BOTTOM_ARROW_ROLLOVER_ICON); private JPanel datePanel = new JPanel(new GridLayout(0, 2, 10, 0)); @@ -105,7 +105,7 @@ public class SearchPanel this.historyWindow = historyWindow; this.setBorder(BorderFactory.createCompoundBorder( - BorderFactory.createTitledBorder(searchString.getText()), + BorderFactory.createTitledBorder(searchString), BorderFactory.createEmptyBorder(5, 5, 5, 5))); this.textFieldPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); @@ -151,7 +151,8 @@ public class SearchPanel */ this.searchButton.setName("search"); - this.searchButton.setMnemonic(searchString.getMnemonic()); + this.searchButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.SEARCH")); // this.extendedSearchButton.setName("extendedSearch"); // this.extendedSearchOpenedButton.setName("extendedSearchOpened"); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java index 34593b9..f1421f3 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java @@ -11,7 +11,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -26,29 +26,21 @@ public class ChatRightButtonMenu extends JPopupMenu implements ActionListener { private ChatConversationPanel chatConvPanel; - - private I18NString copyString = Messages.getI18NString("copy"); - - private I18NString saveString = Messages.getI18NString("save"); - - private I18NString printString = Messages.getI18NString("print"); - - private I18NString closeString = Messages.getI18NString("close"); - + private JMenuItem copyMenuItem = new JMenuItem( - copyString.getText(), + GuiActivator.getResources().getI18NString("service.gui.COPY"), new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON))); - + private JMenuItem saveMenuItem = new JMenuItem( - saveString.getText(), + GuiActivator.getResources().getI18NString("service.gui.SAVE"), new ImageIcon(ImageLoader.getImage(ImageLoader.SAVE_ICON))); private JMenuItem printMenuItem = new JMenuItem( - printString.getText(), + GuiActivator.getResources().getI18NString("service.gui.PRINT"), new ImageIcon(ImageLoader.getImage(ImageLoader.PRINT_ICON))); private JMenuItem closeMenuItem = new JMenuItem( - closeString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CLOSE"), new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON))); /** * Creates an instance of <tt>ChatRightButtonMenu</tt>. @@ -82,17 +74,21 @@ public class ChatRightButtonMenu extends JPopupMenu this.copyMenuItem.setName("copy"); this.saveMenuItem.setName("save"); this.printMenuItem.setName("print"); - this.closeMenuItem.setName("close"); + this.closeMenuItem.setName("service.gui.CLOSE"); this.copyMenuItem.addActionListener(this); this.saveMenuItem.addActionListener(this); this.printMenuItem.addActionListener(this); this.closeMenuItem.addActionListener(this); - this.copyMenuItem.setMnemonic(copyString.getMnemonic()); - this.saveMenuItem.setMnemonic(saveString.getMnemonic()); - this.printMenuItem.setMnemonic(printString.getMnemonic()); - this.closeMenuItem.setMnemonic(closeString.getMnemonic()); + this.copyMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.COPY")); + this.saveMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.SAVE")); + this.printMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.PRINT")); + this.closeMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE")); this.copyMenuItem.setAccelerator( KeyStroke.getKeyStroke(KeyEvent.VK_C, @@ -139,7 +135,7 @@ public class ChatRightButtonMenu extends JPopupMenu } else if (itemText.equalsIgnoreCase("print")) { - } else if (itemText.equalsIgnoreCase("close")) { + } else if (itemText.equalsIgnoreCase("service.gui.CLOSE")) { Window window = this.chatConvPanel .getChatContainer().getConversationContainerWindow(); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java index 5537ff1..12fc62f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java @@ -13,7 +13,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -24,24 +23,18 @@ import net.java.sip.communicator.impl.gui.utils.*; * @author Yana Stamcheva */ public class EditMenu extends SIPCommMenu - implements ActionListener { - - private I18NString cutString = Messages.getI18NString("cut"); - - private I18NString copyString = Messages.getI18NString("copy"); - - private I18NString pasteString = Messages.getI18NString("paste"); - + implements ActionListener +{ private JMenuItem cutMenuItem = new JMenuItem( - cutString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CUT"), new ImageIcon(ImageLoader.getImage(ImageLoader.CUT_ICON))); private JMenuItem copyMenuItem = new JMenuItem( - copyString.getText(), + GuiActivator.getResources().getI18NString("service.gui.COPY"), new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON))); private JMenuItem pasteMenuItem = new JMenuItem( - pasteString.getText(), + GuiActivator.getResources().getI18NString("service.gui.PASTE"), new ImageIcon(ImageLoader.getImage(ImageLoader.PASTE_ICON))); private ChatWindow chatWindow; @@ -53,7 +46,7 @@ public class EditMenu extends SIPCommMenu */ public EditMenu(ChatWindow chatWindow) { - super(Messages.getI18NString("edit").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.EDIT")); this.setOpaque(false); @@ -74,20 +67,24 @@ public class EditMenu extends SIPCommMenu this.add(cutMenuItem); this.add(copyMenuItem); this.add(pasteMenuItem); - - this.setMnemonic(Messages.getI18NString("edit").getMnemonic()); - this.cutMenuItem.setMnemonic(cutString.getMnemonic()); - this.copyMenuItem.setMnemonic(copyString.getMnemonic()); - this.pasteMenuItem.setMnemonic(pasteString.getMnemonic()); - + + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.EDIT")); + this.cutMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CUT")); + this.copyMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.COPY")); + this.pasteMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.PASTE")); + this.cutMenuItem.setAccelerator( KeyStroke.getKeyStroke(KeyEvent.VK_X, KeyEvent.CTRL_MASK)); - + this.copyMenuItem.setAccelerator( KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_MASK)); - + this.pasteMenuItem.setAccelerator( KeyStroke.getKeyStroke(KeyEvent.VK_P, KeyEvent.CTRL_MASK)); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java index b360392..eac8a61 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java @@ -13,7 +13,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -27,17 +26,12 @@ import net.java.sip.communicator.impl.gui.utils.*; public class FileMenu extends SIPCommMenu implements ActionListener { - private I18NString myChatRoomsString - = Messages.getI18NString("myChatRooms"); - - private I18NString closeString = Messages.getI18NString("close"); - private JMenuItem myChatRoomsItem = new JMenuItem( - myChatRoomsString.getText(), + GuiActivator.getResources().getI18NString("service.gui.MY_CHAT_ROOMS"), new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON))); private JMenuItem closeMenuItem = new JMenuItem( - closeString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CLOSE"), new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON))); private ChatWindow parentWindow; @@ -48,7 +42,7 @@ public class FileMenu extends SIPCommMenu */ public FileMenu(ChatWindow parentWindow) { - super(Messages.getI18NString("file").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.FILE")); this.setOpaque(false); @@ -58,7 +52,8 @@ public class FileMenu extends SIPCommMenu GuiActivator.getResources() .getColor("service.gui.CHAT_MENU_FOREGROUND"))); - this.setMnemonic(Messages.getI18NString("file").getMnemonic()); + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.FILE")); this.add(myChatRoomsItem); @@ -72,8 +67,12 @@ public class FileMenu extends SIPCommMenu this.myChatRoomsItem.addActionListener(this); this.closeMenuItem.addActionListener(this); - this.myChatRoomsItem.setMnemonic(myChatRoomsString.getMnemonic()); - this.closeMenuItem.setMnemonic(closeString.getMnemonic()); + this.myChatRoomsItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.MY_CHAT_ROOMS")); + + this.closeMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE")); } /** @@ -93,7 +92,7 @@ public class FileMenu extends SIPCommMenu chatRoomsDialog.setPreferredSize(new Dimension(500, 400)); chatRoomsDialog.setVisible(true); } - else if (itemText.equalsIgnoreCase("close")) + else if (itemText.equalsIgnoreCase("service.gui.CLOSE")) { this.parentWindow.setVisible(false); this.parentWindow.dispose(); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java index 64143ae..f7820c4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java @@ -13,7 +13,6 @@ import java.awt.event.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; @@ -37,9 +36,9 @@ public class HelpMenu * Creates an instance of <tt>HelpMenu</tt>. * @param chatWindow The parent <tt>MainFrame</tt>. */ - public HelpMenu(ChatWindow chatWindow) { - - super(Messages.getI18NString("help").getText()); + public HelpMenu(ChatWindow chatWindow) + { + super(GuiActivator.getResources().getI18NString("service.gui.HELP")); this.setOpaque(false); @@ -47,7 +46,8 @@ public class HelpMenu GuiActivator.getResources() .getColor("service.gui.CHAT_MENU_FOREGROUND"))); - this.setMnemonic(Messages.getI18NString("help").getMnemonic()); + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.HELP")); this.initPluginComponents(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java index 9749659..8160dca 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java @@ -10,7 +10,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -24,29 +24,21 @@ public class WritePanelRightButtonMenu extends JPopupMenu implements ActionListener { private ChatWindow parentWindow; - - private I18NString cutString = Messages.getI18NString("cut"); - - private I18NString copyString = Messages.getI18NString("copy"); - - private I18NString pasteString = Messages.getI18NString("paste"); - - private I18NString closeString = Messages.getI18NString("close"); - + private JMenuItem cutMenuItem = new JMenuItem( - cutString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CUT"), new ImageIcon(ImageLoader.getImage(ImageLoader.CUT_ICON))); private JMenuItem copyMenuItem = new JMenuItem( - copyString.getText(), + GuiActivator.getResources().getI18NString("service.gui.COPY"), new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON))); private JMenuItem pasteMenuItem = new JMenuItem( - pasteString.getText(), + GuiActivator.getResources().getI18NString("service.gui.PASTE"), new ImageIcon(ImageLoader.getImage(ImageLoader.PASTE_ICON))); - + private JMenuItem closeMenuItem = new JMenuItem( - closeString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CLOSE"), new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON))); /** * Creates an instance of <tt>WritePanelRightButtonMenu</tt>. @@ -77,17 +69,21 @@ public class WritePanelRightButtonMenu extends JPopupMenu this.copyMenuItem.setName("copy"); this.cutMenuItem.setName("cut"); this.pasteMenuItem.setName("paste"); - this.closeMenuItem.setName("close"); + this.closeMenuItem.setName("service.gui.CLOSE"); this.copyMenuItem.addActionListener(this); this.cutMenuItem.addActionListener(this); this.pasteMenuItem.addActionListener(this); this.closeMenuItem.addActionListener(this); - this.copyMenuItem.setMnemonic(copyString.getMnemonic()); - this.cutMenuItem.setMnemonic(cutString.getMnemonic()); - this.pasteMenuItem.setMnemonic(pasteString.getMnemonic()); - this.closeMenuItem.setMnemonic(closeString.getMnemonic()); + this.copyMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.COPY")); + this.cutMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CUT")); + this.pasteMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.PASTE")); + this.closeMenuItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE")); this.cutMenuItem.setAccelerator( KeyStroke.getKeyStroke(KeyEvent.VK_X, @@ -121,7 +117,7 @@ public class WritePanelRightButtonMenu extends JPopupMenu this.parentWindow.getCurrentChatPanel().paste(); } - else if (itemText.equalsIgnoreCase("close")) { + else if (itemText.equalsIgnoreCase("service.gui.CLOSE")) { this.parentWindow.setVisible(false); this.parentWindow.dispose(); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java index 17b9359..9f3520e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java @@ -13,11 +13,12 @@ import javax.swing.event.*; import javax.swing.text.*; import javax.swing.text.html.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; + import net.java.sip.communicator.util.swing.*; import say.swing.*; @@ -81,8 +82,8 @@ public class EditTextToolBar ImageLoader.getDefaultSmiliesPack(), chatWritePanel); this.smiliesBox.setName("smiley"); - this.smiliesBox.setToolTipText( - Messages.getI18NString("insertSmiley").getText() + " Ctrl-M"); + this.smiliesBox.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.INSERT_SMILEY") + " Ctrl-M"); this.add(smiliesBox); diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java index 8941e57..22a053f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*; @@ -137,51 +136,58 @@ public class ExtendedMainToolBar this.saveButton.setName("save"); this.saveButton.setToolTipText( - Messages.getI18NString("save").getText() + " Ctrl-S"); + GuiActivator.getResources().getI18NString("service.gui.SAVE") + + " Ctrl-S"); this.printButton.setName("print"); this.printButton.setToolTipText( - Messages.getI18NString("print").getText()); + GuiActivator.getResources().getI18NString("service.gui.PRINT")); this.cutButton.setName("cut"); this.cutButton.setToolTipText( - Messages.getI18NString("cut").getText() + " Ctrl-X"); + GuiActivator.getResources().getI18NString("service.gui.CUT") + + " Ctrl-X"); this.copyButton.setName("copy"); this.copyButton.setToolTipText( - Messages.getI18NString("copy").getText() + " Ctrl-C"); + GuiActivator.getResources().getI18NString("service.gui.COPY") + + " Ctrl-C"); this.pasteButton.setName("paste"); this.pasteButton.setToolTipText( - Messages.getI18NString("paste").getText() + " Ctrl-P"); + GuiActivator.getResources().getI18NString("service.gui.PASTE") + + " Ctrl-P"); this.previousButton.setName("previous"); this.previousButton.setToolTipText( - Messages.getI18NString("previousTooltip").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.PREVIOUS_TOOLTIP")); this.nextButton.setName("next"); this.nextButton.setToolTipText( - Messages.getI18NString("nextTooltip").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.NEXT_TOOLTIP")); this.sendFileButton.setName("sendFile"); this.sendFileButton.setToolTipText( - Messages.getI18NString("sendFile").getText()); + GuiActivator.getResources().getI18NString("service.gui.SEND_FILE")); this.historyButton.setName("history"); this.historyButton.setToolTipText( - Messages.getI18NString("history").getText() + " Ctrl-H"); + GuiActivator.getResources().getI18NString("service.gui.HISTORY") + + " Ctrl-H"); this.addButton.setName("addContact"); this.addButton.setToolTipText( - Messages.getI18NString("addContact").getText()); + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT")); this.fontButton.setName("font"); this.fontButton.setToolTipText( - Messages.getI18NString("font").getText()); + GuiActivator.getResources().getI18NString("service.gui.FONT")); this.settingsButton.setName("settings"); this.settingsButton.setToolTipText( - Messages.getI18NString("settings").getText()); + GuiActivator.getResources().getI18NString("service.gui.SETTINGS")); this.saveButton.setPreferredSize( new Dimension(DEFAULT_BUTTON_WIDTH, DEFAULT_BUTTON_HEIGHT)); @@ -470,7 +476,7 @@ public class ExtendedMainToolBar history); } } - else if (buttonText.equalsIgnoreCase("addContact")) + else if (buttonText.equals("addContact")) { if(currentChatContact != null) { @@ -525,7 +531,7 @@ public class ExtendedMainToolBar g2.setColor(new Color( GuiActivator.getResources() - .getColor("desktopBackgroundColor"))); + .getColor("service.gui.DESKTOP_BACKGROUND"))); g2.drawRect(0, this.getHeight() - 2, this.getWidth(), 2); } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java index 76f25ef..614236b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; @@ -87,27 +86,28 @@ public class MainToolBar // this.previousButton.setName("previous"); // this.previousButton.setToolTipText( -// Messages.getI18NString("previous").getText()); +// GuiActivator.getResources().getI18NString("service.gui.PREVIOUS").getText()); // // this.nextButton.setName("next"); // this.nextButton.setToolTipText( -// Messages.getI18NString("next").getText()); +// GuiActivator.getResources().getI18NString("service.gui.NEXT").getText()); this.sendFileButton.setName("sendFile"); this.sendFileButton.setToolTipText( - Messages.getI18NString("sendFile").getText()); + GuiActivator.getResources().getI18NString("service.gui.SEND_FILE")); this.historyButton.setName("history"); this.historyButton.setToolTipText( - Messages.getI18NString("history").getText() + " Ctrl-H"); + GuiActivator.getResources().getI18NString("service.gui.HISTORY") + + " Ctrl-H"); this.inviteButton.setName("invite"); this.inviteButton.setToolTipText( - Messages.getI18NString("invite").getText()); + GuiActivator.getResources().getI18NString("service.gui.INVITE")); this.optionsButton.setName("options"); this.optionsButton.setToolTipText( - Messages.getI18NString("options").getText()); + GuiActivator.getResources().getI18NString("service.gui.OPTIONS")); // this.previousButton.addActionListener(this); // this.nextButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java index d5a4bad..a7f0a97 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java @@ -11,11 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import org.osgi.framework.*; - import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*; @@ -25,6 +22,8 @@ import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; import net.java.sip.communicator.util.*; +import org.osgi.framework.*; + /** * The <tt>ChatRoomsListRightButtonMenu</tt> is the menu, opened when user clicks * with the right mouse button on the chat rooms list panel. It's the one that @@ -40,18 +39,12 @@ public class ChatRoomCommonRightButtonMenu private Logger logger = Logger.getLogger(ChatRoomCommonRightButtonMenu.class); - private I18NString createChatRoomString - = Messages.getI18NString("createChatRoom"); - - private I18NString searchForChatRoomsString - = Messages.getI18NString("joinChatRoom"); - private JMenuItem createChatRoomItem = new JMenuItem( - createChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM"), new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON))); private JMenuItem searchForChatRoomsItem = new JMenuItem( - searchForChatRoomsString.getText(), + GuiActivator.getResources().getI18NString("service.gui.JOIN_CHAT_ROOM"), new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON_16x16))); private ChatRoomProviderWrapper chatRoomProvider; @@ -77,14 +70,16 @@ public class ChatRoomCommonRightButtonMenu this.add(searchForChatRoomsItem); this.initPluginComponents(); - + this.createChatRoomItem.setName("createChatRoom"); this.searchForChatRoomsItem.setName("searchForChatRooms"); - this.createChatRoomItem - .setMnemonic(createChatRoomString.getMnemonic()); - this.searchForChatRoomsItem - .setMnemonic(searchForChatRoomsString.getMnemonic()); + this.createChatRoomItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM")); + this.searchForChatRoomsItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM")); this.createChatRoomItem.addActionListener(this); this.searchForChatRoomsItem.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java index 5f4fd40..a8125c8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*; @@ -60,26 +61,21 @@ public class ChatRoomListDialog { ChatRoomListUI chatRoomsListUI = new ChatRoomListUI(this); - I18NString createChatRoomString - = Messages.getI18NString("createChatRoom"); - - I18NString joinChatRoomString - = Messages.getI18NString("joinChatRoom"); - - I18NString cancelString - = Messages.getI18NString("cancel"); - JButton createChatRoomButton = new JButton( - createChatRoomString.getText()); + GuiActivator.getResources() + .getI18NString("service.gui.CREATE_CHAT_ROOM")); JButton joinChatRoomButton = new JButton( - joinChatRoomString.getText()); + GuiActivator.getResources() + .getI18NString("service.gui.JOIN_CHAT_ROOM")); - JButton cancelButton = new JButton(cancelString.getText()); + JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); TransparentPanel buttonPanel = new TransparentPanel(); - this.setTitle(Messages.getI18NString("myChatRooms").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.MY_CHAT_ROOMS")); this.getContentPane().add(buttonPanel, BorderLayout.SOUTH); this.getContentPane().add(chatRoomsListUI, BorderLayout.CENTER); @@ -96,12 +92,12 @@ public class ChatRoomListDialog joinChatRoomButton.setName(JOIN_CHAT_ROOM); cancelButton.setName(CANCEL); - createChatRoomButton - .setMnemonic(createChatRoomString.getMnemonic()); - joinChatRoomButton - .setMnemonic(joinChatRoomString.getMnemonic()); - cancelButton - .setMnemonic(cancelString.getMnemonic()); + createChatRoomButton.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM")); + joinChatRoomButton.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM")); + cancelButton.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CANCEL")); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java index 0849753..2cf0274 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java @@ -11,7 +11,6 @@ import java.awt.event.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -29,33 +28,21 @@ public class ChatRoomRightButtonMenu implements ActionListener { private Logger logger = Logger.getLogger(ChatRoomRightButtonMenu.class); - - private I18NString joinChatRoomString - = Messages.getI18NString("join"); - - private I18NString joinAsChatRoomString - = Messages.getI18NString("joinAs"); - - private I18NString leaveChatRoomString - = Messages.getI18NString("leave"); - - private I18NString removeChatRoomString - = Messages.getI18NString("remove"); private JMenuItem leaveChatRoomItem = new JMenuItem( - leaveChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.LEAVE"), new ImageIcon(ImageLoader.getImage(ImageLoader.LEAVE_ICON))); private JMenuItem joinChatRoomItem = new JMenuItem( - joinChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.JOIN"), new ImageIcon(ImageLoader.getImage(ImageLoader.JOIN_ICON))); private JMenuItem joinAsChatRoomItem = new JMenuItem( - joinAsChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.JOIN_AS"), new ImageIcon(ImageLoader.getImage(ImageLoader.JOIN_AS_ICON))); private JMenuItem removeChatRoomItem = new JMenuItem( - removeChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.REMOVE"), new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON))); private ChatRoomWrapper chatRoomWrapper = null; @@ -92,17 +79,17 @@ public class ChatRoomRightButtonMenu this.leaveChatRoomItem.setName("leaveChatRoom"); this.removeChatRoomItem.setName("removeChatRoom"); - this.joinChatRoomItem - .setMnemonic(joinChatRoomString.getMnemonic()); + this.joinChatRoomItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN")); - this.joinAsChatRoomItem - .setMnemonic(joinAsChatRoomString.getMnemonic()); + this.joinAsChatRoomItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN_AS")); - this.leaveChatRoomItem - .setMnemonic(leaveChatRoomString.getMnemonic()); + this.leaveChatRoomItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.LEAVE")); - this.removeChatRoomItem - .setMnemonic(removeChatRoomString.getMnemonic()); + this.removeChatRoomItem.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.REMOVE")); this.joinChatRoomItem.addActionListener(this); this.joinAsChatRoomItem.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java index 6000cea..f6a297c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java @@ -11,7 +11,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*; @@ -28,18 +28,12 @@ public class ChatRoomServerRightButtonMenu extends JPopupMenu implements ActionListener { - private I18NString createChatRoomString - = Messages.getI18NString("createChatRoom"); - - private I18NString joinChannelString - = Messages.getI18NString("joinChatRoom"); - private JMenuItem createChatRoomItem = new JMenuItem( - createChatRoomString.getText(), + GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM"), new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON))); private JMenuItem joinChannelItem = new JMenuItem( - joinChannelString.getText(), + GuiActivator.getResources().getI18NString("service.gui.JOIN_CHAT_ROOM"), new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON_16x16))); private ChatRoomProviderWrapper chatRoomProvider; @@ -74,10 +68,12 @@ public class ChatRoomServerRightButtonMenu this.createChatRoomItem.setName("createChatRoom"); this.joinChannelItem.setName("joinChatRoom"); - this.createChatRoomItem - .setMnemonic(createChatRoomString.getMnemonic()); - this.joinChannelItem - .setMnemonic(joinChannelString.getMnemonic()); + this.createChatRoomItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM")); + this.joinChannelItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM")); this.createChatRoomItem.addActionListener(this); this.joinChannelItem.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java index 9fd0ac7..1540e94 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java @@ -11,8 +11,8 @@ import java.awt.*; import javax.swing.*; import javax.swing.event.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.util.swing.*; @@ -27,20 +27,19 @@ public class ChatRoomNamePanel extends TransparentPanel implements DocumentListener { - private JLabel nameLabel = new JLabel( - Messages.getI18NString("chatRoomName").getText()); + GuiActivator.getResources().getI18NString("service.gui.CHAT_ROOM_NAME")); private JTextField textField = new JTextField(); private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); - private SIPCommMsgTextArea infoLabel - = new SIPCommMsgTextArea( - Messages.getI18NString("chatRoomNameInfo").getText()); + private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.CHAT_ROOM_NAME_INFO")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("createChatRoom").getText()); + GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java index 957d48f..7303ac6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java @@ -12,8 +12,8 @@ import java.awt.event.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; + import net.java.sip.communicator.util.swing.*; /** @@ -30,17 +30,15 @@ public class CreateChatRoomDialog { private ChatRoomNamePanel chatRoomPanel = new ChatRoomNamePanel(); - private I18NString addString = Messages.getI18NString("create"); - - private I18NString cancelString = Messages.getI18NString("cancel"); + private JButton addButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CREATE")); - private JButton addButton = new JButton(addString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); - private JButton cancelButton = new JButton(cancelString.getText()); - private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); - + private JPanel mainPanel = new TransparentPanel(new BorderLayout()); private ChatRoomProviderWrapper chatRoomProvider; @@ -64,7 +62,8 @@ public class CreateChatRoomDialog */ private void init() { - this.setTitle(Messages.getI18NString("createChatRoom").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.CREATE_CHAT_ROOM")); this.setSize(620, 450); this.setPreferredSize(new Dimension(620, 450)); @@ -73,9 +72,11 @@ public class CreateChatRoomDialog this.addButton.setName("create"); this.cancelButton.setName("cancel"); - this.addButton.setMnemonic(addString.getMnemonic()); + this.addButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CREATE")); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.addButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java index f9daba3..795ecf7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java @@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.chatroomslist.createforms; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.wizard.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.util.*; @@ -42,9 +41,11 @@ public class CreateChatRoomWizard super.addWizardListener(this); - this.setTitle(Messages.getI18NString("createChatRoomWizard").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.CREATE_CHAT_ROOM_WIZARD")); - this.setFinishButtonText(Messages.getI18NString("create").getText()); + this.setFinishButtonText( + GuiActivator.getResources().getI18NString("service.gui.CREATE")); page1 = new CreateChatRoomWizardPage1(this, newChatRoom, mainFrame.getProtocolProviders()); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java index d03b117..27e7ba6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java @@ -15,8 +15,8 @@ import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; @@ -52,11 +52,12 @@ public class SelectAccountPanel extends TransparentPanel .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( - Messages.getI18NString("selectProvidersForChatRoom").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("selectAccount").getText(), - JLabel.CENTER); + GuiActivator.getResources().getI18NString("service.gui.SELECT_ACCOUNT"), + JLabel.CENTER); private ButtonGroup radioButtonGroup = new ButtonGroup(); @@ -121,8 +122,10 @@ public class SelectAccountPanel extends TransparentPanel accountsTable.setPreferredScrollableViewportSize(new Dimension(500, 70)); tableModel.addColumn(""); - tableModel.addColumn(Messages.getI18NString("account").getText()); - tableModel.addColumn(Messages.getI18NString("protocol").getText()); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.ACCOUNT")); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.PROTOCOL")); while(protocolProvidersList.hasNext()) { @@ -180,7 +183,8 @@ public class SelectAccountPanel extends TransparentPanel if (accountsTable.getModel().getRowCount() == 0) { JTextArea noAccountsTextArea = new JTextArea( - Messages.getI18NString("noMultiChatAccountAvailable").getText()); + GuiActivator.getResources().getI18NString( + "service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE")); noAccountsTextArea.setLineWrap(true); noAccountsTextArea.setPreferredSize(new Dimension(400, 200)); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java index 17e2b9a..980f588 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java @@ -12,9 +12,9 @@ import java.awt.event.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.utils.*; + import net.java.sip.communicator.util.swing.*; /** @@ -30,22 +30,20 @@ public class ChatRoomAuthenticationWindow private JTextArea infoTextArea = new JTextArea(); private JLabel idLabel = new JLabel( - Messages.getI18NString("id").getText()); + GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER")); private JLabel passwdLabel = new JLabel( - Messages.getI18NString("passwd").getText()); + GuiActivator.getResources().getI18NString("service.gui.PASSWORD")); private JTextField idValue; private JPasswordField passwdField = new JPasswordField(15); - private I18NString okString = Messages.getI18NString("ok"); - - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton loginButton = new JButton(okString.getText()); + private JButton loginButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.OK")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 8, 8)); @@ -96,8 +94,9 @@ public class ChatRoomAuthenticationWindow this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - this.setTitle( - Messages.getI18NString("authenticationWindowTitle").getText()); + this.setTitle(GuiActivator.getResources().getI18NString( + "service.gui.AUTHENTICATION_WINDOW_TITLE", + new String[]{chatRoom.getParentProvider().getName()})); this.enableKeyActions(); } @@ -117,8 +116,9 @@ public class ChatRoomAuthenticationWindow this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f)); this.infoTextArea.setEditable(false); this.infoTextArea.setText( - Messages.getI18NString("chatRoomRequiresPassword", - new String[]{chatRoom.getChatRoomName()}).getText()); + GuiActivator.getResources().getI18NString( + "service.gui.CHAT_ROOM_REQUIRES_PASSWORD", + new String[]{chatRoom.getChatRoomName()})); this.idLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); @@ -142,8 +142,10 @@ public class ChatRoomAuthenticationWindow this.loginButton.setName("ok"); this.cancelButton.setName("cancel"); - this.loginButton.setMnemonic(okString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.loginButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.OK")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.loginButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java index fd6e7e4..eb02a9a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java @@ -11,8 +11,8 @@ import java.awt.*; import javax.swing.*; import javax.swing.event.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -26,19 +26,19 @@ public class ChatRoomNamePanel extends TransparentPanel { private JLabel chatRoomLabel = new JLabel( - Messages.getI18NString("chatRoomName").getText()); + GuiActivator.getResources().getI18NString("service.gui.CHAT_ROOM_NAME")); private JTextField textField = new JTextField(); private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); - private SIPCommMsgTextArea infoLabel - = new SIPCommMsgTextArea( - Messages.getI18NString("joinChatRoomName").getText()); + private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.JOIN_CHAT_ROOM_NAME")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("joinChatRoomTitle").getText()); - + GuiActivator.getResources() + .getI18NString("service.gui.JOIN_CHAT_ROOM_TITLE")); private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1)); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java index 721a054..2052fea 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java @@ -12,7 +12,6 @@ import java.awt.event.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; @@ -32,13 +31,11 @@ public class JoinChatRoomDialog private SearchChatRoomPanel searchPanel; - private I18NString joinString = Messages.getI18NString("join"); + private JButton joinButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.JOIN")); - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton joinButton = new JButton(joinString.getText()); - - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); @@ -61,15 +58,19 @@ public class JoinChatRoomDialog this.searchPanel = new SearchChatRoomPanel(chatRoomProvider); - this.setTitle(Messages.getI18NString("joinChatRoom").getText()); + this.setTitle( + GuiActivator.getResources() + .getI18NString("service.gui.JOIN_CHAT_ROOM")); this.getRootPane().setDefaultButton(joinButton); this.joinButton.setName("join"); this.cancelButton.setName("cancel"); - this.joinButton.setMnemonic(joinString.getMnemonic()); + this.joinButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN")); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.iconLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10)); @@ -95,7 +96,7 @@ public class JoinChatRoomDialog JButton button = (JButton)e.getSource(); String name = button.getName(); - if (name.equals("join")) + if (name.equals("service.gui.JOIN")) { GuiActivator.getUIService().getConferenceChatManager() .joinChatRoom(searchPanel.getChatRoomName(), chatRoomProvider); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java index 0e8624d..2c92676 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java @@ -10,7 +10,6 @@ import java.util.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.wizard.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.util.*; @@ -49,9 +48,11 @@ public class JoinChatRoomWizard super.addWizardListener(this); - this.setTitle(Messages.getI18NString("joinChatRoomWizard").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.JOIN_CHAT_ROOM_WIZARD")); - this.setFinishButtonText(Messages.getI18NString("join").getText()); + this.setFinishButtonText(GuiActivator.getResources() + .getI18NString("service.gui.JOIN")); Iterator<ChatRoomProviderWrapper> chatRoomProviders = GuiActivator.getUIService().getConferenceChatManager() diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java index 1010fbb..691ce21 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java @@ -15,7 +15,6 @@ import javax.swing.*; import javax.swing.event.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.util.*; @@ -34,10 +33,11 @@ public class SearchChatRoomPanel private JPanel searchPanel = new TransparentPanel(new GridLayout(0, 1)); private JTextArea searchTextArea = new JTextArea( - Messages.getI18NString("searchForChatRoomsText").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SEARCH_FOR_CHAT_ROOMS_MSG")); private JButton searchButton = new JButton( - Messages.getI18NString("search").getText()); + GuiActivator.getResources().getI18NString("service.gui.SEARCH")); private JPanel buttonPanel = new TransparentPanel( new FlowLayout(FlowLayout.CENTER)); @@ -99,14 +99,16 @@ public class SearchChatRoomPanel this.mainPanel.add(searchPanel); this.searchPanel.setBorder(BorderFactory - .createTitledBorder(Messages.getI18NString("search").getText())); + .createTitledBorder(GuiActivator.getResources() + .getI18NString("service.gui.SEARCH"))); this.searchButton.addActionListener(this); this.add(mainPanel, BorderLayout.NORTH); this.chatRoomsScrollPane.setBorder(BorderFactory - .createTitledBorder(Messages.getI18NString("chatRooms").getText())); + .createTitledBorder(GuiActivator.getResources() + .getI18NString("service.gui.CHAT_ROOM_REQUIRES_PASSWORD"))); this.chatRoomsList.addListSelectionListener( new ChatRoomListSelectionListener()); @@ -131,7 +133,10 @@ public class SearchChatRoomPanel if(list != null) { if(list.size() == 0) - list.add(Messages.getI18NString("noAvailableRooms").getText()); + { + list.add(GuiActivator.getResources() + .getI18NString("service.gui.NO_AVAILABLE_ROOMS")); + } chatRoomsList.setListData(new Vector(list)); chatRoomsScrollPane.setPreferredSize(new Dimension(500, 120)); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java index f612a73..3ba26e7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java @@ -13,8 +13,8 @@ import javax.swing.*; import javax.swing.event.*; import javax.swing.table.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.chat.conference.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.*; @@ -50,11 +50,13 @@ public class SelectAccountPanel extends TransparentPanel .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( - Messages.getI18NString("selectProvidersForChatRoom").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("selectAccount").getText(), - JLabel.CENTER); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_ACCOUNT"), + JLabel.CENTER); private ButtonGroup radioButtonGroup = new ButtonGroup(); @@ -113,8 +115,10 @@ public class SelectAccountPanel extends TransparentPanel accountsTable.setPreferredScrollableViewportSize(new Dimension(500, 70)); tableModel.addColumn(""); - tableModel.addColumn(Messages.getI18NString("account").getText()); - tableModel.addColumn(Messages.getI18NString("protocol").getText()); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.ACCOUNT")); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.PROTOCOL")); while(chatRoomProvidersList.hasNext()) { @@ -158,7 +162,8 @@ public class SelectAccountPanel extends TransparentPanel if (accountsTable.getModel().getRowCount() == 0) { JTextArea noAccountsTextArea = new JTextArea( - Messages.getI18NString("noMultiChatAccountAvailable").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE")); noAccountsTextArea.setLineWrap(true); noAccountsTextArea.setPreferredSize(new Dimension(400, 200)); diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java index 9aff530..96c375f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java @@ -11,7 +11,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.account.*; import net.java.sip.communicator.impl.gui.utils.Constants; @@ -65,7 +64,8 @@ public class ConfigurationFrame this.configScrollList.setViewportView(configList); - this.setTitle(Messages.getI18NString("configuration").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.SETTINGS")); this.getContentPane().setLayout(new BorderLayout()); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java index ef892df..596c616 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java @@ -10,7 +10,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*; import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*; @@ -24,19 +24,15 @@ import net.java.sip.communicator.impl.gui.utils.*; * @author Yana Stamcheva */ public class CommonRightButtonMenu extends JPopupMenu - implements ActionListener { - - private I18NString addContactString = Messages.getI18NString("addContact"); - - private I18NString createGroupString = Messages.getI18NString("createGroup"); + implements ActionListener +{ + private JMenuItem addContactItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"), + new ImageIcon(ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON))); - private JMenuItem addContactItem - = new JMenuItem(addContactString.getText(), new ImageIcon( - ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON))); - - private JMenuItem createGroupItem - = new JMenuItem(createGroupString.getText(), new ImageIcon( - ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON))); + private JMenuItem createGroupItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"), + new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON))); private MainFrame mainFrame; @@ -55,31 +51,36 @@ public class CommonRightButtonMenu extends JPopupMenu this.addContactItem.setName("addContact"); this.createGroupItem.setName("createGroup"); - this.addContactItem.setMnemonic(addContactString.getMnemonic()); - this.createGroupItem.setMnemonic(createGroupString.getMnemonic()); + this.addContactItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.ADD_CONTACT")); + this.createGroupItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CREATE_GROUP")); this.addContactItem.addActionListener(this); this.createGroupItem.addActionListener(this); } /** - * Handles the <tt>ActionEvent</tt>. The choosen menu item should correspond + * Handles the <tt>ActionEvent</tt>. The chosen menu item should correspond * to an account, where the new contact will be added. We obtain here the - * protocol provider corresponding to the choosen account and show the + * protocol provider corresponding to the chosen account and show the * dialog, where the user could add the contact. */ - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e) + { JMenuItem item = (JMenuItem)e.getSource(); String itemName = item.getName(); - - if(itemName.equals("createGroup")) { + + if(itemName.equals("createGroup")) + { CreateGroupDialog dialog = new CreateGroupDialog(mainFrame); - + dialog.setVisible(true); } - else if(itemName.equals("addContact")) { + else if(itemName.equals("addContact")) + { AddContactWizard wizard = new AddContactWizard(mainFrame); - + wizard.setVisible(true); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java index 8753d77..a9cda79 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java @@ -16,10 +16,9 @@ import javax.swing.event.*; import javax.swing.text.*; import net.java.sip.communicator.impl.gui.*; +import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; -import net.java.sip.communicator.impl.gui.i18n.*; -import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.contactlist.event.*; import net.java.sip.communicator.service.protocol.*; @@ -916,10 +915,10 @@ public class ContactList { new ErrorDialog( mainFrame, - Messages.getI18NString( - "moveToGroup").getText(), - Messages.getI18NString( - "moveContactError").getText(), + GuiActivator.getResources().getI18NString( + "service.gui.MOVE_TO_GROUP"), + GuiActivator.getResources().getI18NString( + "service.gui.MOVE_CONTACT_ERROR"), ex).showDialog(); } } @@ -1441,17 +1440,18 @@ public class ContactList return; } - String message = Messages.getI18NString( - "moveSubcontactQuestion", + String message = GuiActivator.getResources().getI18NString( + "service.gui.MOVE_SUBCONTACT_QUESTION", new String[]{ srcContact.getDisplayName(), - destMetaContact.getDisplayName()}) - .getText(); + destMetaContact.getDisplayName()}); MessageDialog dialog = new MessageDialog( mainFrame, - Messages.getI18NString("moveContact").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_CONTACT"), message, - Messages.getI18NString("move").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.MOVE")); int returnCode = dialog.showDialog(); @@ -1498,17 +1498,18 @@ public class ContactList return; } - String message = Messages.getI18NString( - "moveSubcontactQuestion", + String message = GuiActivator.getResources().getI18NString( + "service.gui.MOVE_SUBCONTACT_QUESTION", new String[]{ srcContact.getDisplayName(), - destGroup.getGroupName()}) - .getText(); + destGroup.getGroupName()}); MessageDialog dialog = new MessageDialog( mainFrame, - Messages.getI18NString("moveContact").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_CONTACT"), message, - Messages.getI18NString("move").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.MOVE")); int returnCode = dialog.showDialog(); @@ -1555,17 +1556,18 @@ public class ContactList return; } - String message = Messages.getI18NString( - "moveSubcontactQuestion", + String message = GuiActivator.getResources().getI18NString( + "service.gui.MOVE_SUBCONTACT_QUESTION", new String[]{ srcContact.getDisplayName(), - destGroup.getGroupName()}) - .getText(); + destGroup.getGroupName()}); MessageDialog dialog = new MessageDialog( mainFrame, - Messages.getI18NString("moveContact").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_CONTACT"), message, - Messages.getI18NString("move").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.MOVE")); int returnCode = dialog.showDialog(); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java index ce60649..4cc5052 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java @@ -11,7 +11,6 @@ import java.awt.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.util.*; @@ -120,7 +119,8 @@ public class ContactListCellRenderer if (displayName == null || displayName.length() < 1) { - displayName = Messages.getI18NString("unknown").getText(); + displayName = GuiActivator.getResources() + .getI18NString("service.gui.UNKNOWN"); } this.nameLabel.setText(displayName); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java index 2243ca2..4ca4932 100755 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java @@ -16,7 +16,6 @@ import javax.swing.Timer; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.chat.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -361,8 +360,9 @@ public class ContactListPane }); // Fire notification - String title = Messages.getI18NString("msgReceived", - new String[]{evt.getSourceContact().getDisplayName()}).getText(); + String title = GuiActivator.getResources().getI18NString( + "service.gui.MSG_RECEIVED", + new String[]{evt.getSourceContact().getDisplayName()}); NotificationManager.fireChatNotification( protocolContact, @@ -442,34 +442,33 @@ public class ContactListPane if (evt.getErrorCode() == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED) { - errorMsg = Messages.getI18NString( - "msgDeliveryOfflineNotSupported").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_NOT_SUPPORTED"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.NETWORK_FAILURE) { - errorMsg = Messages.getI18NString( "msgNotDelivered", - new String[]{evt.getReason()}) - .getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_NOT_DELIVERED", + new String[]{evt.getReason()}); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED) { - errorMsg = Messages.getI18NString( - "msgSendConnectionProblem").getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_SEND_CONNECTION_PROBLEM"); } else if (evt.getErrorCode() == MessageDeliveryFailedEvent.INTERNAL_ERROR) { - errorMsg = Messages.getI18NString( - "msgDeliveryInternalError", - new String[]{evt.getReason()}) - .getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_INTERNAL_ERROR", + new String[]{evt.getReason()}); } else { - errorMsg = Messages.getI18NString( - "msgDeliveryFailedUnknownError", - new String[]{evt.getReason()}).getText(); + errorMsg = GuiActivator.getResources().getI18NString( + "service.gui.MSG_DELIVERY_UNKNOWN_ERROR", + new String[]{evt.getReason()}); } ChatPanel chatPanel = chatWindowManager @@ -508,8 +507,10 @@ public class ContactListPane .findMetaContactByContact(evt.getSourceContact()); String contactName = metaContact.getDisplayName() + " "; - if (contactName.equals("")) { - contactName = Messages.getI18NString("unknown").getText() + " "; + if (contactName.equals("")) + { + contactName = GuiActivator.getResources() + .getI18NString("service.gui.UNKNOWN") + " "; } int typingState = evt.getTypingState(); @@ -517,8 +518,9 @@ public class ContactListPane if (typingState == OperationSetTypingNotifications.STATE_TYPING) { notificationMsg - = Messages.getI18NString("contactTyping", - new String[]{contactName}).getText(); + = GuiActivator.getResources().getI18NString( + "service.gui.CONTACT_TYPING", + new String[]{contactName}); typingTimer.setMetaContact(metaContact); typingTimer.start(); @@ -532,8 +534,9 @@ public class ContactListPane } else if (typingState == OperationSetTypingNotifications.STATE_PAUSED) { - notificationMsg = Messages.getI18NString("contactPausedTyping", - new String[]{contactName}).getText(); + notificationMsg = GuiActivator.getResources().getI18NString( + "service.gui.CONTACT_PAUSED_TYPING", + new String[]{contactName}); typingTimer.setMetaContact(metaContact); typingTimer.start(); } @@ -544,7 +547,8 @@ public class ContactListPane else if (typingState == OperationSetTypingNotifications.STATE_STALE) { notificationMsg - = Messages.getI18NString("contactTypingStateStale").getText(); + = GuiActivator.getResources().getI18NString( + "service.gui.CONTACT_TYPING_STATE_STALE"); } else if (typingState == OperationSetTypingNotifications.STATE_UNKNOWN) { @@ -594,7 +598,8 @@ public class ContactListPane NotificationManager.fireNotification( NotificationManager.PROACTIVE_NOTIFICATION, contactName, - Messages.getI18NString("proactiveNotification").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.PROACTIVE_NOTIFICATION")); } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java index 0f9b502..ec47b7c 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java @@ -16,7 +16,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.call.*; import net.java.sip.communicator.impl.gui.main.chat.history.*; @@ -46,74 +45,76 @@ public class ContactRightButtonMenu { private Logger logger = Logger.getLogger(ContactRightButtonMenu.class); - private I18NString allContactsString - = Messages.getI18NString("allContacts"); + private static final String allContactsString + = GuiActivator.getResources().getI18NString("service.gui.ALL_CONTACTS"); - private I18NString moveToString - = Messages.getI18NString("moveToGroup"); + private static final String moveToString = GuiActivator.getResources() + .getI18NString("service.gui.MOVE_TO_GROUP"); - private I18NString moveSubcontactString - = Messages.getI18NString("moveSubcontact"); + private static final String moveSubcontactString = GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT"); - private I18NString addSubcontactString - = Messages.getI18NString("addSubcontact"); + private static final String addSubcontactString + = GuiActivator.getResources() + .getI18NString("service.gui.ADD_SUBCONTACT"); - private I18NString removeContactString - = Messages.getI18NString("removeContact"); + private static final String removeContactString + = GuiActivator.getResources() + .getI18NString("service.gui.REMOVE_CONTACT"); - private I18NString callString - = Messages.getI18NString("call"); + private static final String callString + = GuiActivator.getResources().getI18NString("service.gui.CALL"); - private I18NString sendMessageString - = Messages.getI18NString("sendMessage"); + private static final String sendMessageString + = GuiActivator.getResources().getI18NString("service.gui.SEND_MESSAGE"); - private I18NString sendFileString - = Messages.getI18NString("sendFile"); + private String sendFileString + = GuiActivator.getResources().getI18NString("service.gui.SEND_FILE"); - private I18NString renameContactString - = Messages.getI18NString("renameContact"); + private String renameContactString + = GuiActivator.getResources().getI18NString("service.gui.RENAME_CONTACT"); - private I18NString viewHistoryString - = Messages.getI18NString("viewHistory"); + private String viewHistoryString + = GuiActivator.getResources().getI18NString("service.gui.VIEW_HISTORY"); - private I18NString sendSmsString - = Messages.getI18NString("sendSms"); + private String sendSmsString + = GuiActivator.getResources().getI18NString("service.gui.SEND_SMS"); - private SIPCommMenu moveToMenu = new SIPCommMenu(moveToString.getText()); + private SIPCommMenu moveToMenu = new SIPCommMenu(moveToString); private SIPCommMenu moveSubcontactMenu - = new SIPCommMenu(moveSubcontactString.getText()); + = new SIPCommMenu(moveSubcontactString); private SIPCommMenu addSubcontactMenu - = new SIPCommMenu(addSubcontactString.getText()); + = new SIPCommMenu(addSubcontactString); private SIPCommMenu removeContactMenu - = new SIPCommMenu(removeContactString.getText()); + = new SIPCommMenu(removeContactString); - private SIPCommMenu callContactMenu = new SIPCommMenu(callString.getText()); + private SIPCommMenu callContactMenu = new SIPCommMenu(callString); private JMenuItem callItem = new JMenuItem( - callString.getText(), + callString, new ImageIcon(ImageLoader.getImage(ImageLoader.CALL_16x16_ICON))); private JMenuItem sendMessageItem = new JMenuItem( - sendMessageString.getText(), + sendMessageString, new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON))); private JMenuItem sendFileItem = new JMenuItem( - sendFileString.getText(), + sendFileString, new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_FILE_16x16_ICON))); private JMenuItem sendSmsItem = new JMenuItem( - sendSmsString.getText(), + sendSmsString, new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON))); private JMenuItem renameContactItem = new JMenuItem( - renameContactString.getText(), + renameContactString, new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON))); private JMenuItem viewHistoryItem = new JMenuItem( - viewHistoryString.getText(), + viewHistoryString, new ImageIcon(ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON))); private MetaContact contactItem; @@ -188,7 +189,8 @@ public class ContactRightButtonMenu if(providers.hasNext()) { JLabel infoLabel = new JLabel( - Messages.getI18NString("selectAccount").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_ACCOUNT")); infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); @@ -220,7 +222,8 @@ public class ContactRightButtonMenu if(groups.hasNext()) { JLabel infoLabel = new JLabel( - Messages.getI18NString("selectGroup").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_GROUP")); infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); @@ -246,16 +249,15 @@ public class ContactRightButtonMenu if (contactItem.getContactCount() > 1) { - - JMenuItem allItem = new JMenuItem(allContactsString.getText()); - JMenuItem allItem1 = new JMenuItem(allContactsString.getText()); - + JMenuItem allItem = new JMenuItem(allContactsString); + JMenuItem allItem1 = new JMenuItem(allContactsString); + allItem.addActionListener(this); allItem1.addActionListener(this); - + allItem.setName(removeContactPrefix + "allContacts"); allItem1.setName(moveSubcontactPrefix + "allContacts"); - + this.removeContactMenu.add(allItem); this.moveSubcontactMenu.add(allItem1); this.removeContactMenu.addSeparator(); @@ -422,23 +424,35 @@ public class ContactRightButtonMenu */ private void initMnemonics() { - this.sendMessageItem.setMnemonic(sendMessageString.getMnemonic()); + this.sendMessageItem.setMnemonic( + GuiActivator.getResources() + .getI18nMnemonic("service.gui.SEND_MESSAGE")); if (callContactMenu.getItemCount() > 1) { - this.callContactMenu.setMnemonic(callString.getMnemonic()); + this.callContactMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CALL")); } else { - this.callItem.setMnemonic(callString.getMnemonic()); + this.callItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CALL")); } - this.sendSmsItem.setMnemonic(sendSmsString.getMnemonic()); - this.sendFileItem.setMnemonic(sendFileString.getMnemonic()); - this.moveToMenu.setMnemonic(moveToString.getMnemonic()); - this.addSubcontactMenu.setMnemonic(addSubcontactString.getMnemonic()); - this.removeContactMenu.setMnemonic(removeContactString.getMnemonic()); - this.renameContactItem.setMnemonic(renameContactString.getMnemonic()); - this.viewHistoryItem.setMnemonic(viewHistoryString.getMnemonic()); - this.moveSubcontactMenu.setMnemonic(moveSubcontactString.getMnemonic()); + this.sendSmsItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.SEND_SMS")); + this.sendFileItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.SEND_FILE")); + this.moveToMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.MOVE_TO_GROUP")); + this.addSubcontactMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.ADD_SUBCONTACT")); + this.removeContactMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.REMOVE_CONTACT")); + this.renameContactItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.RENAME_CONTACT")); + this.viewHistoryItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.VIEW_HISTORY")); + this.moveSubcontactMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.MOVE_SUBCONTACT")); } /** @@ -561,10 +575,10 @@ public class ContactRightButtonMenu { new ErrorDialog( mainFrame, - Messages.getI18NString( - "moveToGroup").getText(), - Messages.getI18NString( - "moveContactError").getText(), + GuiActivator.getResources().getI18NString( + "service.gui.MOVE_TO_GROUP"), + GuiActivator.getResources().getI18NString( + "service.gui.MOVE_CONTACT_ERROR"), ex).showDialog(); } } @@ -675,14 +689,17 @@ public class ContactRightButtonMenu { if(Constants.REMOVE_CONTACT_ASK) { - String message = Messages.getI18NString("removeContactText", - new String[]{contact.getDisplayName()}).getText(); + String message = GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT_TEXT", + new String[]{contact.getDisplayName()}); MessageDialog dialog = new MessageDialog( - mainFrame, - Messages.getI18NString("removeContact").getText(), - message, - Messages.getI18NString("remove").getText()); + mainFrame, + GuiActivator.getResources() + .getI18NString("service.gui.REMOVE_CONTACT"), + message, + GuiActivator.getResources() + .getI18NString("service.gui.REMOVE")); int returnCode = dialog.showDialog(); @@ -704,11 +721,11 @@ public class ContactRightButtonMenu catch (Exception ex) { new ErrorDialog(mainFrame, - Messages.getI18NString( - "removeContact").getText(), - ex.getMessage(), - ex) - .showDialog(); + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT"), + ex.getMessage(), + ex) + .showDialog(); } } } @@ -723,16 +740,16 @@ public class ContactRightButtonMenu if(Constants.REMOVE_CONTACT_ASK) { String message - = Messages.getI18NString("removeContactText", - new String[]{contactItem.getDisplayName()}).getText(); + = GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT_TEXT", + new String[]{contactItem.getDisplayName()}); - MessageDialog dialog - = new MessageDialog(mainFrame, - Messages.getI18NString("removeContact") - .getText(), - message, - Messages.getI18NString("remove") - .getText()); + MessageDialog dialog = new MessageDialog(mainFrame, + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT"), + message, + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE")); int returnCode = dialog.showDialog(); @@ -807,8 +824,10 @@ public class ContactRightButtonMenu if(toMetaContact.equals(contactItem)) { new ErrorDialog(this.mainFrame, - Messages.getI18NString("moveSubcontact").getText(), - Messages.getI18NString("moveSubcontactInSameContact").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT"), + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT_FAILED"), ErrorDialog.WARNING) .showDialog(); } @@ -817,7 +836,7 @@ public class ContactRightButtonMenu guiContactList.setCursor( Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - + if(moveAllContacts) { new MoveAllSubcontactsThread(toMetaContact).start(); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java index 1dcb1a6..8d7f8e4 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java @@ -6,20 +6,16 @@ */ package net.java.sip.communicator.impl.gui.main.contactlist; -import java.util.*; - import java.awt.*; import java.awt.event.*; import java.awt.image.*; +import java.util.*; import javax.swing.*; -import org.osgi.framework.*; - import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -31,6 +27,8 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.swing.*; +import org.osgi.framework.*; + /** * The GroupRightButtonMenu is the menu, opened when user clicks with the * right mouse button on a group in the contact list. Through this menu the @@ -45,21 +43,15 @@ public class GroupRightButtonMenu { private Logger logger = Logger.getLogger(GroupRightButtonMenu.class); - private I18NString addContactString = Messages.getI18NString("addContact"); - - private I18NString removeGroupString = Messages.getI18NString("removeGroup"); - - private I18NString renameGroupString = Messages.getI18NString("renameGroup"); - - private SIPCommMenu addContactMenu - = new SIPCommMenu(addContactString.getText()); + private SIPCommMenu addContactMenu = new SIPCommMenu( + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT")); private JMenuItem removeGroupItem = new JMenuItem( - removeGroupString.getText(), + GuiActivator.getResources().getI18NString("service.gui.REMOVE_GROUP"), new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON))); private JMenuItem renameGroupItem = new JMenuItem( - renameGroupString.getText(), + GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP"), new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON))); private MetaContactGroup group; @@ -114,12 +106,14 @@ public class GroupRightButtonMenu this.renameGroupItem.setName("renameGroup"); this.removeGroupItem.setName("removeGroup"); + this.addContactMenu.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.ADD_CONTACT")); - this.addContactMenu.setMnemonic(addContactString.getMnemonic()); - - this.renameGroupItem.setMnemonic(renameGroupString.getMnemonic()); + this.renameGroupItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.RENAME_GROUP")); - this.removeGroupItem.setMnemonic(removeGroupString.getMnemonic()); + this.removeGroupItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.REMOVE_GROUP")); this.renameGroupItem.addActionListener(this); this.removeGroupItem.addActionListener(this); @@ -183,7 +177,7 @@ public class GroupRightButtonMenu if(group != null) new RemoveGroupThread(group).start(); } - else if(itemName.equals("renameGroup")) + else if(itemName.equals("service.gui.RENAME_GROUP")) { RenameGroupDialog dialog = new RenameGroupDialog( @@ -234,14 +228,17 @@ public class GroupRightButtonMenu try { if(Constants.REMOVE_CONTACT_ASK) { - String message = Messages.getI18NString("removeContactText", - new String[]{group.getGroupName()}).getText(); + String message = GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_CONTACT_TEXT", + new String[]{group.getGroupName()}); MessageDialog dialog = new MessageDialog( - mainFrame, - Messages.getI18NString("removeGroup").getText(), - message, - Messages.getI18NString("remove").getText()); + mainFrame, + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_GROUP"), + message, + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE")); int returnCode = dialog.showDialog(); @@ -263,11 +260,11 @@ public class GroupRightButtonMenu catch (Exception ex) { new ErrorDialog(mainFrame, - Messages.getI18NString( - "removeGroup").getText(), - ex.getMessage(), - ex) - .showDialog(); + GuiActivator.getResources().getI18NString( + "service.gui.REMOVE_GROUP"), + ex.getMessage(), + ex) + .showDialog(); } } } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java index e30e473..b90ae16 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java @@ -11,8 +11,8 @@ import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -29,17 +29,18 @@ public class MoveSubcontactMessageDialog extends SIPCommDialog { private SIPCommMsgTextArea infoArea = new SIPCommMsgTextArea( - Messages.getI18NString("moveSubcontactMsg").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT_MSG")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("moveSubcontact").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT")); private JLabel iconLabel = new JLabel( new ImageIcon(ImageLoader.getImage(ImageLoader.INFO_ICON))); - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1)); @@ -70,13 +71,14 @@ public class MoveSubcontactMessageDialog this.mainFrame = parentWindow; this.clistListener = listener; - System.out.println("EHOOOOOOOOOOOOOOOOOOOOOOOOO"); - this.setTitle(Messages.getI18NString("moveSubcontact").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.MOVE_SUBCONTACT")); this.mainPanel.setPreferredSize( new Dimension(dialogWidth, dialogHeight)); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.cancelButton.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java index 0325b33..38bb94d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.util.swing.*; @@ -24,17 +25,15 @@ import net.java.sip.communicator.util.swing.*; */ public class RenameContactDialog extends SIPCommDialog - implements ActionListener { - + implements ActionListener +{ private RenameContactPanel renameContactPanel; - private I18NString renameString = Messages.getI18NString("rename"); - - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton renameButton = new JButton(renameString.getText()); + private JButton renameButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.RENAME")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -77,14 +76,17 @@ public class RenameContactDialog * fields, etc. */ private void init() { - this.setTitle(Messages.getI18NString("renameContact").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.RENAME_CONTACT")); this.getRootPane().setDefaultButton(renameButton); this.renameButton.setName("rename"); this.cancelButton.setName("cancel"); - this.renameButton.setMnemonic(renameString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.renameButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.RENAME")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.renameButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java index c63670d..0a33f6f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java @@ -9,8 +9,8 @@ import java.awt.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -23,20 +23,20 @@ import net.java.sip.communicator.util.swing.*; public class RenameContactPanel extends TransparentPanel { - private JLabel uinLabel = - new JLabel(Messages.getI18NString("newName").getText()); + private JLabel uinLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.NEW_NAME")); private JTextField textField = new JTextField(); private TransparentPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); - private SIPCommMsgTextArea infoLabel - = new SIPCommMsgTextArea( - Messages.getI18NString("renameContactWizard").getText()); + private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.RENAME_CONTACT_WIZARD")); - private JLabel infoTitleLabel - = new JLabel(Messages.getI18NString("renameContact").getText()); + private JLabel infoTitleLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.RENAME_CONTACT")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java index 35f8a39..3cd3e33 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.util.swing.*; @@ -28,13 +29,11 @@ public class RenameGroupDialog private RenameGroupPanel renameGroupPanel; - private I18NString renameString = Messages.getI18NString("rename"); - - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton renameButton = new JButton(renameString.getText()); + private JButton renameButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.RENAME")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -71,14 +70,17 @@ public class RenameGroupDialog * fields, etc. */ private void init() { - this.setTitle(Messages.getI18NString("renameGroup").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.RENAME_GROUP")); this.getRootPane().setDefaultButton(renameButton); this.renameButton.setName("rename"); this.cancelButton.setName("cancel"); - this.renameButton.setMnemonic(renameString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.renameButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.RENAME")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.renameButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java index 3efaf51..3c0f60a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java @@ -6,10 +6,11 @@ package net.java.sip.communicator.impl.gui.main.contactlist; import java.awt.*; + import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -22,20 +23,20 @@ import net.java.sip.communicator.util.swing.*; public class RenameGroupPanel extends TransparentPanel { - private JLabel uinLabel - = new JLabel(Messages.getI18NString("newName").getText()); + private JLabel uinLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.NEW_NAME")); private JTextField textField = new JTextField(); private TransparentPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); - private SIPCommMsgTextArea infoLabel - = new SIPCommMsgTextArea( - Messages.getI18NString("renameGroupInfo").getText()); + private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.RENAME_GROUP_INFO")); - private JLabel infoTitleLabel - = new JLabel(Messages.getI18NString("renameGroup").getText()); + private JLabel infoTitleLabel = new JLabel( + GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader.getImage( diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java index 3422e17..ab36845 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java @@ -8,10 +8,11 @@ package net.java.sip.communicator.impl.gui.main.contactlist.addcontact; import java.awt.*; import java.awt.event.*; + import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; @@ -36,13 +37,11 @@ public class AddContactDialog private AddContactPanel addContactPanel = new AddContactPanel(); - private I18NString addString = Messages.getI18NString("add"); - - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton addButton = new JButton(addString.getText()); + private JButton addButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.ADD")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -111,7 +110,8 @@ public class AddContactDialog */ private void init() { - this.setTitle(Messages.getI18NString("addContact").getText()); + this.setTitle( + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT")); this.setSize(520, 250); @@ -119,9 +119,11 @@ public class AddContactDialog this.addButton.setName("add"); this.cancelButton.setName("cancel"); - this.addButton.setMnemonic(addString.getMnemonic()); + this.addButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.ADD")); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.addButton.addActionListener(this); this.cancelButton.addActionListener(this); @@ -175,30 +177,17 @@ public class AddContactDialog logger.error(ex); ex.printStackTrace(); int errorCode = ex.getErrorCode(); - + if (errorCode == MetaContactListException - .CODE_CONTACT_ALREADY_EXISTS_ERROR) { - - new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactExistError", - new String[]{uin}).getText(), - ex) - .showDialog(); - } - else if (errorCode - == MetaContactListException - .CODE_LOCAL_IO_ERROR) + .CODE_CONTACT_ALREADY_EXISTS_ERROR) { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{uin}).getText(), + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( + "addContactExistError", + new String[]{uin}), ex) .showDialog(); } @@ -207,22 +196,22 @@ public class AddContactDialog .CODE_NETWORK_ERROR) { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{uin}).getText(), + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( + "service.gui.ADD_CONTACT_NETWORK_ERROR", + new String[]{uin}), ex) .showDialog(); } else { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{uin}).getText(), + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( + "service.gui.ADD_CONTACT_ERROR", + new String[]{uin}), ex) .showDialog(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java index c4d9e0e..f13bf44 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java @@ -7,11 +7,12 @@ package net.java.sip.communicator.impl.gui.main.contactlist.addcontact; import java.awt.*; + import javax.swing.*; import javax.swing.event.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.util.swing.*; @@ -28,7 +29,7 @@ public class AddContactPanel { private JLabel uinLabel = new JLabel( - Messages.getI18NString("identifier").getText()); + GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER")); private JTextField textField = new JTextField(); @@ -36,11 +37,11 @@ public class AddContactPanel = new TransparentPanel(new BorderLayout(5, 5)); private SIPCommMsgTextArea infoLabel - = new SIPCommMsgTextArea( - Messages.getI18NString("addContactIdentifier").getText()); + = new SIPCommMsgTextArea(GuiActivator.getResources() + .getI18NString("service.gui.ADD_CONTACT_IDENTIFIER")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("addContact").getText()); + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java index 813b677..3995cb6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java @@ -8,9 +8,9 @@ package net.java.sip.communicator.impl.gui.main.contactlist.addcontact; import java.util.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.customcontrols.wizard.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; @@ -47,9 +47,11 @@ public class AddContactWizard super.addWizardListener(this); - this.setTitle(Messages.getI18NString("addContactWizard").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.ADD_CONTACT_WIZARD")); - this.setFinishButtonText(Messages.getI18NString("addContact").getText()); + this.setFinishButtonText(GuiActivator.getResources() + .getI18NString("service.gui.ADD_CONTACT")); Vector pps = new Vector(); Iterator iter = mainFrame.getProtocolProviders(); @@ -122,56 +124,45 @@ public class AddContactWizard .createMetaContact( pps, group, newContact.getUin()); } - catch (MetaContactListException ex) { + catch (MetaContactListException ex) + { logger.error(ex); ex.printStackTrace(); int errorCode = ex.getErrorCode(); - + if (errorCode == MetaContactListException - .CODE_CONTACT_ALREADY_EXISTS_ERROR) { - + .CODE_CONTACT_ALREADY_EXISTS_ERROR) + { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( "addContactExistError", - new String[]{newContact.getUin()}).getText(), + new String[]{newContact.getUin()}), ex) .showDialog(); } else if (errorCode - == MetaContactListException.CODE_LOCAL_IO_ERROR) { - - new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{newContact.getUin()}).getText(), - ex) - .showDialog(); - } - else if (errorCode == MetaContactListException.CODE_NETWORK_ERROR) { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{newContact.getUin()}).getText(), + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( + "service.gui.ADD_CONTACT_NETWORK_ERROR", + new String[]{newContact.getUin()}), ex) .showDialog(); } else { new ErrorDialog(mainFrame, - Messages.getI18NString( - "addContactErrorTitle").getText(), - Messages.getI18NString( - "addContactError", - new String[]{newContact.getUin()}).getText(), + GuiActivator.getResources().getI18NString( + "addContactErrorTitle"), + GuiActivator.getResources().getI18NString( + "service.gui.ADD_CONTACT_ERROR", + new String[]{newContact.getUin()}), ex) .showDialog(); } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java index 9ca207a..18ac457 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java @@ -17,7 +17,6 @@ import javax.swing.table.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.account.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.impl.gui.utils.Constants; @@ -58,19 +57,21 @@ public class SelectAccountPanel new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON))); - private SIPCommMsgTextArea infoLabel = - new SIPCommMsgTextArea(Messages.getI18NString("selectProvidersWizard") - .getText()); + private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_PROVIDERS_WIZARD_MSG")); - private JLabel infoTitleLabel = - new JLabel(Messages.getI18NString("selectProvidersWizardTitle") - .getText(), JLabel.CENTER); + private JLabel infoTitleLabel = new JLabel( + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_PROVIDERS_WIZARD"), + JLabel.CENTER); private TransparentPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); private JButton addAccountButton = - new JButton(Messages.getI18NString("addAccount").getText()); + new JButton( + GuiActivator.getResources().getI18NString("service.gui.ADD_ACCOUNT")); /** * Creates and initializes the <tt>SelectAccountPanel</tt>. @@ -140,8 +141,10 @@ public class SelectAccountPanel .setPreferredScrollableViewportSize(new Dimension(500, 70)); tableModel.addColumn(""); - tableModel.addColumn(Messages.getI18NString("account").getText()); - tableModel.addColumn(Messages.getI18NString("protocol").getText()); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.ACCOUNT")); + tableModel.addColumn( + GuiActivator.getResources().getI18NString("service.gui.PROTOCOL")); while (protocolProvidersList.hasNext()) { diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java index d2cbc62..dea8be9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java @@ -12,8 +12,8 @@ import java.util.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.util.swing.*; @@ -32,14 +32,16 @@ public class SelectGroupPanel = new TransparentPanel(new BorderLayout()); private JLabel groupLabel = new JLabel( - Messages.getI18NString("selectGroup").getText() + ": "); + GuiActivator.getResources().getI18NString("service.gui.SELECT_GROUP") + + ": "); private JComboBox groupCombo = new JComboBox(); private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("selectGroupWizardTitle").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.SELECT_GROUP_WIZARD")); private TransparentPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); @@ -97,7 +99,7 @@ public class SelectGroupPanel this.add(rightPanel, BorderLayout.CENTER); // groupCombo.addItem(new GroupWrapper( -// Messages.getI18NString("rootGroup").getText(), +// GuiActivator.getResources().getI18NString("service.gui.ROOT_GROUP").getText(), // wizard.getRootGroup())); String lastGroupName = ConfigurationManager.getLastContactParent(); @@ -109,7 +111,8 @@ public class SelectGroupPanel if (groupsList.hasNext()) { infoLabel.setText( - Messages.getI18NString("selectGroupWizard").getText()); + GuiActivator.getResources(). + getI18NString("service.gui.SELECT_GROUP_WIZARD_MSG")); this.groupPanel.add(groupLabel, BorderLayout.WEST); this.groupPanel.add(groupCombo, BorderLayout.CENTER); @@ -134,8 +137,8 @@ public class SelectGroupPanel else { infoLabel.setForeground(Color.RED); - infoLabel.setText( - Messages.getI18NString("createFirstGroupWizard").getText()); + infoLabel.setText(GuiActivator.getResources() + .getI18NString("service.gui.CREATE_FIRST_GROUP_WIZARD")); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java index c617d41..42dfd72 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java @@ -11,7 +11,8 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; + import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.util.*; @@ -30,13 +31,11 @@ public class CreateGroupDialog private CreateGroupPanel groupPanel = new CreateGroupPanel(); - private I18NString createString = Messages.getI18NString("create"); - - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton addButton = new JButton(createString.getText()); + private JButton addButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CREATE")); - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -70,7 +69,8 @@ public class CreateGroupDialog */ private void init() { - this.setTitle(Messages.getI18NString("addGroup").getText()); + this.setTitle( + GuiActivator.getResources().getI18NString("service.gui.ADD_GROUP")); this.getRootPane().setDefaultButton(addButton); this.addButton.setName("create"); @@ -79,8 +79,10 @@ public class CreateGroupDialog this.addButton.addActionListener(this); this.cancelButton.addActionListener(this); - this.addButton.setMnemonic(createString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.addButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CREATE")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.buttonsPanel.add(addButton); this.buttonsPanel.add(cancelButton); @@ -144,38 +146,38 @@ public class CreateGroupDialog .CODE_GROUP_ALREADY_EXISTS_ERROR) { groupPanel.showErrorMessage( - Messages.getI18NString( - "addGroupExistError", - new String[]{groupName}).getText()); - + GuiActivator.getResources().getI18NString( + "service.gui.ADD_GROUP_EXIST_ERROR", + new String[]{groupName})); + return; } else if (errorCode == MetaContactListException.CODE_LOCAL_IO_ERROR) { groupPanel.showErrorMessage( - Messages.getI18NString( - "addGroupLocalError", - new String[]{groupName}).getText()); - + GuiActivator.getResources().getI18NString( + "service.gui.ADD_GROUP_LOCAL_ERROR", + new String[]{groupName})); + return; } else if (errorCode == MetaContactListException.CODE_NETWORK_ERROR) { groupPanel.showErrorMessage( - Messages.getI18NString( - "addGroupNetError", - new String[]{groupName}).getText()); - + GuiActivator.getResources().getI18NString( + "service.gui.ADD_GROUP_NET_ERROR", + new String[]{groupName})); + return; } else { groupPanel.showErrorMessage( - Messages.getI18NString( - "addGroupError", - new String[]{groupName}).getText()); + GuiActivator.getResources().getI18NString( + "service.gui.ADD_GROUP_ERROR", + new String[]{groupName})); return; } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java index ebcc797..882f035 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java @@ -10,8 +10,8 @@ import java.awt.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.util.swing.*; @@ -25,7 +25,7 @@ public class CreateGroupPanel { private JLabel uinLabel = new JLabel( - Messages.getI18NString("groupName").getText()); + GuiActivator.getResources().getI18NString("service.gui.GROUP_NAME")); private JTextField textField = new JTextField(); @@ -33,10 +33,11 @@ public class CreateGroupPanel = new TransparentPanel(new BorderLayout(5, 5)); private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea( - Messages.getI18NString("createGroupName").getText()); + GuiActivator.getResources() + .getI18NString("service.gui.CREATE_GROUP_NAME")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("createGroup").getText()); + GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP")); private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader .getImage(ImageLoader.ADD_GROUP_ICON))); diff --git a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java index f354f54..5cdc02a 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java @@ -10,8 +10,8 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.gui.*; @@ -33,22 +33,20 @@ public class AuthenticationWindow private JTextArea realmTextArea = new JTextArea(); private JLabel uinLabel = new JLabel( - Messages.getI18NString("identifier").getText()); + GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER")); private JLabel passwdLabel = new JLabel( - Messages.getI18NString("passwd").getText()); + GuiActivator.getResources().getI18NString("service.gui.PASSWORD")); private JComponent uinValue; private JPasswordField passwdField = new JPasswordField(15); - private I18NString okString = Messages.getI18NString("ok"); + private JButton loginButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.OK")); - private I18NString cancelString = Messages.getI18NString("cancel"); - - private JButton loginButton = new JButton(okString.getText()); - - private JButton cancelButton = new JButton(cancelString.getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private TransparentPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 8, 8)); @@ -62,9 +60,9 @@ public class AuthenticationWindow private TransparentPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); - private JCheckBox rememberPassCheckBox = - new SIPCommCheckBox(Messages.getI18NString("rememberPassword") - .getText()); + private JCheckBox rememberPassCheckBox + = new SIPCommCheckBox(GuiActivator.getResources() + .getI18NString("service.gui.REMEMBER_PASSWORD")); private LoginWindowBackground backgroundPanel; @@ -130,8 +128,9 @@ public class AuthenticationWindow this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - this.setTitle( - Messages.getI18NString("authenticationWindowTitle").getText()); + this.setTitle(GuiActivator.getResources().getI18NString( + "service.gui.AUTHENTICATION_WINDOW_TITLE", + new String[]{protocolProvider.getProtocolName()})); this.enableKeyActions(); } @@ -184,8 +183,9 @@ public class AuthenticationWindow this.realmTextArea.setWrapStyleWord(true); this.realmTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f)); this.realmTextArea.setText( - Messages.getI18NString("securityAuthorityRealm", - new String[]{realm}).getText()); + GuiActivator.getResources().getI18NString( + "service.gui.SECURITY_AUTHORITY_REALM", + new String[]{realm})); this.uinLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD)); @@ -213,8 +213,10 @@ public class AuthenticationWindow this.loginButton.setName("ok"); this.cancelButton.setName("cancel"); - this.loginButton.setMnemonic(okString.getMnemonic()); - this.cancelButton.setMnemonic(cancelString.getMnemonic()); + this.loginButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.OK")); + this.cancelButton.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.loginButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java index bae1cd9..5cac2ed 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java @@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.login; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.authorization.*; import net.java.sip.communicator.impl.gui.utils.Constants; @@ -163,24 +162,27 @@ public class LoginManager .REASON_RECONNECTION_RATE_LIMIT_EXCEEDED) { - String msgText = Messages.getI18NString( - "reconnectionLimitExceeded", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.RECONNECTION_LIMIT_EXCEEDED", new String[] + { accountID.getUserID(), accountID.getService() }); - new ErrorDialog(null, - Messages.getI18NString("error").getText(), - msgText).showDialog(); + new ErrorDialog( + null, + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + msgText).showDialog(); } else if (evt.getReasonCode() == RegistrationStateChangeEvent .REASON_NON_EXISTING_USER_ID) { - String msgText = Messages.getI18NString("nonExistingUserId", + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.NON_EXISTING_USER_ID", new String[] - { protocolProvider.getProtocolDisplayName() }).getText(); + { protocolProvider.getProtocolDisplayName() }); - new ErrorDialog(null, - Messages.getI18NString("error").getText(), + new ErrorDialog( + null, + GuiActivator.getResources().getI18NString("service.gui.ERROR"), msgText).showDialog(); } @@ -188,14 +190,16 @@ public class LoginManager } else if (evt.getNewState().equals(RegistrationState.CONNECTION_FAILED)) { - String msgText = Messages.getI18NString("connectionFailedMessage", + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.CONNECTION_FAILED_MSG", new String[] - { accountID.getUserID(), accountID.getService() }).getText(); + { accountID.getUserID(), accountID.getService() }); - int result = new MessageDialog(null, - Messages.getI18NString("error").getText(), + int result = new MessageDialog( + null, + GuiActivator.getResources().getI18NString("service.gui.ERROR"), msgText, - Messages.getI18NString("retry").getText(), + GuiActivator.getResources().getI18NString("service.gui.RETRY"), false).showDialog(); if (result == MessageDialog.OK_RETURN_CODE) @@ -207,12 +211,13 @@ public class LoginManager } else if (evt.getNewState().equals(RegistrationState.EXPIRED)) { - String msgText = Messages.getI18NString("connectionExpiredMessage", + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.CONNECTION_EXPIRED_MSG", new String[] - { protocolProvider.getProtocolDisplayName() }).getText(); + { protocolProvider.getProtocolDisplayName() }); new ErrorDialog(null, - Messages.getI18NString("error").getText(), + GuiActivator.getResources().getI18NString("service.gui.ERROR"), msgText).showDialog(); logger.error(evt.getReason()); @@ -224,24 +229,26 @@ public class LoginManager if (evt.getReasonCode() == RegistrationStateChangeEvent .REASON_MULTIPLE_LOGINS) { - String msgText = Messages.getI18NString("multipleLogins", + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.MULTIPLE_LOGINS", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + { accountID.getUserID(), accountID.getService() }); new ErrorDialog(null, - Messages.getI18NString("error").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), msgText).showDialog(); } else if (evt.getReasonCode() == RegistrationStateChangeEvent .REASON_CLIENT_LIMIT_REACHED_FOR_IP) { - String msgText = Messages.getI18NString( - "limitReachedForIp", new String[] - { protocolProvider.getProtocolDisplayName() }).getText(); + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.LIMIT_REACHED_FOR_IP", new String[] + { protocolProvider.getProtocolDisplayName() }); new ErrorDialog(null, - Messages.getI18NString("error").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), msgText).showDialog(); } else if (evt.getReasonCode() == RegistrationStateChangeEvent @@ -251,13 +258,13 @@ public class LoginManager } else { - String msgText = Messages.getI18NString( - "unregisteredMessage", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + String msgText = GuiActivator.getResources().getI18NString( + "service.gui.UNREGISTERED_MESSAGE", new String[] + { accountID.getUserID(), accountID.getService() }); new ErrorDialog(null, - Messages.getI18NString("error").getText(), + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), msgText).showDialog(); } logger.error(evt.getReason()); @@ -403,11 +410,15 @@ public class LoginManager logger.error("Failed to register protocol provider. ", ex); AccountID accountID = protocolProvider.getAccountID(); - new ErrorDialog(mainFrame, Messages.getI18NString("error") - .getText(), Messages.getI18NString("loginGeneralError", + new ErrorDialog( + mainFrame, + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources() + .getI18NString("service.gui.LOGIN_GENERAL_ERROR", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText()).showDialog(); + { accountID.getUserID(), accountID.getService() })) + .showDialog(); } } @@ -424,12 +435,15 @@ public class LoginManager AccountID accountID = protocolProvider.getAccountID(); errorMessage = - Messages.getI18NString("loginGeneralError", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.LOGIN_GENERAL_ERROR", + new String[] + { accountID.getUserID(), accountID.getService() }); - new ErrorDialog(mainFrame, Messages.getI18NString("error") - .getText(), errorMessage, ex).showDialog(); + new ErrorDialog(mainFrame, + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), errorMessage, ex) + .showDialog(); } break; case OperationFailedException.INTERNAL_ERROR: @@ -439,12 +453,14 @@ public class LoginManager AccountID accountID = protocolProvider.getAccountID(); errorMessage = - Messages.getI18NString("loginInternalError", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.LOGIN_INTERNAL_ERROR", + new String[] + { accountID.getUserID(), accountID.getService() }); - new ErrorDialog(mainFrame, Messages.getI18NString("error") - .getText(), errorMessage, ex).showDialog(); + new ErrorDialog(mainFrame, + GuiActivator.getResources().getI18NString( + "service.gui.ERROR"), errorMessage, ex).showDialog(); } break; case OperationFailedException.NETWORK_FAILURE: @@ -453,15 +469,20 @@ public class LoginManager + " due to a network failure: " + ex); AccountID accountID = protocolProvider.getAccountID(); - errorMessage = - Messages.getI18NString("loginNetworkError", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + errorMessage = GuiActivator.getResources().getI18NString( + "service.gui.LOGIN_NETWORK_ERROR", + new String[] + { accountID.getUserID(), accountID.getService() }); int result = - new MessageDialog(null, Messages.getI18NString("error") - .getText(), errorMessage, Messages.getI18NString( - "retry").getText(), false).showDialog(); + new MessageDialog( + null, + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + errorMessage, + GuiActivator.getResources() + .getI18NString("service.gui.RETRY"), false) + .showDialog(); if (result == MessageDialog.OK_RETURN_CODE) { @@ -476,13 +497,14 @@ public class LoginManager AccountID accountID = protocolProvider.getAccountID(); errorMessage = - Messages.getI18NString("loginInvalidPropsError", + GuiActivator.getResources().getI18NString( + "service.gui.LOGIN_INVALID_PROPERTIES_ERROR", new String[] - { accountID.getUserID(), accountID.getService() }) - .getText(); + { accountID.getUserID(), accountID.getService() }); - new ErrorDialog(mainFrame, Messages.getI18NString("error") - .getText(), errorMessage, ex).showDialog(); + new ErrorDialog(mainFrame, + GuiActivator.getResources().getI18NString("service.gui.ERROR"), + errorMessage, ex).showDialog(); } break; default: @@ -535,12 +557,13 @@ public class LoginManager } new ErrorDialog(mainFrame, - Messages.getI18NString("error").getText(), - Messages.getI18NString("logoffNotSucceeded", + GuiActivator.getResources() + .getI18NString("service.gui.ERROR"), + GuiActivator.getResources() + .getI18NString("service.gui.LOGOFF_NOT_SUCCEEDED", new String[] { protocolProvider.getAccountID().getUserID(), - protocolProvider.getAccountID().getService() }) - .getText()) + protocolProvider.getAccountID().getService() })) .showDialog(); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java index f661c77..65f3a85 100644 --- a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java +++ b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java @@ -6,7 +6,7 @@ */ package net.java.sip.communicator.impl.gui.main.login; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.protocol.*; @@ -56,19 +56,14 @@ public class SecurityAuthorityImpl implements SecurityAuthority { { String errorMessage = null; - if (reasonCode == WRONG_PASSWORD) + if (reasonCode == WRONG_PASSWORD + || reasonCode == WRONG_USERNAME) { errorMessage - = Messages.getI18NString("authenticationFailed", + = GuiActivator.getResources().getI18NString( + "service.gui.AUTHENTICATION_FAILED", new String[]{ userCredentials.getUserName(), - realm}).getText(); - } - else if (reasonCode == WRONG_USERNAME) - { - errorMessage - = Messages.getI18NString("authenticationFailed", - new String[]{ userCredentials.getUserName(), - realm}).getText(); + realm}); } AuthenticationWindow loginWindow = null; diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java index 71dff24..f815865 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java @@ -12,7 +12,6 @@ import java.awt.event.*; import javax.swing.*;
import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
import net.java.sip.communicator.impl.gui.utils.*;
import net.java.sip.communicator.service.gui.*;
@@ -32,9 +31,10 @@ public class AboutWindow this.setResizable(false);
this.setTitle(
- Messages.getI18NString("aboutWindowTitle",
- new String[]{ GuiActivator.getResources()
- .getSettingsString("applicationName")}).getText());
+ GuiActivator.getResources().getI18NString(
+ "plugin.branding.ABOUT_WINDOW_TITLE",
+ new String[]{ GuiActivator.getResources()
+ .getSettingsString("service.gui.APPLICATION_NAME")}));
this.mainPanel.setLayout(null);
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java index a2e2349..98f6259 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java @@ -17,7 +17,6 @@ import javax.swing.event.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.contactlist.*; import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*; @@ -135,18 +134,18 @@ public class ExtendedQuickMenu this.createGroupButton.setPreferredSize( new Dimension(DEFAULT_BUTTON_WIDTH, DEFAULT_BUTTON_HEIGHT)); - this.infoButton.setToolTipText( - Messages.getI18NString("contactInfo").getText()); - this.configureButton.setToolTipText( - Messages.getI18NString("settings").getText()); - this.hideShowButton.setToolTipText( - Messages.getI18NString("hideOfflineContacts").getText()); - this.addButton.setToolTipText( - Messages.getI18NString("addContact").getText()); - this.soundButton.setToolTipText( - Messages.getI18NString("soundOnOff").getText()); - this.createGroupButton.setToolTipText( - Messages.getI18NString("createGroup").getText()); + this.infoButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.CONTACT_INFO")); + this.configureButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.SETTINGS")); + this.hideShowButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.HIDE_OFFLINE_CONTACTS")); + this.addButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.ADD_CONTACT")); + this.soundButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.SOUND_ON_OFF")); + this.createGroupButton.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.CREATE_GROUP")); this.updateMuteButton( GuiActivator.getAudioNotifier().isMute()); @@ -581,16 +580,16 @@ public class ExtendedQuickMenu button.setIcon(new ImageIcon(ImageLoader.getImage( ImageLoader.QUICK_MENU_SHOW_OFFLINE_ICON))); - button.setToolTipText(Messages - .getI18NString("showOfflineContacts").getText()); + button.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.SHOW_OFFLINE_CONTACTS")); } else { button.setIcon(new ImageIcon(ImageLoader.getImage( ImageLoader.QUICK_MENU_HIDE_OFFLINE_ICON))); - button.setToolTipText(Messages - .getI18NString("hideOfflineContacts").getText()); + button.setToolTipText(GuiActivator.getResources() + .getI18NString("service.gui.HIDE_OFFLINE_CONTACTS")); } contactList.setShowOffline(!ConfigurationManager.isShowOffline()); @@ -662,9 +661,10 @@ public class ExtendedQuickMenu else { new ErrorDialog(mainFrame, - Messages.getI18NString("warning").getText(), - Messages.getI18NString("selectContactSupportingInfo") - .getText(), + GuiActivator.getResources().getI18NString( + "service.gui.WARNING"), + GuiActivator.getResources().getI18NString( + "service.gui.SELECT_CONTACT_SUPPORTING_INFO"), ErrorDialog.WARNING).showDialog(); } } @@ -722,7 +722,7 @@ public class ExtendedQuickMenu g2.setColor(new Color( GuiActivator.getResources() - .getColor("desktopBackgroundColor"))); + .getColor("service.gui.DESKTOP_BACKGROUND"))); g2.drawRect(0, this.getHeight() - 2, this.getWidth(), 2); } diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java index 0371985..b906a13 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.account.*; import net.java.sip.communicator.impl.gui.main.chatroomslist.*; @@ -40,31 +39,22 @@ public class FileMenu private static final Logger logger = Logger.getLogger(FileMenu.class.getName()); - private I18NString newAccountString = Messages.getI18NString("newAccount"); - - private I18NString addContactString = Messages.getI18NString("addContact"); - - private I18NString createGroupString = Messages.getI18NString("createGroup"); - - private I18NString fileString = Messages.getI18NString("file"); - - private I18NString myChatRoomsString - = Messages.getI18NString("myChatRooms"); - - private JMenuItem newAccountMenuItem - = new JMenuItem(newAccountString.getText()); + private JMenuItem newAccountMenuItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT")); private JMenuItem addContactItem - = new JMenuItem(addContactString.getText(), + = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"), new ImageIcon(ImageLoader.getImage( ImageLoader.ADD_CONTACT_16x16_ICON))); private JMenuItem createGroupItem - = new JMenuItem(createGroupString.getText(), + = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"), new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON))); private JMenuItem myChatRoomsItem = new JMenuItem( - myChatRoomsString.getText(), + GuiActivator.getResources().getI18NString("service.gui.MY_CHAT_ROOMS"), new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON))); private MainFrame parentWindow; @@ -75,12 +65,13 @@ public class FileMenu */ public FileMenu(MainFrame parentWindow) { - super(Messages.getI18NString("file").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.FILE")); this.setOpaque(false); this.setForeground( - new Color(GuiActivator.getResources().getColor("service.gui.MAIN_MENU_FOREGROUND"))); + new Color(GuiActivator.getResources() + .getColor("service.gui.MAIN_MENU_FOREGROUND"))); this.parentWindow = parentWindow; @@ -110,11 +101,16 @@ public class FileMenu this.createGroupItem.addActionListener(this); this.myChatRoomsItem.addActionListener(this); - this.setMnemonic(fileString.getMnemonic()); - this.newAccountMenuItem.setMnemonic(newAccountString.getMnemonic()); - this.addContactItem.setMnemonic(addContactString.getMnemonic()); - this.createGroupItem.setMnemonic(createGroupString.getMnemonic()); - this.myChatRoomsItem.setMnemonic(myChatRoomsString.getMnemonic()); + this.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.FILE")); + this.newAccountMenuItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.NEW_ACCOUNT")); + this.addContactItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.ADD_CONTACT")); + this.createGroupItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.CREATE_GROUP")); + this.myChatRoomsItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.MY_CHAT_ROOMS")); } /** @@ -227,12 +223,14 @@ public class FileMenu private void registerCloseMenuItemNonMacOSX() { - I18NString closeString = Messages.getI18NString("quit"); - JMenuItem closeMenuItem = new JMenuItem(closeString.getText()); + JMenuItem closeMenuItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.QUIT")); + this.addSeparator(); this.add(closeMenuItem); closeMenuItem.setName("close"); closeMenuItem.addActionListener(this); - closeMenuItem.setMnemonic(closeString.getMnemonic()); + closeMenuItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.QUIT")); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java index 4837409..15deec2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java @@ -12,7 +12,6 @@ import java.awt.event.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; @@ -41,12 +40,14 @@ public class HelpMenu */ public HelpMenu(MainFrame mainFrame) { - super(Messages.getI18NString("help").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.HELP")); this.setForeground( new Color(GuiActivator.getResources(). getColor("service.gui.MAIN_MENU_FOREGROUND"))); - this.setMnemonic(Messages.getI18NString("help").getMnemonic()); + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.HELP")); + this.setOpaque(false); this.initPluginComponents(); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java index 90d3fd1..24ae2a8 100755 --- a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java @@ -11,7 +11,6 @@ import java.awt.*; import javax.swing.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -34,12 +33,15 @@ public class MainMenu private HelpMenu helpMenu; - private I18NString fileString = Messages.getI18NString("file"); - - private I18NString toolsString = Messages.getI18NString("tools"); - - private I18NString helpString = Messages.getI18NString("help"); - + private static final String fileString + = GuiActivator.getResources().getI18NString("service.gui.FILE"); + + private static final String toolsString + = GuiActivator.getResources().getI18NString("service.gui.TOOLS"); + + private static final String helpString + = GuiActivator.getResources().getI18NString("service.gui.HELP"); + /** * Creates an instance of <tt>Menu</tt>. */ @@ -63,14 +65,17 @@ public class MainMenu */ private void init() { - fileMenu.setText(fileString.getText()); - fileMenu.setMnemonic(fileString.getMnemonic()); + fileMenu.setText(fileString); + fileMenu.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.FILE")); - toolsMenu.setText(toolsString.getText()); - toolsMenu.setMnemonic(toolsString.getMnemonic()); + toolsMenu.setText(toolsString); + toolsMenu.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.TOOLS")); - helpMenu.setText(helpString.getText()); - helpMenu.setMnemonic(helpString.getMnemonic()); + helpMenu.setText(helpString); + helpMenu.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.HELP")); this.fileMenu.setOpaque(false); this.toolsMenu.setOpaque(false); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java index b2802bf..9ef12c8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java @@ -12,7 +12,7 @@ import java.util.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.contactlist.*; import net.java.sip.communicator.service.gui.*; @@ -40,7 +40,8 @@ public class MoreButton this.setVerticalTextPosition(SwingConstants.BOTTOM); this.setHorizontalTextPosition(SwingConstants.CENTER); - this.setToolTipText(Messages.getI18NString("more").getText()); + this.setToolTipText( + GuiActivator.getResources().getI18NString("service.gui.MORE")); this.addMouseListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java index 4b58459..6190ecb 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java @@ -14,7 +14,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; import net.java.sip.communicator.impl.gui.event.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.gui.Container; @@ -36,18 +35,24 @@ public class ToolsMenu { private final Logger logger = Logger.getLogger(ToolsMenu.class); + private MainFrame parentWindow; + + private ExportedWindow configDialog; + /** * Creates an instance of <tt>FileMenu</tt>. * @param parentWindow The parent <tt>ChatWindow</tt>. */ public ToolsMenu(MainFrame parentWindow) { - super(Messages.getI18NString("tools").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.TOOLS")); this.setForeground( new Color(GuiActivator.getResources(). getColor("service.gui.MAIN_MENU_FOREGROUND"))); - this.setMnemonic(Messages.getI18NString("tools").getMnemonic()); + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.TOOLS")); + this.setOpaque(false); registerConfigMenuItem(); @@ -156,10 +161,12 @@ public class ToolsMenu private void registerConfigMenuItemNonMacOSX() { - I18NString settingsString = Messages.getI18NString("settings"); - JMenuItem configMenuItem = new JMenuItem(settingsString.getText()); + JMenuItem configMenuItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.SETTINGS")); + this.add(configMenuItem); - configMenuItem.setMnemonic(settingsString.getMnemonic()); + configMenuItem.setMnemonic(GuiActivator.getResources() + .getI18nMnemonic("service.gui.SETTINGS")); configMenuItem.setName("config"); configMenuItem.addActionListener(this); } diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java index 2c0c667..4e635e1 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java @@ -11,7 +11,6 @@ import java.awt.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.util.*; /** @@ -33,7 +32,7 @@ public class ViewMenu */ public ViewMenu(MainFrame mainFrame) { - super(Messages.getI18NString("view").getText()); + super(GuiActivator.getResources().getI18NString("service.gui.VIEW")); this.setOpaque(false); @@ -43,6 +42,7 @@ public class ViewMenu this.mainFrame = mainFrame; - this.setMnemonic(Messages.getI18NString("view").getMnemonic()); + this.setMnemonic( + GuiActivator.getResources().getI18nMnemonic("service.gui.VIEW")); } } diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java index 61268d7..4dd4475 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java @@ -43,7 +43,8 @@ public class AccountStatusPanel AVATAR_ICON_HEIGHT); private JLabel accountNameLabel - = new JLabel(GuiActivator.getResources().getI18NString("accountMe")); + = new JLabel(GuiActivator.getResources() + .getI18NString("service.gui.ACCOUNT_ME")); public AccountStatusPanel(MainFrame mainFrame) { diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java index 7e1361a..068839f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java @@ -15,7 +15,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.lookandfeel.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; @@ -68,23 +67,23 @@ public class GlobalStatusSelectorBox ImageLoader.getImage(ImageLoader.USER_FFC_ICON)); private JMenuItem onlineItem = new JMenuItem( - Messages.getI18NString("online").getText(), + GuiActivator.getResources().getI18NString("service.gui.ONLINE"), onlineIcon); private JMenuItem offlineItem = new JMenuItem( - Messages.getI18NString("offline").getText(), + GuiActivator.getResources().getI18NString("service.gui.OFFLINE"), offlineIcon); private JMenuItem awayItem = new JMenuItem( - Messages.getI18NString("awayStatus").getText(), + GuiActivator.getResources().getI18NString("service.gui.AWAY_STATUS"), awayIcon); // private JMenuItem dndItem = new JMenuItem( -// Messages.getI18NString("dndStatus").getText(), +// GuiActivator.getResources().getI18NString("service.gui.DND_STATUS").getText(), // dndIcon); private JMenuItem ffcItem = new JMenuItem( - Messages.getI18NString("ffcStatus").getText(), + GuiActivator.getResources().getI18NString("service.gui.FFC_STATUS"), ffcIcon); private JLabel titleLabel; @@ -617,33 +616,36 @@ public class GlobalStatusSelectorBox == OperationFailedException.GENERAL_ERROR) { String msgText = - Messages.getI18NString("statusChangeGeneralError") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_GENERAL_ERROR"); - new ErrorDialog(null, Messages.getI18NString( - "generalError").getText(), msgText, e1) + new ErrorDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.GENERAL_ERROR"), msgText, e1) .showDialog(); } else if (e1.getErrorCode() == OperationFailedException.NETWORK_FAILURE) { String msgText = - Messages.getI18NString("statusChangeNetworkFailure") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_NETWORK_FAILURE"); new ErrorDialog(null, msgText, - Messages.getI18NString("networkFailure").getText(), e1) + GuiActivator.getResources().getI18NString( + "service.gui.NETWORK_FAILURE"), e1) .showDialog(); } else if (e1.getErrorCode() == OperationFailedException.PROVIDER_NOT_REGISTERED) { String msgText = - Messages.getI18NString("statusChangeNetworkFailure") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_NETWORK_FAILURE"); - new ErrorDialog(null, Messages.getI18NString( - "networkFailure").getText(), msgText, e1) + new ErrorDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.NETWORK_FAILURE"), msgText, e1) .showDialog(); } logger.error("Error - changing status", e1); diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java index 19cb061..85d0231 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java @@ -13,7 +13,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.main.login.*; import net.java.sip.communicator.impl.gui.main.presence.message.*; @@ -310,32 +309,36 @@ public class PresenceStatusMenu == OperationFailedException.GENERAL_ERROR) { String msgText = - Messages.getI18NString("statusChangeGeneralError") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_GENERAL_ERROR"); - new ErrorDialog(null, Messages - .getI18NString("generalError").getText(), msgText, e1) + new ErrorDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.GENERAL_ERROR"), msgText, e1) .showDialog(); } else if (e1.getErrorCode() == OperationFailedException.NETWORK_FAILURE) { String msgText = - Messages.getI18NString("statusChangeNetworkFailure") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_NETWORK_FAILURE"); - new ErrorDialog(null, Messages.getI18NString( - "networkFailure").getText(), msgText, e1).showDialog(); + new ErrorDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.NETWORK_FAILURE"), msgText, e1) + .showDialog(); } else if (e1.getErrorCode() == OperationFailedException.PROVIDER_NOT_REGISTERED) { String msgText = - Messages.getI18NString("statusChangeNetworkFailure") - .getText(); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_CHANGE_NETWORK_FAILURE"); - new ErrorDialog(null, Messages.getI18NString( - "networkFailure").getText(), msgText, e1).showDialog(); + new ErrorDialog(null, + GuiActivator.getResources().getI18NString( + "service.gui.NETWORK_FAILURE"), msgText, e1).showDialog(); } logger.error("Error - changing status", e1); } diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java index 83f72aa..0555c4d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java @@ -13,7 +13,6 @@ import javax.swing.*; import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.customcontrols.*; -import net.java.sip.communicator.impl.gui.i18n.*; import net.java.sip.communicator.impl.gui.main.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; @@ -42,11 +41,11 @@ public class SimpleStatusMenu private ImageIcon offlineIcon; private JMenuItem onlineItem = new JMenuItem( - Messages.getI18NString("online").getText(), + GuiActivator.getResources().getI18NString("service.gui.ONLINE"), onlineIcon); private JMenuItem offlineItem = new JMenuItem( - Messages.getI18NString("offline").getText(), + GuiActivator.getResources().getI18NString("service.gui.OFFLINE"), offlineIcon); private JLabel titleLabel; diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java index ded60ea..277c1f9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java @@ -11,7 +11,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; @@ -30,25 +30,28 @@ public class NewStatusMessageDialog private Logger logger = Logger.getLogger(NewStatusMessageDialog.class); private JLabel messageLabel = new JLabel( - Messages.getI18NString("newStatusMessage").getText()); + GuiActivator.getResources().getI18NString( + "service.gui.NEW_STATUS_MESSAGE")); private JTextField messageTextField = new JTextField(); private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); private JTextArea infoArea = new JTextArea( - Messages.getI18NString("statusMessageInfo").getText()); + GuiActivator.getResources().getI18NString( + "service.gui.STATUS_MESSAGE_INFO")); private JLabel infoTitleLabel = new JLabel( - Messages.getI18NString("newStatusMessage").getText()); + GuiActivator.getResources().getI18NString( + "service.gui.NEW_STATUS_MESSAGE")); private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1)); private JButton okButton - = new JButton(Messages.getI18NString("ok").getText()); + = new JButton(GuiActivator.getResources().getI18NString("service.gui.OK")); - private JButton cancelButton - = new JButton(Messages.getI18NString("cancel").getText()); + private JButton cancelButton = new JButton( + GuiActivator.getResources().getI18NString("service.gui.CANCEL")); private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -73,7 +76,8 @@ public class NewStatusMessageDialog */ private void init() { - this.setTitle(Messages.getI18NString("newStatusMessage").getText()); + this.setTitle(GuiActivator.getResources() + .getI18NString("service.gui.NEW_STATUS_MESSAGE")); this.getRootPane().setDefaultButton(okButton); @@ -119,9 +123,9 @@ public class NewStatusMessageDialog this.cancelButton.setName("cancel"); this.okButton.setMnemonic( - Messages.getI18NString("ok").getMnemonic()); + GuiActivator.getResources().getI18nMnemonic("service.gui.OK")); this.cancelButton.setMnemonic( - Messages.getI18NString("cancel").getMnemonic()); + GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL")); this.okButton.addActionListener(this); this.cancelButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java index 28eb9cc..76905c8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java @@ -11,7 +11,7 @@ import java.awt.event.*; import javax.swing.*; -import net.java.sip.communicator.impl.gui.i18n.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; @@ -27,17 +27,21 @@ public class StatusMessageMenu { private Logger logger = Logger.getLogger(StatusMessageMenu.class); - private JMenuItem noMessageItem - = new JMenuItem(Messages.getI18NString("noMessage").getText()); + private static final String BRB_MESSAGE + = GuiActivator.getResources().getI18NString("service.gui.BRB_MESSAGE"); - private JMenuItem newMessageItem - = new JMenuItem(Messages.getI18NString("newMessage").getText()); + private static final String BUSY_MESSAGE + = GuiActivator.getResources().getI18NString("service.gui.BUSY_MESSAGE"); - private JMenuItem busyMessageItem - = new JMenuItem(Messages.getI18NString("busyMessage").getText()); + private JMenuItem noMessageItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.NO_MESSAGE")); - private JMenuItem brbMessageItem - = new JMenuItem(Messages.getI18NString("brbMessage").getText()); + private JMenuItem newMessageItem = new JMenuItem( + GuiActivator.getResources().getI18NString("service.gui.NEW_MESSAGE")); + + private JMenuItem busyMessageItem = new JMenuItem(BUSY_MESSAGE); + + private JMenuItem brbMessageItem = new JMenuItem(BRB_MESSAGE); private ProtocolProviderService protocolProvider; @@ -50,7 +54,8 @@ public class StatusMessageMenu */ public StatusMessageMenu(ProtocolProviderService protocolProvider) { - super(Messages.getI18NString("setStatusMessage").getText()); + super(GuiActivator.getResources() + .getI18NString("service.gui.SET_STATUS_MESSAGE")); this.protocolProvider = protocolProvider; @@ -92,11 +97,11 @@ public class StatusMessageMenu } else if (menuItem.equals(busyMessageItem)) { - statusMessage = Messages.getI18NString("busyMessage").getText(); + statusMessage = BUSY_MESSAGE; } else if (menuItem.equals(brbMessageItem)) { - statusMessage = Messages.getI18NString("brbMessage").getText(); + statusMessage = BRB_MESSAGE; } new PublishStatusMessageThread(statusMessage).start(); diff --git a/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java index 028fe6b..f7958a2 100644 --- a/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java +++ b/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java @@ -38,7 +38,7 @@ public class DeviceConfigurationComboBoxModel {
if (info == null)
return MediaActivator.getResources().getI18NString(
- "DeviceConfigurationComboBoxModel_noDevice");
+ "impl.media.configform.NO_DEVICE");
return info.getName();
}
}
diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java index af13ce6..f0f7fd6 100644 --- a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java +++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java @@ -33,6 +33,6 @@ public class MediaConfigurationForm public String getTitle()
{
return MediaActivator.getResources().getI18NString(
- "MediaConfigurationForm_title");
+ "impl.media.configform.TITLE");
}
}
diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java index e6fbe0a..3022ee5 100644 --- a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java +++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java @@ -123,16 +123,16 @@ public class MediaConfigurationPanel table.setShowGrid(false);
table.setTableHeader(null);
- key = "MediaConfigurationPanel_encodings";
+ key = "impl.media.configform.ENCODINGS";
JLabel label = new JLabel(resources.getI18NString(key));
label.setDisplayedMnemonic(resources.getI18nMnemonic(key));
label.setLabelFor(table);
- key = "MediaConfigurationPanel_up";
+ key = "impl.media.configform.UP";
final JButton upButton = new JButton(resources.getI18NString(key));
upButton.setMnemonic(resources.getI18nMnemonic(key));
- key = "MediaConfigurationPanel_down";
+ key = "impl.media.configform.DOWN";
final JButton downButton = new JButton(resources.getI18NString(key));
downButton.setMnemonic(resources.getI18nMnemonic(key));
@@ -294,7 +294,7 @@ public class MediaConfigurationPanel {
JLabel noPreview =
new JLabel(MediaActivator.getResources().getI18NString(
- "MediaConfigurationPanel_noPreview"));
+ "impl.media.configform.NO_PREVIEW"));
noPreview.setHorizontalAlignment(SwingConstants.CENTER);
noPreview.setVerticalAlignment(SwingConstants.CENTER);
@@ -340,10 +340,10 @@ public class MediaConfigurationPanel {
case DeviceConfigurationComboBoxModel.AUDIO:
return MediaActivator.getResources().getI18nMnemonic(
- "MediaConfigurationPanel_audio");
+ "impl.media.configform.AUDIO");
case DeviceConfigurationComboBoxModel.VIDEO:
return MediaActivator.getResources().getI18nMnemonic(
- "MediaConfigurationPanel_video");
+ "impl.media.configform.VIDEO");
default:
throw new IllegalArgumentException("type");
}
@@ -355,10 +355,10 @@ public class MediaConfigurationPanel {
case DeviceConfigurationComboBoxModel.AUDIO:
return MediaActivator.getResources().getI18NString(
- "MediaConfigurationPanel_audio");
+ "impl.media.configform.AUDIO");
case DeviceConfigurationComboBoxModel.VIDEO:
return MediaActivator.getResources().getI18NString(
- "MediaConfigurationPanel_video");
+ "impl.media.configform.VIDEO");
default:
throw new IllegalArgumentException("type");
}
diff --git a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java index 4eb210f..d4ba69c 100644 --- a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java +++ b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java @@ -26,80 +26,80 @@ import org.osgi.framework.*; */ public class SCCallbackResources { - /** - * Contains the secure button icons - */ - private static Hashtable loadedImages = new Hashtable(); - + /** + * Contains the secure button icons + */ + private static Hashtable loadedImages = new Hashtable(); + public static String TOGGLE_OFF_SECURITY - = getString("toggleOffSecurity"); + = getString("impl.media.security.TOGGLE_OFF_SECURITY"); public static String TOGGLE_ON_SECURITY - = getString("toggleOnSecurity"); + = getString("impl.media.security.TOGGLE_ON_SECURITY"); public static String SAS_SECURED_MESSAGE - = getString("sasSecuredMessage"); + = getString("impl.media.security.SECURED_MESSAGE"); public static String SAS_SECURED_TOOLTIP - = getString("sasSecuredTooltip"); + = getString("impl.media.security.SECURED_TOOLTIP"); public static String SAS_NOT_SECURED_MESSAGE - = getString("sasNotSecuredMessage"); + = getString("impl.media.security.NOT_SECURED_MESSAGE"); public static String SAS_NOT_SECURED_TOOLTIP - = getString("sasNotSecuredTooltip"); + = getString("impl.media.security.NOT_SECURED_TOOLTIP"); public static String DEFAULT_SAS_TOOLTIP - = getString("defaultSASTooltip"); - + = getString("impl.media.security.DEFAULT_TOOLTIP"); + public static String DEFAULT_SAS_MESSAGE - = getString("defaultSASMessage"); + = getString("impl.media.security.DEFAULT_MESSAGE"); public static String ENGINE_FAIL_SAS_TOOLTIP - = getString("sasEngineFailTooltip"); + = getString("impl.media.security.ENGINE_FAIL_TOOLTIP"); public static String ENGINE_FAIL_SAS_MESSAGE - = getString("sasEngineFailMessage"); + = getString("impl.media.security.ENGINE_FAIL_MESSAGE"); public static String SAS_SECURING_FAIL_TOOLTIP - = getString("sasSecuringFailTooltip"); + = getString("impl.media.security.SECURING_FAIL_TOOLTIP"); public static String SAS_UNSECURED_AT_REQUEST_TOOLTIP - = getString("sasUnsecuredAtRequestTooltip"); + = getString("impl.media.security.UNSECURED_AT_REQUEST"); public static String PEER_UNSUPORTED_SECURITY - = getString("peerUnsuportedSecurity"); + = getString("impl.media.security.PEER_UNSUPPORTED_SECURITY"); public static String SAS_PEER_UNSUPORTED_TOOLTIP - = getString("sasPeerUnsuportedTooltip"); + = getString("impl.media.security.PEER_UNSUPPORTED_TOOLTIP"); public static String PEER_TOGGLED_SECURITY_OFF_MESSAGE - = getString("peerToggledOffSecurityMessage"); + = getString("impl.media.security.PEER_TOGGLED_OFF_SECURITY_MESSAGE"); public static String PEER_TOGGLED_SECURITY_OFF_CAPTION - = getString("peerToggledOffSecurityCaption"); + = getString("impl.media.security.PEER_TOGGLED_OFF_SECURITY_SECTION"); public static String SAS_UNSECURED_AT_PEER_REQUEST_TOOLTIP - = getString("sasUnsecuredAtPeerRequestTooltip"); + = getString("impl.media.security.UNSECURED_AT_PEER_REQUEST_TOOLTIP"); public static String ZRTP_ENGINE_INIT_FAILURE - = getString("engineInitFailure"); - + = getString("impl.media.security.ENGINE_INIT_FAILURE"); + public static String GOCLEAR_REQUEST_AC_FLAG_FAILURE - = getString("allowClearRequestFailure"); + = getString("impl.media.security.ALLOW_CLEAR_REQUEST_FAILURE"); /** * The icon on the "Secure" button in the <tt>QuickMenu</tt>. */ public static final ImageID SECURE_ON_ICON - = new ImageID("SECURE_BUTTON_ON"); + = new ImageID("SECURE_BUTTON_ON"); /** * The icon on the "Secure" button in the <tt>QuickMenu</tt>. */ public static final ImageID SECURE_OFF_ICON - = new ImageID("SECURE_BUTTON_OFF"); - + = new ImageID("SECURE_BUTTON_OFF"); + /** * The resource management service used to get the needed * resources: button images, text predefined messages, etc @@ -116,7 +116,7 @@ public class SCCallbackResources { return getResources().getI18NString(key); } - + /** * Provides the resource management service * diff --git a/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java index aceb18c..33748c0 100644 --- a/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java @@ -127,12 +127,12 @@ public class ContactDictImpl if (this.contactID.equals("*")) { this.dictName = DictActivator.getResources() - .getI18NString("dict.anyDictionary"); + .getI18NString("plugin.dictaccregwizz.ANY_DICTIONARY"); } else if (this.contactID.equals("!")) { this.dictName = DictActivator.getResources() - .getI18NString("dict.firstMatch"); + .getI18NString("plugin.dictaccregwizz.FIRST_MATCH"); } else { diff --git a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java index 32a0920..31ee6fc 100644 --- a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java @@ -324,7 +324,7 @@ public class OperationSetBasicInstantMessagingDictImpl boolean isStart = true; result.append(DictActivator.getResources() - .getI18NString("dict.matchResult", new String[] {word})); + .getI18NString("plugin.dictaccregwizz.MATCH_RESULT", new String[] {word})); for (int i=0; i<data.size(); i++) { @@ -354,17 +354,17 @@ public class OperationSetBasicInstantMessagingDictImpl if (errorCode == DictReturnCode.INVALID_DATABASE) { return DictActivator.getResources() - .getI18NString("dict.invalidDatabase", new String[] {database}); + .getI18NString("plugin.dictaccregwizz.INVALID_DATABASE", new String[] {database}); } else if (errorCode == DictReturnCode.INVALID_STRATEGY) { return DictActivator.getResources() - .getI18NString("dict.invalidStrategy"); + .getI18NString("plugin.dictaccregwizz.INVALID_STRATEGY"); } else if (errorCode == DictReturnCode.NO_MATCH) { return DictActivator.getResources() - .getI18NString("dict.noMatch"); + .getI18NString("plugin.dictaccregwizz.NO_MATCH"); } return dix.getMessage(); diff --git a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java index 59df916..417ab0f 100644 --- a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java @@ -120,7 +120,7 @@ public class ProtocolProviderFactoryDictImpl try { String groupName = DictActivator.getResources() - .getI18NString("dict.dictionaries"); + .getI18NString("service.protocol.DICTIONARIES"); mcl.createMetaContactGroup(mcl.getRoot(), groupName); } @@ -156,11 +156,12 @@ public class ProtocolProviderFactoryDictImpl // Gets group name String groupName = DictActivator.getResources() - .getI18NString("dict.dictionaries"); + .getI18NString("service.protocol.DICTIONARIES"); // Gets contact name String contactName = DictActivator.getResources() - .getI18NString("dict.anyDictionaryFrom", new String[] {accountID.getUserID()}); + .getI18NString("dict.plugin.dictaccregwizz.ANY_DICTIONARY_FORM", + new String[] {accountID.getUserID()}); // Gets the MetaContactGroup for the "dictionaries" group. MetaContactGroup group = mcl.getRoot().getMetaContactSubgroup(groupName); diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java index 87d0942..c5f58c8 100644 --- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java @@ -1405,7 +1405,8 @@ public class OperationSetPersistentPresenceIcqImpl } else { - if(userInfo.getAwayStatus() != null && userInfo.getAwayStatus().equals(Boolean.TRUE)) + if(userInfo.getAwayStatus() != null + && userInfo.getAwayStatus().equals(Boolean.TRUE)) { currentIcqStatus = presenceStatusToStatusLong(AimStatusEnum.AWAY); } diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java index 49b0e6f..a0b774e 100644 --- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java @@ -284,7 +284,8 @@ public class OperationSetBasicInstantMessagingMsnImpl Message newMailMessage = new MessageMsnImpl( MessageFormat.format( - MsnActivator.getResources().getI18NString("newMail"), + MsnActivator.getResources() + .getI18NString("service.gui.NEW_MAIL"), new Object[]{message.getFrom(), message.getFromAddr(), subject}), diff --git a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java index 27cc5ad..01fdb1d 100644 --- a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java @@ -61,14 +61,14 @@ public class OperationSetBasicInstantMessagingRssImpl * a dead RSS contact */ private static final String MSG_CONFIRM_REMOVE_MISSING_CONTACT - = "confirmRemoveMissingContactMessage"; + = "plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL"; /** * The title of the confirmation dialog that we show to the user before we * remove a dead contact */ private static final String TITLE_CONFIRM_REMOVE_MISSING_CONTACT - = "confirmRemoveMissingContactTitle"; + = "plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE"; /** * Creates an instance of this operation set keeping a reference to the diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java index 654201c..c06055c 100644 --- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java @@ -11,7 +11,6 @@ package net.java.sip.communicator.impl.protocol.ssh; -import com.jcraft.jsch.*; import java.io.*; import java.util.*; @@ -20,6 +19,8 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.Logger; +import com.jcraft.jsch.*; + /** * A Contact of SSH Type * @@ -34,8 +35,8 @@ public class ContactSSHImpl /** * This acts as a seperator between details stored in persistent data */ - private final String detailsSeperator = - Resources.getString("detailsSeperator"); + private final String separator = + Resources.getString("impl.protocol.ssh.DETAILS_SEPARATOR"); /** * The identifier for SSH Stack @@ -314,42 +315,42 @@ public class ContactSSHImpl /** * Saves the details of contact in persistentData seperated by - * detailsSeperator + * "service.gui.JANUARY" * Passowrd is saved unsecurely using Base64 encoding */ public void savePersistentDetails() { persistentData = this.sshConfigurationForm.getHostName() + - detailsSeperator + + "service.gui.JANUARY" + this.sshConfigurationForm.getUserName() + - detailsSeperator + + "service.gui.JANUARY" + new String(Base64.encode(this.sshConfigurationForm.getPassword() .getBytes())) + - detailsSeperator + sshConfigurationForm.getPort() + - detailsSeperator + + "service.gui.JANUARY" + sshConfigurationForm.getPort() + + "service.gui.JANUARY" + sshConfigurationForm.getTerminalType() + - detailsSeperator + + "service.gui.JANUARY" + sshConfigurationForm.getUpdateInterval(); } /** * Stores persistent data in fields of the contact seperated by - * detailsSeperator. + * "service.gui.JANUARY". * * @param persistentData of the contact */ public void setPersistentData(String persistentData) { this.persistentData = persistentData; - int firstCommaIndex = this.persistentData.indexOf(detailsSeperator); - int secondCommaIndex = this.persistentData.indexOf(detailsSeperator, + int firstCommaIndex = this.persistentData.indexOf("service.gui.JANUARY"); + int secondCommaIndex = this.persistentData.indexOf("service.gui.JANUARY", firstCommaIndex +1); - int thirdCommaIndex = this.persistentData.indexOf(detailsSeperator, + int thirdCommaIndex = this.persistentData.indexOf("service.gui.JANUARY", secondCommaIndex +1); - int fourthCommaIndex = this.persistentData.indexOf(detailsSeperator, + int fourthCommaIndex = this.persistentData.indexOf("service.gui.JANUARY", thirdCommaIndex +1); - int fifthCommaIndex = this.persistentData.indexOf(detailsSeperator, + int fifthCommaIndex = this.persistentData.indexOf("service.gui.JANUARY", fourthCommaIndex +1); logger.debug("Commas: " + firstCommaIndex + " " + secondCommaIndex + " " diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java index ca145cc..1e9d529 100644 --- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java @@ -344,11 +344,9 @@ public class OperationSetBasicInstantMessagingYahooImpl yahooMailLogon = " <a href=\"" + yahooMailLogon + "\">" + yahooMailLogon + "</a>"; - - String newMail = YahooActivator.getResources().getI18NString( - "newMail", + "service.gui.NEW_MAIL", new String[]{ev.getFrom(), "<" + ev.getEmailAddress() + ">", ev.getSubject(), diff --git a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java index bc0ca71..59fda05 100644 --- a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java +++ b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java @@ -30,17 +30,17 @@ public class NewStatusMessageDialog private JPanel messagePanel = new TransparentPanel(new BorderLayout()); private JLabel messageLabel = new JLabel( - Resources.getString("newStatusMessage")); + Resources.getString("service.gui.NEW_STATUS_MESSAGE")); private JTextField messageTextField = new JTextField(); private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); private JTextArea infoLabel = new JTextArea( - Resources.getString("statusMessageInfo")); + Resources.getString("service.gui.STATUS_MESSAGE_INFO")); private JLabel infoTitleLabel = new JLabel( - Resources.getString("newStatusMessage")); + Resources.getString("service.gui.NEW_STATUS_MESSAGE")); private JLabel iconLabel = new JLabel( Resources.getImage("newStatusMessageIcon")); @@ -49,9 +49,10 @@ public class NewStatusMessageDialog private JPanel rightPanel = new TransparentPanel(new BorderLayout()); - private JButton okButton = new JButton(Resources.getString("ok")); + private JButton okButton = new JButton(Resources.getString("service.gui.OK")); - private JButton cancelButton = new JButton(Resources.getString("cancel")); + private JButton cancelButton = new JButton( + Resources.getString("service.gui.CANCEL")); private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -80,7 +81,7 @@ public class NewStatusMessageDialog */ private void init() { - this.setTitle(Resources.getString("newStatusMessage")); + this.setTitle(Resources.getString("service.gui.NEW_STATUS_MESSAGE")); this.getRootPane().setDefaultButton(okButton); @@ -110,7 +111,7 @@ public class NewStatusMessageDialog this.okButton.setName("ok"); this.cancelButton.setName("cancel"); - this.okButton.setMnemonic(Resources.getMnemonic("ok")); + this.okButton.setMnemonic(Resources.getMnemonic("service.gui.OK")); this.cancelButton.setMnemonic(Resources.getMnemonic("cancel")); this.okButton.addActionListener(this); diff --git a/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java b/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java index b1745ce..cfa9531 100644 --- a/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java +++ b/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java @@ -11,6 +11,7 @@ import java.awt.event.*; import javax.swing.*; +import net.java.sip.communicator.impl.gui.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.util.*; @@ -20,23 +21,27 @@ public class StatusMessageMenu { private Logger logger = Logger.getLogger(StatusMessageMenu.class); + private static final String BRB_MESSAGE + = Resources.getString("service.gui.BRB_MESSAGE"); + + private static final String BUSY_MESSAGE + = Resources.getString("service.gui.BUSY_MESSAGE"); + private JMenuItem noMessageItem - = new JMenuItem(Resources.getString("noMessage")); + = new JMenuItem(Resources.getString("service.gui.NO_MESSAGE")); private JMenuItem newMessageItem - = new JMenuItem(Resources.getString("newMessage")); + = new JMenuItem(Resources.getString("service.gui.NEW_MESSAGE")); - private JMenuItem busyMessageItem - = new JMenuItem(Resources.getString("busyMessage")); + private JMenuItem busyMessageItem = new JMenuItem(BUSY_MESSAGE); - private JMenuItem brbMessageItem - = new JMenuItem(Resources.getString("brbMessage")); + private JMenuItem brbMessageItem = new JMenuItem(BRB_MESSAGE); private ProtocolProviderService protocolProvider; public StatusMessageMenu( ProtocolProviderService protocolProvider) { - super(Resources.getString("setStatusMessage")); + super(Resources.getString("service.gui.SET_STATUS_MESSAGE")); this.protocolProvider = protocolProvider; @@ -78,11 +83,11 @@ public class StatusMessageMenu } else if (menuItem.equals(busyMessageItem)) { - statusMessage = Resources.getString("busyMessage"); + statusMessage = BUSY_MESSAGE; } else if (menuItem.equals(brbMessageItem)) { - statusMessage = Resources.getString("brbMessage"); + statusMessage = BRB_MESSAGE; } new PublishStatusMessageThread(statusMessage).start(); diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java index b9e3f39..0ad5226 100644 --- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java +++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java @@ -48,12 +48,12 @@ public class StatusSimpleSelector * The menu item for the online status */ private JMenuItem onlineItem = new JMenuItem( - Resources.getString("onlineStatus")); + Resources.getString("impl.systray.ONLINE_STATUS")); /** * The menu item for the offline status */ private JMenuItem offlineItem = new JMenuItem( - Resources.getString("offlineStatus")); + Resources.getString("impl.systray.OFFLINE_STATUS")); /** * Creates an instance of <tt>StatusSimpleSelector</tt> diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java index 1c0ffed..ac5ae5b 100644 --- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java +++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java @@ -52,7 +52,7 @@ public class StatusSubMenu parentSystray = tray; - this.setText(Resources.getString("setStatus")); + this.setText(Resources.getString("impl.systray.SET_STATUS")); this.setIcon(Resources.getImage("service.systray.STATUS_MENU_ICON")); /* makes the menu look better */ diff --git a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java index 22746e9..5bc48b2 100644 --- a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java +++ b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java @@ -38,15 +38,15 @@ public class TrayMenu private SystrayServiceJdicImpl parentSystray; private JMenuItem settingsItem = new JMenuItem( - Resources.getString("settings"), + Resources.getString("service.gui.SETTINGS"), Resources.getImage("service.gui.icons.QUICK_MENU_CONFIGURE_ICON")); private JMenuItem closeItem = new JMenuItem( - Resources.getString("close"), + Resources.getString("service.gui.CLOSE"), Resources.getImage("service.systray.CLOSE_MENU_ICON")); private JMenuItem addContactMenuItem = new JMenuItem( - Resources.getString("addContact"), + Resources.getString("service.gui.ADD_CONTACT"), Resources.getImage("service.gui.icons.ADD_CONTACT_16x16_ICON")); private StatusSubMenu statusMenu; @@ -69,7 +69,7 @@ public class TrayMenu this.add(closeItem); this.settingsItem.setName("settings"); - this.closeItem.setName("close"); + this.closeItem.setName("service.gui.CLOSE"); this.addContactMenuItem.setName("addContact"); this.settingsItem.addActionListener(this); @@ -95,7 +95,7 @@ public class TrayMenu configWindow.setVisible(true); } - else if(itemName.equals("close")) + else if(itemName.equals("service.gui.CLOSE")) { try { @@ -117,8 +117,8 @@ public class TrayMenu dialog.setVisible(true); else SystrayActivator.getUIService().getPopupDialog() - .showMessagePopupDialog( - Resources.getString("failedToLoadAddContactDialog")); + .showMessagePopupDialog(Resources.getString( + "impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG")); } } }
\ No newline at end of file diff --git a/src/net/java/sip/communicator/impl/version/VersionImpl.java b/src/net/java/sip/communicator/impl/version/VersionImpl.java index cb0d19c..6a87dfc 100644 --- a/src/net/java/sip/communicator/impl/version/VersionImpl.java +++ b/src/net/java/sip/communicator/impl/version/VersionImpl.java @@ -313,9 +313,10 @@ public class VersionImpl } applicationName = - resourcesService.getSettingsString("applicationName"); - - } catch (Exception e) + resourcesService.getSettingsString( + "service.gui.APPLICATION_NAME"); + } + catch (Exception e) { // if resource bundle is not found or the key is missing // return the defautl name diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java index 21e2bf4..8d50a16 100644 --- a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java +++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java @@ -61,7 +61,8 @@ public class AccountDetailsPanel private JLabel avatarLabel = new JLabel();
- private JButton applyButton = new JButton(Resources.getString("apply"));
+ private JButton applyButton
+ = new JButton(Resources.getString("service.gui.APPLY"));
private JPanel buttonPanel =
new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
@@ -139,7 +140,7 @@ public class AccountDetailsPanel // Create the avatar panel.
JPanel leftPanel = new TransparentPanel(new BorderLayout());
JPanel avatarPanel = new TransparentPanel(new BorderLayout());
- JButton changeAvatarButton = new JButton(Resources.getString("change"));
+ JButton changeAvatarButton = new JButton(Resources.getString("plugin.accountinfo.CHANGE"));
JPanel changeButtonPanel
= new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
@@ -165,14 +166,21 @@ public class AccountDetailsPanel // Labels panel.
JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 5, 5));
- labelsPanel.add(new JLabel(Resources.getString("firstNameNS")));
-// labelsPanel.add(new JLabel(Resources.getString("middleNameNS")));
- labelsPanel.add(new JLabel(Resources.getString("lastNameNS")));
- labelsPanel.add(new JLabel(Resources.getString("genderNS")));
- labelsPanel.add(new JLabel(Resources.getString("ageNS")));
- labelsPanel.add(new JLabel(Resources.getString("bdayNS")));
- labelsPanel.add(new JLabel(Resources.getString("emailNS")));
- labelsPanel.add(new JLabel(Resources.getString("phoneNS")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.FIRST_NAME")));
+// labelsPanel.add(new JLabel(Resources.getString("plugin.accountinfo.MIDDLE_NAME")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.LAST_NAME")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.GENDER")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.AGE")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.BDAY")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.EMAIL")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.PHONE")));
detailsPanel.add(labelsPanel, BorderLayout.WEST);
@@ -221,7 +229,7 @@ public class AccountDetailsPanel private void initUnsupportedPanel()
{
JTextArea unsupportedTextArea =
- new JTextArea(Resources.getString("notSupported"));
+ new JTextArea(Resources.getString("plugin.accountinfo.NOT_SUPPORTED"));
unsupportedTextArea.setEditable(false);
unsupportedTextArea.setLineWrap(true);
@@ -402,7 +410,7 @@ public class AccountDetailsPanel // the bottom so we don't disrupt the standard look of the other details
imagePanel.setLayout(new BoxLayout(imagePanel, BoxLayout.LINE_AXIS));
imagePanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory
- .createTitledBorder(Resources.getString("userPictures")),
+ .createTitledBorder(Resources.getString("plugin.accountinfo.USER_PICTURES")),
BorderFactory.createEmptyBorder(0, 5, 5, 5)));
// Obtain all the details for a contact.
@@ -741,7 +749,7 @@ public class AccountDetailsPanel */
public String getDescription()
{
- return Resources.getString("onlyMessages");
+ return Resources.getString("plugin.accountinfo.ONLY_MESSAGE");
}
}
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java index a0e5241..3ef44b4 100644 --- a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java +++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java @@ -105,7 +105,7 @@ public class AccountInfoForm */
public String getTitle()
{
- return Resources.getString("title");
+ return Resources.getString("plugin.accountinfo.TITLE");
}
/**
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java index b14d7ca..d37b95e 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java @@ -42,7 +42,7 @@ public class AimAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -71,7 +71,7 @@ public class AimAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameAim"); + return Resources.getString("plugin.aimaccregwizz.PROTOCOL_NAME"); } /** @@ -81,7 +81,7 @@ public class AimAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionAim"); + return Resources.getString("plugin.aimaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -104,28 +104,28 @@ public class AimAccountRegistrationWizard { Hashtable summaryTable = new Hashtable(); - summaryTable.put(Resources.getString("id"), registration.getUin()); - summaryTable.put(Resources.getString("rememberPassword"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.USERNAME"), registration.getUin()); + summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"), new Boolean(registration.isRememberPassword())); if (registration.getProxy() != null) - summaryTable.put(Resources.getString("proxy"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY"), registration.getProxy()); if (registration.getProxyPort() != null) - summaryTable.put(Resources.getString("proxyPort"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY"), registration.getProxyPort()); if (registration.getProxyType() != null) - summaryTable.put(Resources.getString("proxyType"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_TYPE"), registration.getProxyType()); if (registration.getProxyPort() != null) - summaryTable.put(Resources.getString("proxyUsername"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_USERNAME"), registration.getProxyPort()); if (registration.getProxyType() != null) - summaryTable.put(Resources.getString("proxyPassword"), + summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_PASSWORD"), registration.getProxyType()); return summaryTable.entrySet().iterator(); @@ -145,7 +145,7 @@ public class AimAccountRegistrationWizard /** * Defines the operations that will be executed when the user clicks on - * the wizard "Signin" button. + * the wizard "service.gui.SIGN_IN" button. * * @param userName the user name to sign in with * @param password the password to sign in with @@ -227,14 +227,14 @@ public class AimAccountRegistrationWizard { AimAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { AimAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java index bb56dfb..8df2f43 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java @@ -49,25 +49,29 @@ public class FirstWizardPage new TransparentPanel(new GridLayout(0, 1, 10, 10)); private JCheckBox enableAdvOpButton = - new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false); + new SIPCommCheckBox(Resources.getString( + "plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), false); - private JLabel uinLabel = new JLabel(Resources.getString("id")); + private JLabel uinLabel = new JLabel( + Resources.getString("plugin.aimaccregwizz.USERNAME")); private JPanel emptyPanel = new TransparentPanel(); private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel = new JLabel( + Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JTextField uinField = new JTextField(); private JPasswordField passField = new JPasswordField(); private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + new SIPCommCheckBox(Resources.getString( + "service.gui.REMEMBER_PASSWORD")); private JPanel registerPanel = new TransparentPanel(new GridLayout(0, 1)); @@ -75,24 +79,24 @@ public class FirstWizardPage new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); private JTextArea registerArea = - new JTextArea(Resources.getString("aimRegisterNewAccountText")); + new JTextArea(Resources.getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT")); private JButton registerButton = - new JButton(Resources.getString("registerNewAccount")); + new JButton(Resources.getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT")); - private JLabel proxyLabel = new JLabel(Resources.getString("proxy")); + private JLabel proxyLabel = new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY")); private JLabel proxyPortLabel = - new JLabel(Resources.getString("proxyPort")); + new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY")); private JLabel proxyUsernameLabel = - new JLabel(Resources.getString("proxyUsername")); + new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_USERNAME")); private JLabel proxyPasswordLabel = - new JLabel(Resources.getString("proxyPassword")); + new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_PASSWORD")); private JLabel proxyTypeLabel = - new JLabel(Resources.getString("proxyType")); + new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_TYPE")); private JTextField proxyField = new JTextField(); @@ -176,7 +180,7 @@ public class FirstWizardPage uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH); uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("aimUinAndPassword"))); + .getString("plugin.aimaccregwizz.USERNAME_AND_PASSWORD"))); mainPanel.add(uinPassPanel); @@ -216,7 +220,7 @@ public class FirstWizardPage advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER); advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("advancedOptions"))); + .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS"))); mainPanel.add(advancedOpPanel); @@ -230,7 +234,7 @@ public class FirstWizardPage this.registerPanel.add(buttonPanel); this.registerPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("registerNewAccount"))); + .getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT"))); mainPanel.add(registerPanel); diff --git a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java index 43eddd8..ff0ce14 100644 --- a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java +++ b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java @@ -53,7 +53,7 @@ public class AutoAwayConfigForm // Title : automatic status JLabel autoStatusLabel = new JLabel(AutoAwayActivator.getResources() - .getI18NString("automaticStatus")); + .getI18NString("plugin.autoaway.AUTO_STATUS")); Font bold = autoStatusLabel.getFont().deriveFont(Font.BOLD); @@ -62,9 +62,9 @@ public class AutoAwayConfigForm JPanel fieldsPanel = new TransparentPanel(new BorderLayout(5, 5)); fieldsPanel.setBorder(BorderFactory.createEmptyBorder(10, 30, 0, 0)); - enable = - new SIPCommCheckBox(AutoAwayActivator.getResources().getI18NString( - "enableChangeStatus")); + enable = new SIPCommCheckBox(AutoAwayActivator.getResources() + .getI18NString("plugin.autoaway.ENABLE_CHANGE_STATUS")); + fieldsPanel.add(enable, BorderLayout.NORTH); enable.addActionListener(new ActionListener() { @@ -81,7 +81,8 @@ public class AutoAwayConfigForm new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); // Texte timerPanel.add(new JLabel( - AutoAwayActivator.getResources().getI18NString("awayMinutes"))); + AutoAwayActivator.getResources() + .getI18NString("plugin.autoaway.AWAY_MINUTES"))); // Spinner timer = new JSpinner(new SpinnerNumberModel(15, 1, 180, 1)); timerPanel.add(timer); @@ -189,7 +190,7 @@ public class AutoAwayConfigForm public String getTitle() { return AutoAwayActivator.getResources() - .getI18NString("automaticStatus"); + .getI18NString("plugin.autoaway.AUTO_STATUS"); } } diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java index 83485be..74ae4d1 100644 --- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java @@ -2,9 +2,9 @@ package net.java.sip.communicator.plugin.branding; import java.awt.*;
import java.awt.event.*;
-import java.io.IOException;
+import java.io.*;
-import javax.imageio.ImageIO;
+import javax.imageio.*;
import javax.swing.*;
import javax.swing.event.*;
@@ -13,7 +13,7 @@ import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.util.*;
-import org.osgi.framework.ServiceReference;
+import org.osgi.framework.*;
public class AboutWindow extends JDialog implements HyperlinkListener,
ActionListener, ExportedWindow
@@ -32,7 +32,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener, = resources.getSettingsString("service.gui.APPLICATION_NAME");
this.setTitle(
- resources.getI18NString("aboutWindowTitle",
+ resources.getI18NString("plugin.branding.ABOUT_WINDOW_TITLE",
new String[]{applicationName}));
setModal(false);
@@ -63,7 +63,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener, = resources.getSettingsInt("plugin.branding.ABOUT_LOGO_FONT_SIZE");
JTextArea logoArea =
- new JTextArea(resources.getI18NString("logoMessage"));
+ new JTextArea(resources.getI18NString("plugin.branding.LOGO_MESSAGE"));
logoArea.setFont(
logoArea.getFont().deriveFont(Font.BOLD, logoAreaFontSize));
logoArea.setForeground(Constants.TITLE_COLOR);
@@ -79,7 +79,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener, StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane();
rightsArea.setContentType("text/html");
- rightsArea.appendToEnd(resources.getI18NString("copyright",
+ rightsArea.appendToEnd(resources.getI18NString("plugin.branding.COPYRIGHT",
new String[]
{ Constants.TEXT_COLOR }));
@@ -95,7 +95,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener, StyledHTMLEditorPane licenseArea = new StyledHTMLEditorPane();
licenseArea.setContentType("text/html");
licenseArea.appendToEnd(resources.
- getI18NString("license",
+ getI18NString("plugin.branding.LICENSE",
new String[]{Constants.TEXT_COLOR}));
licenseArea.setPreferredSize(new Dimension(50, 20));
@@ -115,11 +115,11 @@ public class AboutWindow extends JDialog implements HyperlinkListener, textPanel.add(rightsArea);
textPanel.add(licenseArea);
- JButton okButton = new JButton(resources.getI18NString("ok"));
+ JButton okButton = new JButton(resources.getI18NString("service.gui.OK"));
this.getRootPane().setDefaultButton(okButton);
- okButton.setMnemonic(resources.getI18nMnemonic("ok"));
+ okButton.setMnemonic(resources.getI18nMnemonic("service.gui.OK"));
okButton.addActionListener(this);
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java b/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java index 366e360..ee71feb 100644 --- a/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java +++ b/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java @@ -23,7 +23,7 @@ public class AboutWindowPluginComponent private final JMenuItem aboutMenuItem = new JMenuItem(BrandingActivator.getResources(). - getI18NString("aboutMenuEntry")); + getI18NString("plugin.branding.ABOUT_MENU_ENTRY")); private final Container container; @@ -57,7 +57,7 @@ public class AboutWindowPluginComponent public String getName() { - return BrandingActivator.getResources().getI18NString("aboutMenuEntry"); + return BrandingActivator.getResources().getI18NString("plugin.branding.ABOUT_MENU_ENTRY"); } public void setCurrentContact(MetaContact metaContact) diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java index 5524859..93e9d8d 100644 --- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java @@ -32,7 +32,7 @@ public class WelcomeWindow extends JDialog + System.getProperty("sip-communicator.version")); private JTextArea logoArea = new JTextArea( - BrandingActivator.getResources().getI18NString("logoMessage")); + BrandingActivator.getResources().getI18NString("plugin.branding.LOGO_MESSAGE")); private StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane(); @@ -43,7 +43,7 @@ public class WelcomeWindow extends JDialog private JPanel loadingPanel = new JPanel(new BorderLayout()); private JLabel loadingLabel = new JLabel( - BrandingActivator.getResources().getI18NString("loading") + ": "); + BrandingActivator.getResources().getI18NString("plugin.branding.LOADING") + ": "); private JLabel bundleLabel = new JLabel(); @@ -89,7 +89,7 @@ public class WelcomeWindow extends JDialog this.rightsArea.setContentType("text/html"); this.rightsArea.appendToEnd(BrandingActivator.getResources().getI18NString( - "welcomeMessage", + "plugin.branding.WELCOME_MESSAGE", new String[]{ Constants.TEXT_COLOR, APPLICATION_NAME, @@ -107,7 +107,7 @@ public class WelcomeWindow extends JDialog this.licenseArea.setContentType("text/html"); this.licenseArea.appendToEnd(BrandingActivator.getResources().getI18NString( - "license", + "plugin.branding.LICENSE", new String[] { Constants.TEXT_COLOR diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/AntialiasingManager.java b/src/net/java/sip/communicator/plugin/callhistoryform/AntialiasingManager.java index 3763b9a..d9117d9 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/AntialiasingManager.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/AntialiasingManager.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallHistoryButton.java index 79b7579..c5df7a6 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallHistoryButton.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; @@ -47,6 +47,6 @@ public class CallHistoryButton public String getText() { return ExtendedCallHistorySearchActivator.getResources() - .getI18NString("history"); + .getI18NString("service.gui.HISTORY"); } } diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallList.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallList.java index 4311ea8..4e5c82f 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallList.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallList.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; import java.awt.event.*; diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallListCellRenderer.java index 39977a5..771d4b1 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallListCellRenderer.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; @@ -112,12 +112,12 @@ public class CallListCellRenderer this.timeLabel.setText( ExtendedCallHistorySearchActivator.getResources() - .getI18NString("at") + " " + .getI18NString("service.gui.AT") + " " + GuiUtils.formatTime(participant.getStartTime())); this.durationLabel.setText( ExtendedCallHistorySearchActivator.getResources() - .getI18NString("duration") + " " + .getI18NString("service.gui.DURATION") + " " + GuiUtils.formatTime(participant.getCallTime())); // this.nameLabel.setIcon(listModel diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListModel.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallListModel.java index 4a7d5d9..36cc176 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListModel.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallListModel.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.util.*; diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java b/src/net/java/sip/communicator/plugin/callhistoryform/Constants.java index 1b3f782..d2d247f 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/Constants.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchActivator.java index a7ce2f5..95c65b0 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchActivator.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.util.*; diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java index 3f9f60b..44290da 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java @@ -4,7 +4,8 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; + +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; import java.awt.event.*; @@ -14,7 +15,6 @@ import javax.swing.*; import net.java.sip.communicator.service.callhistory.*; import net.java.sip.communicator.util.*; -import net.java.sip.communicator.util.swing.*; import com.toedter.calendar.*; @@ -26,26 +26,25 @@ import com.toedter.calendar.*; * @author Maxime Bourdon & Thomas Meyer */ public class ExtendedCallHistorySearchDialog - extends SIPCommDialog + extends JDialog implements ActionListener, ItemListener { /* PANEL */ - private JPanel mainSearchPanel = new TransparentPanel(new BorderLayout()); + private JPanel mainSearchPanel = new JPanel(new BorderLayout()); - private JPanel mainPanel = new TransparentPanel(new BorderLayout(3, 1)); + private JPanel mainPanel = new JPanel(new BorderLayout(3, 1)); - private JPanel searchPanel = new TransparentPanel(new GridBagLayout()); + private JPanel searchPanel = new JPanel(new GridBagLayout()); - private JPanel callTypePanel = new TransparentPanel(new GridBagLayout()); + private JPanel callTypePanel = new JPanel(new GridBagLayout()); - private JPanel callListResultPanel = - new TransparentPanel(new BorderLayout()); + private JPanel callListResultPanel = new JPanel(new BorderLayout()); /* BUTTON */ private JButton searchButton = new JButton( ExtendedCallHistorySearchActivator.getResources() - .getI18NString("search"), + .getI18NString("service.gui.SEARCH"), ExtendedCallHistorySearchActivator.getResources() .getImage("plugin.callhistorysearch.SEARCH_ICON")); @@ -55,28 +54,28 @@ public class ExtendedCallHistorySearchDialog /* LABEL */ private JLabel contactNameLabel = new JLabel( ExtendedCallHistorySearchActivator.getResources() - .getI18NString("contactName") + ": "); + .getI18NString("plugin.callhistoryform.CONTACT_NAME") + ": "); private JLabel sinceDateLabel = new JLabel(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("since") + ": "); + .getI18NString("plugin.callhistoryform.SINCE") + ": "); private JLabel untilDateLabel = new JLabel(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("until") + ": "); + .getI18NString("plugin.callhistoryform.UNTIL") + ": "); private JLabel callTypeLabel = new JLabel(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("callType") + ": "); + .getI18NString("plugin.callhistoryform.CALLTYPE") + ": "); /* CHECKBOX */ - private JCheckBox inCheckBox = - new SIPCommCheckBox(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("incoming"), true); + private JCheckBox inCheckBox = new JCheckBox( + ExtendedCallHistorySearchActivator.getResources() + .getI18NString("plugin.callhistoryform.INCOMING"), true); - private JCheckBox outCheckBox = - new SIPCommCheckBox(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("outgoing"), true); + private JCheckBox outCheckBox = new JCheckBox( + ExtendedCallHistorySearchActivator.getResources() + .getI18NString("plugin.callhistoryform.OUTGOING"), true); /* SCROLL PANE */ private JScrollPane scrollPane = new JScrollPane(); @@ -111,7 +110,7 @@ public class ExtendedCallHistorySearchDialog this.mainPanel.setPreferredSize(new Dimension(650, 550)); this.setTitle(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("advancedCallHistorySearch")); + .getI18NString("plugin.callhistoryform.TITLE")); this.initPanels(); @@ -340,7 +339,7 @@ public class ExtendedCallHistorySearchDialog { resultString = ExtendedCallHistorySearchActivator.getResources() - .getI18NString("today"); + .getI18NString("service.gui.TODAY"); } else { @@ -486,10 +485,6 @@ public class ExtendedCallHistorySearchDialog if (callList.getModel().getSize() > 0) callList.addItem(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("olderCalls") + "..."); - } - - protected void close(boolean isEscaped) - { + .getI18NString("service.gui.OLDER_CALLS") + "..."); } } diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchItem.java index 7377d4a..eca4c58 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchItem.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.awt.*; import java.awt.event.*; @@ -29,7 +29,7 @@ public class ExtendedCallHistorySearchItem { private JMenuItem historyMenuItem = new JMenuItem(ExtendedCallHistorySearchActivator.getResources() - .getI18NString("advancedCallHistorySearch"), + .getI18NString("plugin.callhistoryform.TITLE"), ExtendedCallHistorySearchActivator.getResources() .getImage("plugin.callhistorysearch.HISTORY_MENU_ICON")); @@ -42,7 +42,7 @@ public class ExtendedCallHistorySearchItem { this.historyMenuItem.setMnemonic( ExtendedCallHistorySearchActivator.getResources() - .getI18nMnemonic("advancedCallHistorySearch")); + .getI18nMnemonic("plugin.callhistoryform.TITLE")); this.historyMenuItem.addActionListener(this); } diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java b/src/net/java/sip/communicator/plugin/callhistoryform/GuiCallParticipantRecord.java index 8f60b4c..e5a11c9 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java +++ b/src/net/java/sip/communicator/plugin/callhistoryform/GuiCallParticipantRecord.java @@ -4,7 +4,7 @@ * Distributable under LGPL license. * See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.extendedcallhistorysearch; +package net.java.sip.communicator.plugin.callhistoryform; import java.util.*; @@ -30,7 +30,7 @@ public class GuiCallParticipantRecord private Date startTime; - private Date callTime; + private Date callTime; /** * Creates an instance of <tt>GuiCallParticipantRecord</tt> by specifying diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf index 9335d32..62ffc58 100644 --- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf +++ b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf @@ -1,18 +1,17 @@ -Bundle-Activator: net.java.sip.communicator.plugin.extendedcallhistorysearch.ExtendedCallHistorySearchActivator +Bundle-Activator: net.java.sip.communicator.plugin.callhistoryform.ExtendedCallHistorySearchActivator Bundle-Name: Extended Call History Search Bundle-Description: An Extended Call History Search Bundle-Vendor: sip-communicator.org Bundle-Version: 0.0.1 Import-Package: org.osgi.framework, - net.java.sip.communicator.service.callhistory, - net.java.sip.communicator.service.configuration, + net.java.sip.communicator.util, + net.java.sip.communicator.service.resources, net.java.sip.communicator.service.contactlist, net.java.sip.communicator.service.contactlist.event, net.java.sip.communicator.service.gui, net.java.sip.communicator.service.gui.event, - net.java.sip.communicator.service.resources, - net.java.sip.communicator.util, - net.java.sip.communicator.util.swing, + net.java.sip.communicator.service.callhistory, + net.java.sip.communicator.service.configuration, javax.swing, javax.swing.event, javax.swing.table, diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java index 7a1c5ae..af93761 100644 --- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java +++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java @@ -66,7 +66,7 @@ public class ContactInfoContactPanel this.contactInfoDialog = dialog;
this.setBorder(BorderFactory.createCompoundBorder(BorderFactory
- .createTitledBorder(Resources.getString("contacts")),
+ .createTitledBorder(Resources.getString("service.gui.CONTACTS")),
BorderFactory.createEmptyBorder(5, 5, 5, 5)));
this.contactList.setOpaque(false);
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java index ae23f64..02f3dcf 100644 --- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java +++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java @@ -107,14 +107,20 @@ public class ContactInfoDetailsPanel JScrollPane extendedScrollPane = new JScrollPane(extendedPanel);
- this.tabbedPane.addTab(Resources.getString("summary"), icon,
- summaryPanel, Resources.getString("contactSummaryDesc")
+ this.tabbedPane.addTab(
+ Resources.getString("service.gui.SUMMARY"), icon,
+ summaryPanel,
+ Resources.getString(
+ "plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION")
+ contact.getDisplayName());
this.tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);
- this.tabbedPane.addTab(Resources.getString("extended"), icon,
- extendedScrollPane, Resources.getString("contactExtendedDesc")
+ this.tabbedPane.addTab(
+ Resources.getString("plugin.accountinfo.EXTENDED"), icon,
+ extendedScrollPane,
+ Resources.getString(
+ "plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION")
+ contact.getDisplayName());
this.tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);
@@ -135,8 +141,8 @@ public class ContactInfoDetailsPanel */
private JPanel createUnsupportedPanel()
{
- JTextArea unsupportedTextArea =
- new JTextArea(Resources.getString("contactInfoNotSupported"));
+ JTextArea unsupportedTextArea = new JTextArea(
+ Resources.getString("service.gui.CONTACT_INFO_NOT_SUPPORTED"));
unsupportedTextArea.setEditable(false);
unsupportedTextArea.setLineWrap(true);
@@ -210,14 +216,22 @@ public class ContactInfoDetailsPanel // Labels panel.
JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 5, 5));
- labelsPanel.add(new JLabel(Resources.getString("firstNameNS")));
- labelsPanel.add(new JLabel(Resources.getString("middleNameNS")));
- labelsPanel.add(new JLabel(Resources.getString("lastNameNS")));
- labelsPanel.add(new JLabel(Resources.getString("genderNS")));
- labelsPanel.add(new JLabel(Resources.getString("bdayNS")));
- labelsPanel.add(new JLabel(Resources.getString("ageNS")));
- labelsPanel.add(new JLabel(Resources.getString("emailNS")));
- labelsPanel.add(new JLabel(Resources.getString("phoneNS")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.FIRST_NAME")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.MIDDLE_NAME")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.LAST_NAME")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.GENDER")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.BDAY")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.AGE")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.EMAIL")));
+ labelsPanel.add(new JLabel(
+ Resources.getString("plugin.accountinfo.PHONE")));
detailsPanel.add(labelsPanel, BorderLayout.WEST);
@@ -243,7 +257,8 @@ public class ContactInfoDetailsPanel }
if (firstNameDetail.equals(""))
- firstNameDetail = Resources.getString("notSpecified");
+ firstNameDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(firstNameDetail));
@@ -260,7 +275,8 @@ public class ContactInfoDetailsPanel }
if (middleNameDetail.trim().equals(""))
- middleNameDetail = Resources.getString("notSpecified");
+ middleNameDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(middleNameDetail));
@@ -278,7 +294,8 @@ public class ContactInfoDetailsPanel }
if (lastNameDetail.trim().equals(""))
- lastNameDetail = Resources.getString("notSpecified");
+ lastNameDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(lastNameDetail));
@@ -294,7 +311,8 @@ public class ContactInfoDetailsPanel }
if (genderDetail.trim().equals(""))
- genderDetail = Resources.getString("notSpecified");
+ genderDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(genderDetail));
@@ -326,10 +344,11 @@ public class ContactInfoDetailsPanel }
if (birthDateDetail.equals(""))
- birthDateDetail = Resources.getString("notSpecified");
+ birthDateDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
if (ageDetail.equals(""))
- ageDetail = Resources.getString("notSpecified");
+ ageDetail = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(birthDateDetail));
valuesPanel.add(new JLabel(ageDetail));
@@ -346,7 +365,8 @@ public class ContactInfoDetailsPanel }
if (emailDetail.trim().equals(""))
- emailDetail = Resources.getString("notSpecified");
+ emailDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(emailDetail));
@@ -363,7 +383,8 @@ public class ContactInfoDetailsPanel }
if (phoneNumberDetail.trim().equals(""))
- phoneNumberDetail = Resources.getString("notSpecified");
+ phoneNumberDetail
+ = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");
valuesPanel.add(new JLabel(phoneNumberDetail));
@@ -388,7 +409,9 @@ public class ContactInfoDetailsPanel // the bottom so we don't disrupt the standard look of the other details
imagePanel.setLayout(new BoxLayout(imagePanel, BoxLayout.LINE_AXIS));
imagePanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory
- .createTitledBorder(Resources.getString("userPictures")),
+ .createTitledBorder(
+ Resources.getString("plugin.contactinfo.USER_PICTURES")),
+
BorderFactory.createEmptyBorder(0, 5, 5, 5)));
// Obtain all the details for a contact.
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java index b96f65a..3a73333 100644 --- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java +++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java @@ -53,7 +53,7 @@ public class ContactInfoDialog {
this.metaContact = metaContact;
- this.setTitle(Resources.getString("contactDetails")
+ this.setTitle(Resources.getString("plugin.contactinfo.TITLE")
+ ": "
+ metaContact.getDisplayName());
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java index d2f3629..0a1b12c 100644 --- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java +++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java @@ -24,7 +24,7 @@ public class ContactInfoMenuItem ActionListener
{
private JMenuItem menuItem
- = new JMenuItem(Resources.getString("contactInfo"),
+ = new JMenuItem(Resources.getString("service.gui.CONTACT_INFO"),
new ImageIcon(Resources.getImage(
"plugin.contactinfo.CONTACT_INFO_ICON")));
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java index 54053bb..701e6ce 100644 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java @@ -86,7 +86,7 @@ public class DictAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("dict.protocolName"); + return Resources.getString("plugin.dictaccregwizz.PROTOCOL_NAME"); } /** @@ -96,7 +96,7 @@ public class DictAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("dict.protocolDescription"); + return Resources.getString("plugin.dictaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -226,14 +226,14 @@ public class DictAccountRegistrationWizard { DictAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { DictAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java index 83d1f1d..4c65b41 100644 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java @@ -37,38 +37,45 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel hostLabel = new JLabel(Resources.getString("dict.host")); + private JLabel hostLabel = new JLabel(Resources.getString("plugin.dictaccregwizz.HOST")); private JPanel emptyPanel = new TransparentPanel(); private JLabel hostExampleLabel = new JLabel("Ex: dict.org"); - private JLabel portLabel = new JLabel(Resources.getString("dict.port")); + private JLabel portLabel = new JLabel(Resources.getString("plugin.dictaccregwizz.PORT")); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString( + "service.gui.EXISTING_ACCOUNT_ERROR")); private JTextField hostField = new JTextField(); private JTextField portField = new JTextField("2628"); - private JPanel strategyPanel = new TransparentPanel(new BorderLayout(10, 10)); private JPanel strategyTitleBloc = new TransparentPanel(new BorderLayout()); - private JLabel strategyTitle = new JLabel(Resources.getString("dict.strategyList")); + private JLabel strategyTitle = new JLabel(Resources.getString( + "plugin.dictaccregwizz.STRATEGY_LIST")); - private JButton strategyLoader = new JButton(Resources.getString("dict.strategyActu")); + private JButton strategyLoader + = new JButton(Resources.getString( + "plugin.dictaccregwizz.SEARCH_STRATEGIES")); private StrategiesList strategiesList; - private JTextArea strategyDescription = new JTextArea(Resources.getString("dict.strategyDesc")); + + private JTextArea strategyDescription + = new JTextArea(Resources.getString( + "plugin.dictaccregwizz.STRATEGY_DESCRIPTION")); + private ProgressPanel searchProgressPanel; - + private JPanel mainPanel = new TransparentPanel(new BorderLayout()); - + private Object nextPageIdentifier = WizardPage.SUMMARY_PAGE_IDENTIFIER; - + private DictAccountRegistrationWizard wizard; private String initstrategy = ""; @@ -150,7 +157,7 @@ public class FirstWizardPage hostPortPanel.add(valuesPanel, BorderLayout.CENTER); hostPortPanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("dict.serverInformations"))); + Resources.getString("plugin.dictaccregwizz.SERVER_INFO"))); this.labelsPanel.setLayout(new BoxLayout(labelsPanel, BoxLayout.Y_AXIS)); this.valuesPanel.setLayout(new BoxLayout(valuesPanel, BoxLayout.Y_AXIS)); @@ -205,7 +212,7 @@ public class FirstWizardPage this.strategyPanel.add(this.strategyTitleBloc, BorderLayout.NORTH); this.strategyPanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("dict.strategySelection"))); + Resources.getString("plugin.dictaccregwizz.STRATEGY_SELECTION"))); mainPanel.add(this.strategyPanel); this.add(mainPanel, BorderLayout.NORTH); @@ -226,8 +233,8 @@ public class FirstWizardPage this.mainPanel = new TransparentPanel(new BorderLayout()); JPanel infoTitlePanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); - JTextArea firstDescription = new JTextArea(Resources.getString("dict.firstAccount")); - JLabel title = new JLabel(Resources.getString("dict.accountInfoTitle")); + JTextArea firstDescription = new JTextArea(Resources.getString("plugin.dictaccregwizz.FIRST_ACCOUNT")); + JLabel title = new JLabel(Resources.getString("plugin.dictaccregwizz.ACCOUNT_INFO_TITLE")); // Title title.setFont(title.getFont().deriveFont(Font.BOLD, 14.0f)); diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java index 6a788cb..e69b406 100755 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java @@ -45,7 +45,8 @@ public class ProgressPanel // Element creation this.messageLabel = new JLabel(" "); this.progressLabel = new JLabel(" "); - this.cancelButton = new JButton(Resources.getString("cancel")); + this.cancelButton + = new JButton(Resources.getString("service.gui.CANCEL")); this.cancelButton.addActionListener(this); // Right panel init diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java index ccaa2c1..3b867a2 100755 --- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java +++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java @@ -104,12 +104,18 @@ public class ThreadManager * Informations messages */ private String[] messages = new String[] { - Resources.getString("dict.threadConnect"), - Resources.getString("dict.threadConnectFailed"), - Resources.getString("dict.retrievingStrategies"), - Resources.getString("dict.noStrategiesFound"), - Resources.getString("dict.populateList"), - Resources.getString("dict.closingConnexion") + Resources.getString( + "plugin.dictaccregwizz.THREAD_CONNECT"), + Resources.getString( + "plugin.dictaccregwizz.THREAD_CONNECT_FAILED"), + Resources.getString( + "plugin.dictaccregwizz.RETRIEVING_STRATEGIES"), + Resources.getString( + "plugin.dictaccregwizz.NO_STRATEGIES_FOUND"), + Resources.getString( + "plugin.dictaccregwizz.POPULATE_LIST"), + Resources.getString( + "dict.plugin.dictaccregwizz.CLOSING_CONNECTION") }; /** diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java index ed57a2e..0519d78 100644 --- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java +++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java @@ -73,9 +73,12 @@ public class GeneralConfigurationForm autoStartCheckBox = new SIPCommCheckBox(); mainPanel.add(autoStartCheckBox); mainPanel.add(Box.createVerticalStrut(10)); - autoStartCheckBox.setText(Resources.getString( - "autoStartOption", new String[] - { getApplicationName() })); + + autoStartCheckBox.setText( + Resources.getString( + "plugin.generalconfig.AUTO_START", + new String[]{getApplicationName()})); + initAutoStartCheckBox(); autoStartCheckBox.addActionListener(this); } @@ -84,7 +87,8 @@ public class GeneralConfigurationForm mainPanel.add(groupMessagesCheckBox); mainPanel.add(Box.createVerticalStrut(10)); groupMessagesCheckBox.setText( - Resources.getString("groupChatMessages")); + Resources.getString( + "plugin.generalconfig.GROUP_CHAT_MESSAGES")); groupMessagesCheckBox.addActionListener(this); } { @@ -101,7 +105,7 @@ public class GeneralConfigurationForm logHistoryCheckBox = new SIPCommCheckBox(); logHistoryPanel.add(logHistoryCheckBox); logHistoryCheckBox.setText( - Resources.getString("logHistory")); + Resources.getString("plugin.generalconfig.LOG_HISTORY")); logHistoryCheckBox.setBounds(0, 0, 200, 19); logHistoryCheckBox.addActionListener(this); logHistoryCheckBox.addChangeListener(new ChangeListener() @@ -119,7 +123,7 @@ public class GeneralConfigurationForm showHistoryCheckBox = new SIPCommCheckBox(); logHistoryPanel.add(showHistoryCheckBox); showHistoryCheckBox.setText( - Resources.getString("showHistory")); + Resources.getString("plugin.generalconfig.SHOW_HISTORY")); showHistoryCheckBox.setBounds(17, 25, 140, 19); showHistoryCheckBox.addActionListener(this); showHistoryCheckBox.addChangeListener(new ChangeListener() @@ -153,7 +157,7 @@ public class GeneralConfigurationForm historySizeLabel = new JLabel(); logHistoryPanel.add(historySizeLabel); historySizeLabel.setText( - Resources.getString("historySize")); + Resources.getString("plugin.generalconfig.HISTORY_SIZE")); historySizeLabel.setBounds(205, 27, 220, 15); } } @@ -174,7 +178,7 @@ public class GeneralConfigurationForm sendMessagePanel.add( sendMessageLabel, BorderLayout.WEST); sendMessageLabel.setText( - Resources.getString("sendMessagesWith")); + Resources.getString("plugin.generalconfig.SEND_MESSAGES_WITH")); } { ComboBoxModel sendMessageComboBoxModel = @@ -202,7 +206,7 @@ public class GeneralConfigurationForm mainPanel.add(enableTypingNotifiCheckBox); mainPanel.add(Box.createVerticalStrut(10)); enableTypingNotifiCheckBox.setText( - Resources.getString("enableTypingNotifications")); + Resources.getString("service.gui.ENABLE_TYPING_NOTIFICATIONS")); enableTypingNotifiCheckBox.setPreferredSize( new java.awt.Dimension(253, 20)); enableTypingNotifiCheckBox.setAlignmentY(0.0f); @@ -213,7 +217,7 @@ public class GeneralConfigurationForm mainPanel.add(bringToFrontCheckBox); mainPanel.add(Box.createVerticalStrut(10)); bringToFrontCheckBox.setText( - Resources.getString("bringWindowToFront")); + Resources.getString("plugin.generalconfig.BRING_WINDOW_TO_FRONT")); bringToFrontCheckBox.addActionListener(this); } // { @@ -229,7 +233,7 @@ public class GeneralConfigurationForm // { // final JCheckBox enableTransparencyCheckBox // = new JCheckBox( -// Resources.getString("enableTransparency"), +// Resources.getString("plugin.generalconfig.ENABLE_TRANSPARENCY"), // ConfigurationManager.isTransparentWindowEnabled()); // transparencyPanel.add( // enableTransparencyCheckBox, BorderLayout.NORTH); @@ -247,7 +251,7 @@ public class GeneralConfigurationForm // } // { // JLabel transparencyLabel = new JLabel( -// Resources.getString("transparency")); +// Resources.getString("plugin.generalconfig.TRANSPARENCY")); // // transparencyPanel.add( transparencyLabel, // BorderLayout.WEST); @@ -325,7 +329,7 @@ public class GeneralConfigurationForm public String getTitle() { - return Resources.getString("general"); + return Resources.getString("service.gui.GENERAL"); } public int getIndex() @@ -383,7 +387,8 @@ public class GeneralConfigurationForm GeneralConfigPluginActivator.getUIService(). getPopupDialog().showMessagePopupDialog( e.getMessage(), - Resources.getString("errorPermission"), + Resources.getString( + "plugin.generalconfig.ERROR_PERMISSION"), PopupDialog.ERROR_MESSAGE); // cannot delete no permissions } @@ -425,15 +430,16 @@ public class GeneralConfigurationForm try { String appName = getApplicationName(); + ShellLink shortcut = new ShellLink( ShellLink.STARTUP, appName); shortcut.setUserType(ShellLink.CURRENT_USER); - + String f1 = shortcut.getcurrentUserLinkPath() + File.separator + appName + ".lnk"; - + String f2 = f1.replaceAll( System.getProperty("user.name"), "All Users"); @@ -442,8 +448,8 @@ public class GeneralConfigurationForm autoStartCheckBox.setSelected(true); else autoStartCheckBox.setSelected(false); - - } catch (Exception e) + } + catch (Exception e) { logger.error(e); } diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java index 945574b..51c249e 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java @@ -37,12 +37,14 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel userID = new JLabel(Resources.getString("userID")); + private JLabel userID = new JLabel( + Resources.getString("plugin.gibberishaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel = new JLabel( + Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel - = new JLabel(Resources.getString("existingAccount")); + = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel = new TransparentPanel(); @@ -52,8 +54,8 @@ public class FirstWizardPage private JPasswordField passField = new JPasswordField(); - private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + private JCheckBox rememberPassBox = new SIPCommCheckBox( + Resources.getString("service.gui.REMEMBER_PASSWORD")); private JPanel mainPanel = new TransparentPanel(); @@ -123,7 +125,7 @@ public class FirstWizardPage userPassPanel.setBorder(BorderFactory .createTitledBorder(Resources.getString( - "userAndPassword"))); + "plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD"))); this.add(userPassPanel, BorderLayout.NORTH); } diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java index 54d0424..d737d7b 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java @@ -55,7 +55,7 @@ public class GibberishAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -86,7 +86,7 @@ public class GibberishAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameGibberish"); + return Resources.getString("plugin.gibberishaccregwizz.PROTOCOL_NAME"); } /** @@ -96,7 +96,7 @@ public class GibberishAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionGibberish"); + return Resources.getString("plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -195,14 +195,14 @@ public class GibberishAccountRegistrationWizard { GibberishAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) { GibberishAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java index 83d73be..58b8a5b 100644 --- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java @@ -42,12 +42,14 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel();
- private JLabel userIDLabel = new JLabel(Resources.getString("gtalkUsername"));
+ private JLabel userIDLabel = new JLabel(
+ Resources.getString("plugin.googletalkaccregwizz.USERNAME"));
- private JLabel passLabel = new JLabel(Resources.getString("password"));
+ private JLabel passLabel
+ = new JLabel(Resources.getString("service.gui.PASSWORD"));
private JLabel existingAccountLabel = new JLabel(Resources
- .getString("existingAccount"));
+ .getString("service.gui.EXISTING_ACCOUNT_ERROR"));
private JPanel emptyPanel = new TransparentPanel();
@@ -57,36 +59,47 @@ public class FirstWizardPage private JPasswordField passField = new JPasswordField();
- private JCheckBox rememberPassBox =
- new SIPCommCheckBox(Resources.getString("rememberPassword"));
+ private JCheckBox rememberPassBox
+ = new SIPCommCheckBox(Resources
+ .getString("service.gui.REMEMBER_PASSWORD"));
- private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10));
+ private JPanel advancedOpPanel
+ = new TransparentPanel(new BorderLayout(10, 10));
- private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+ private JPanel labelsAdvOpPanel
+ = new TransparentPanel(new GridLayout(0, 1, 10, 10));
- private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+ private JPanel valuesAdvOpPanel
+ = new TransparentPanel(new GridLayout(0, 1, 10, 10));
- private JCheckBox sendKeepAliveBox =
- new SIPCommCheckBox(Resources.getString("enableKeepAlive"));
+ private JCheckBox sendKeepAliveBox
+ = new SIPCommCheckBox(Resources
+ .getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"));
- private JCheckBox enableAdvOpButton =
- new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);
+ private JCheckBox enableAdvOpButton = new SIPCommCheckBox(
+ Resources.getString(
+ "plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"),
+ false);
- private JLabel resourceLabel = new JLabel(Resources.getString("resource"));
+ private JLabel resourceLabel
+ = new JLabel(Resources.getString("plugin.jabberaccregwizz.RESOURCE"));
private JTextField resourceField
= new JTextField(GoogleTalkAccountRegistration.DEFAULT_RESOURCE);
- private JLabel priorityLabel = new JLabel(Resources.getString("priority"));
+ private JLabel priorityLabel
+ = new JLabel(Resources.getString("plugin.jabberaccregwizz.PRIORITY"));
private JTextField priorityField
= new JTextField(GoogleTalkAccountRegistration.DEFAULT_PRIORITY);
- private JLabel serverLabel = new JLabel(Resources.getString("server"));
+ private JLabel serverLabel
+ = new JLabel(Resources.getString("plugin.jabberaccregwizz.SERVER"));
private JTextField serverField = new JTextField();
- private JLabel portLabel = new JLabel(Resources.getString("port"));
+ private JLabel portLabel
+ = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT"));
private JTextField portField
= new JTextField(GoogleTalkAccountRegistration.DEFAULT_PORT);
@@ -96,10 +109,10 @@ public class FirstWizardPage private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
private JTextArea registerArea = new JTextArea(Resources
- .getString("gtalkRegisterNewAccountText"));
+ .getString("plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT"));
private JButton registerButton = new JButton(Resources
- .getString("registerNewAccount"));
+ .getString("plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE"));
private JPanel mainPanel = new TransparentPanel();
@@ -170,7 +183,7 @@ public class FirstWizardPage userIDPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
userIDPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
- .getString("userIDAndPassword")));
+ .getString("plugin.jabberaccregwizz.USERNAME_AND_PASSWORD")));
mainPanel.add(userIDPassPanel);
@@ -260,7 +273,7 @@ public class FirstWizardPage advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
- .getString("advancedOptions")));
+ .getString("plugin.jabberaccregwizz.ADVANCED_OPTIONS")));
mainPanel.add(advancedOpPanel);
@@ -291,7 +304,7 @@ public class FirstWizardPage registerPanel.add(buttonPanel);
registerPanel.setBorder(BorderFactory.createTitledBorder(Resources
- .getString("registerNewAccount")));
+ .getString("plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE")));
mainPanel.add(registerPanel);
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java index ca1610e..ef656a7 100644 --- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java @@ -50,7 +50,8 @@ public class GoogleTalkAccountRegistrationWizard {
this.wizardContainer = wizardContainer;
- this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+ this.wizardContainer
+ .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
}
/**
@@ -81,7 +82,8 @@ public class GoogleTalkAccountRegistrationWizard */
public String getProtocolName()
{
- return Resources.getString("protocolName");
+ return Resources
+ .getString("plugin.googletalkaccregwizz.PROTOCOL_NAME");
}
/**
@@ -91,7 +93,8 @@ public class GoogleTalkAccountRegistrationWizard */
public String getProtocolDescription()
{
- return Resources.getString("protocolDescription");
+ return Resources
+ .getString("plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION");
}
/**
@@ -116,26 +119,33 @@ public class GoogleTalkAccountRegistrationWizard {
Hashtable summaryTable = new Hashtable();
- summaryTable.put( Resources.getString("gtalkUsername"),
- registration.getUserID());
+ summaryTable.put(
+ Resources.getString("plugin.googletalkaccregwizz.USERNAME"),
+ registration.getUserID());
- summaryTable.put( Resources.getString("rememberPassword"),
- new Boolean(registration.isRememberPassword()));
+ summaryTable.put(
+ Resources.getString("service.gui.REMEMBER_PASSWORD"),
+ new Boolean(registration.isRememberPassword()));
- summaryTable.put( Resources.getString("server"),
- registration.getServerAddress());
+ summaryTable.put(
+ Resources.getString("plugin.jabberaccregwizz.SERVER"),
+ registration.getServerAddress());
- summaryTable.put( Resources.getString("port"),
- String.valueOf(registration.getPort()));
+ summaryTable.put(
+ Resources.getString("plugin.jabberaccregwizz.PORT"),
+ String.valueOf(registration.getPort()));
- summaryTable.put( Resources.getString("enableKeepAlive"),
+ summaryTable.put(
+ Resources.getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"),
String.valueOf(registration.isSendKeepAlive()));
- summaryTable.put( Resources.getString("resource"),
- registration.getResource());
+ summaryTable.put(
+ Resources.getString("plugin.jabberaccregwizz.RESOURCE"),
+ registration.getResource());
- summaryTable.put( Resources.getString("priority"),
- String.valueOf(registration.getPriority()));
+ summaryTable.put(
+ Resources.getString("plugin.jabberaccregwizz.PRIORITY"),
+ String.valueOf(registration.getPriority()));
return summaryTable.entrySet().iterator();
}
@@ -242,14 +252,14 @@ public class GoogleTalkAccountRegistrationWizard {
GoogleTalkAccRegWizzActivator.getUIService().getPopupDialog()
.showMessagePopupDialog(exc.getMessage(),
- Resources.getString("error"),
+ Resources.getString("service.gui.ERROR"),
PopupDialog.ERROR_MESSAGE);
}
catch (IllegalStateException exc)
{
GoogleTalkAccRegWizzActivator.getUIService().getPopupDialog()
.showMessagePopupDialog(exc.getMessage(),
- Resources.getString("error"),
+ Resources.getString("service.gui.ERROR"),
PopupDialog.ERROR_MESSAGE);
}
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java index 7f56c2f..9cb54de 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java @@ -44,49 +44,55 @@ public class FirstWizardPage private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); private JCheckBox enableAdvOpButton = - new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false); + new SIPCommCheckBox(Resources.getString( + "plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), + false); - private JLabel uinLabel = new JLabel(Resources.getString("uin")); + private JLabel uinLabel + = new JLabel(Resources.getString("plugin.icqaccregwizz.USERNAME")); private JPanel emptyPanel = new TransparentPanel(); private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString( + "service.gui.EXISTING_ACCOUNT_ERROR")); private JTextField uinField = new JTextField(); private JPasswordField passField = new JPasswordField(); private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + new SIPCommCheckBox(Resources.getString("service.gui.REMEMBER_PASSWORD")); private JPanel registerPanel = new TransparentPanel(new GridLayout(0, 1)); private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); - private JTextArea registerArea = - new JTextArea(Resources.getString("icqRegisterNewAccountText")); + private JTextArea registerArea = new JTextArea( + Resources.getString("plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT")); - private JButton registerButton = - new JButton(Resources.getString("registerNewAccount")); + private JButton registerButton = new JButton( + Resources.getString("plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT")); - private JLabel proxyLabel = new JLabel(Resources.getString("proxy")); + private JLabel proxyLabel = new JLabel( + Resources.getString("plugin.icqaccregwizz.PROXY")); private JLabel proxyPortLabel = - new JLabel(Resources.getString("proxyPort")); + new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_PORT")); private JLabel proxyUsernameLabel = - new JLabel(Resources.getString("proxyUsername")); + new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_USERNAME")); private JLabel proxyPasswordLabel = - new JLabel(Resources.getString("proxyPassword")); + new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_PASSWORD")); private JLabel proxyTypeLabel = - new JLabel(Resources.getString("proxyType")); + new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_TYPE")); private JTextField proxyField = new JTextField(); @@ -169,7 +175,7 @@ public class FirstWizardPage uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH); uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("aimUinAndPassword"))); + .getString("plugin.aimaccregwizz.USERNAME_AND_PASSWORD"))); mainPanel.add(uinPassPanel); @@ -213,7 +219,7 @@ public class FirstWizardPage advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER); advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("advancedOptions"))); + .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS"))); mainPanel.add(advancedOpPanel); @@ -227,7 +233,7 @@ public class FirstWizardPage this.registerPanel.add(buttonPanel); this.registerPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("registerNewAccount"))); + .getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT"))); mainPanel.add(registerPanel); diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java index 102aaf3..134aed0 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java @@ -42,7 +42,7 @@ public class IcqAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -71,7 +71,7 @@ public class IcqAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameIcq"); + return Resources.getString("plugin.icqaccregwizz.PROTOCOL_NAME"); } /** @@ -81,7 +81,7 @@ public class IcqAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionIcq"); + return Resources.getString("plugin.icqaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -104,14 +104,14 @@ public class IcqAccountRegistrationWizard { LinkedHashMap summaryTable = new LinkedHashMap(); - summaryTable.put(Resources.getString("uin"), registration.getUin()); - summaryTable.put(Resources.getString("rememberPassword"), + summaryTable.put(Resources.getString("service.gui.USER_IDENTIFIER"), registration.getUin()); + summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"), new Boolean(registration.isRememberPassword())); if(registration.isAdvancedSettingsEnabled()) { if (registration.getProxy() != null) - summaryTable.put(Resources.getString("proxy"), + summaryTable.put(Resources.getString("plugin.icqaccregwizz.PROXY"), registration.getProxy()); if (registration.getProxyPort() != null) @@ -228,14 +228,14 @@ public class IcqAccountRegistrationWizard { IcqAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { IcqAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java index 1054057..5374020 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java @@ -59,18 +59,22 @@ public class FirstWizardPage private JPanel valuesOptionsPanel = new TransparentPanel(); private JLabel infoPassword - = new JLabel(Resources.getString("infoPassword")); + = new JLabel(Resources.getString("plugin.ircaccregwizz.INFO_PASSWORD")); - private JLabel nick = new JLabel(Resources.getString("nick")); + private JLabel nick + = new JLabel(Resources.getString("plugin.ircaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); - private JLabel server = new JLabel(Resources.getString("server")); + private JLabel server + = new JLabel(Resources.getString("plugin.ircaccregwizz.HOST")); - private JLabel port = new JLabel(Resources.getString("port")); + private JLabel port + = new JLabel(Resources.getString("plugin.ircaccregwizz.PORT")); private JLabel existingAccountLabel - = new JLabel(Resources.getString("existingAccount")); + = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel = new TransparentPanel(); @@ -88,17 +92,18 @@ public class FirstWizardPage private JTextField portField = new JTextField(); - private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + private JCheckBox rememberPassBox + = new SIPCommCheckBox(Resources.getString("service.gui.REMEMBER_PASSWORD")); - private JCheckBox autoNickChange = - new SIPCommCheckBox(Resources.getString("autoNickChange")); + private JCheckBox autoNickChange + = new SIPCommCheckBox( + Resources.getString("plugin.ircaccregwizz.AUTO_NICK_CHANGE")); - private JCheckBox defaultPort = - new SIPCommCheckBox(Resources.getString("defaultPort")); + private JCheckBox defaultPort = new SIPCommCheckBox( + Resources.getString("plugin.ircaccregwizz.USE_DEFAULT_PORT")); - private JCheckBox passwordNotRequired = - new SIPCommCheckBox(Resources.getString("passwordNotRequired")); + private JCheckBox passwordNotRequired = new SIPCommCheckBox( + Resources.getString("plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED")); private JPanel mainPanel = new TransparentPanel(); @@ -201,7 +206,7 @@ public class FirstWizardPage userPassPanel.setBorder(BorderFactory .createTitledBorder(Resources.getString( - "userAndPassword"))); + "plugin.ircaccregwizz.USERNAME_AND_PASSWORD"))); labelsServerPanel.add(server); labelsServerPanel.add(emptyPanel2); @@ -216,13 +221,13 @@ public class FirstWizardPage serverPanel.add(defaultPort, BorderLayout.SOUTH); serverPanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("serverIRC"))); + Resources.getString("plugin.ircaccregwizz.IRC_SERVER"))); optionsPanel.add(rememberPassBox, BorderLayout.CENTER); optionsPanel.add(autoNickChange, BorderLayout.SOUTH); optionsPanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("options"))); + Resources.getString("service.gui.OPTIONS"))); mainPanel.add(userPassPanel); mainPanel.add(serverPanel); diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java index 17bdd67..0c4f364 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java @@ -52,7 +52,7 @@ public class IrcAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -83,7 +83,7 @@ public class IrcAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameIrc"); + return Resources.getString("plugin.ircaccregwizz.PROTOCOL_NAME"); } /** @@ -93,7 +93,7 @@ public class IrcAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionIrc"); + return Resources.getString("plugin.ircaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -229,14 +229,14 @@ public class IrcAccountRegistrationWizard { IrcAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) { IrcAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java index c38e410..6980853 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java @@ -45,12 +45,14 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel userIDLabel = new JLabel(Resources.getString("jabberUsername")); + private JLabel userIDLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel = new JLabel(Resources - .getString("existingAccount")); + .getString("plugin.jabberaccregwizz.USER_EXISTS_ERROR")); private JPanel emptyPanel = new TransparentPanel(); @@ -60,36 +62,45 @@ public class FirstWizardPage private JPasswordField passField = new JPasswordField(); - private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + private JCheckBox rememberPassBox = new SIPCommCheckBox(Resources + .getString("service.gui.REMEMBER_PASSWORD")); - private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10)); + private JPanel advancedOpPanel + = new TransparentPanel(new BorderLayout(10, 10)); - private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); + private JPanel labelsAdvOpPanel + = new TransparentPanel(new GridLayout(0, 1, 10, 10)); - private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); + private JPanel valuesAdvOpPanel + = new TransparentPanel(new GridLayout(0, 1, 10, 10)); - private JCheckBox sendKeepAliveBox = - new SIPCommCheckBox(Resources.getString("enableKeepAlive")); + private JCheckBox sendKeepAliveBox = new SIPCommCheckBox(Resources + .getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE")); - private JCheckBox enableAdvOpButton = - new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false); + private JCheckBox enableAdvOpButton = new SIPCommCheckBox( + Resources.getString( + "plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), + false); - private JLabel resourceLabel = new JLabel(Resources.getString("resource")); + private JLabel resourceLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.RESOURCE")); private JTextField resourceField = new JTextField(JabberAccountRegistration.DEFAULT_RESOURCE); - private JLabel priorityLabel = new JLabel(Resources.getString("priority")); + private JLabel priorityLabel = new JLabel( + Resources.getString("plugin.jabberaccregwizz.PRIORITY")); private JTextField priorityField = new JTextField(JabberAccountRegistration.DEFAULT_PRIORITY); - private JLabel serverLabel = new JLabel(Resources.getString("server")); + private JLabel serverLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.SERVER")); private JTextField serverField = new JTextField(); - private JLabel portLabel = new JLabel(Resources.getString("port")); + private JLabel portLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT")); private JTextField portField = new JTextField(JabberAccountRegistration.DEFAULT_PORT); @@ -99,10 +110,10 @@ public class FirstWizardPage private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); private JTextArea registerArea = new JTextArea(Resources - .getString("registerNewAccountText")); + .getString("plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT")); private JButton registerButton = new JButton(Resources - .getString("registerNewAccount")); + .getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE")); private JPanel mainPanel = new TransparentPanel(); @@ -172,7 +183,7 @@ public class FirstWizardPage userIDPassPanel.add(rememberPassBox, BorderLayout.SOUTH); userIDPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("userIDAndPassword"))); + .getString("plugin.jabberaccregwizz.USERNAME_AND_PASSWORD"))); mainPanel.add(userIDPassPanel); @@ -262,7 +273,7 @@ public class FirstWizardPage advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER); advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("advancedOptions"))); + .getString("plugin.jabberaccregwizz.ADVANCED_OPTIONS"))); mainPanel.add(advancedOpPanel); @@ -302,7 +313,7 @@ public class FirstWizardPage registerPanel.add(buttonPanel); registerPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("registerNewAccount"))); + .getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE"))); mainPanel.add(registerPanel); @@ -369,8 +380,6 @@ public class FirstWizardPage { String userID = userIDField.getText(); -System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!userID" + userID); - if (!wizard.isModification() && isExistingAccount(userID)) { nextPageIdentifier = FIRST_PAGE_IDENTIFIER; diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java index d84bd3f..fbcf0c4 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java @@ -55,7 +55,8 @@ public class JabberAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer + .setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -86,7 +87,7 @@ public class JabberAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameJabber"); + return Resources.getString("plugin.jabberaccregwizz.PROTOCOL_NAME"); } /** @@ -96,7 +97,8 @@ public class JabberAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionJabber"); + return Resources + .getString("plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -121,26 +123,33 @@ public class JabberAccountRegistrationWizard { Hashtable summaryTable = new Hashtable(); - summaryTable.put( Resources.getString("jabberUsername"), - registration.getUserID()); + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.USERNAME"), + registration.getUserID()); - summaryTable.put( Resources.getString("rememberPassword"), - new Boolean(registration.isRememberPassword())); + summaryTable.put( + Resources.getString("service.gui.REMEMBER_PASSWORD"), + new Boolean(registration.isRememberPassword())); - summaryTable.put( Resources.getString("server"), - registration.getServerAddress()); + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.SERVER"), + registration.getServerAddress()); - summaryTable.put( Resources.getString("port"), - String.valueOf(registration.getPort())); + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.PORT"), + String.valueOf(registration.getPort())); - summaryTable.put( Resources.getString("enableKeepAlive"), + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"), String.valueOf(registration.isSendKeepAlive())); - summaryTable.put( Resources.getString("resource"), - registration.getResource()); + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.RESOURCE"), + registration.getResource()); - summaryTable.put( Resources.getString("priority"), - String.valueOf(registration.getPriority())); + summaryTable.put( + Resources.getString("plugin.jabberaccregwizz.PRIORITY"), + String.valueOf(registration.getPriority())); return summaryTable.entrySet().iterator(); } @@ -253,7 +262,7 @@ public class JabberAccountRegistrationWizard logger.warn("Failed to create a jabber account.", exc); JabberAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) @@ -261,7 +270,7 @@ public class JabberAccountRegistrationWizard logger.warn("Failed to create a jabber account.", exc); JabberAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java index 0c5217e..3ed3a70 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java @@ -52,15 +52,21 @@ public class JabberNewAccountDialog private JPanel westPanel = new TransparentPanel(new BorderLayout(10, 10)); // Labels - private JLabel serverLabel = new JLabel(Resources.getString("cserver")); + private JLabel serverLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.CSERVER")); - private JLabel userIDLabel = new JLabel(Resources.getString("userID")); + private JLabel userIDLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); - private JLabel pass2Label = new JLabel(Resources.getString("password2")); + private JLabel pass2Label + = new JLabel(Resources.getString( + "plugin.jabberaccregwizz.PASSWORD_CONFIRM")); - private JLabel portLabel = new JLabel(Resources.getString("port")); + private JLabel portLabel + = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT")); private JLabel westIconLabel = new JLabel(); @@ -108,7 +114,8 @@ public class JabberNewAccountDialog { this.setSize(new Dimension(450, 250)); this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - this.setTitle(Resources.getString("newAccountTitle")); + this.setTitle( + Resources.getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE")); this.setModal(true); this.setGlassPane(loadingAccountGlassPane); @@ -147,18 +154,27 @@ public class JabberNewAccountDialog { if (exc.getXMPPError().getCode() == 409) { - JOptionPane.showMessageDialog(null, Resources - .getString("userExist"), Resources.getString("xmppError"), + JOptionPane.showMessageDialog( + null, + Resources.getString( + "plugin.jabberaccregwizz.USER_EXISTS_ERROR"), + Resources.getString( + "plugin.jabberaccregwizz.XMPP_ERROR"), JOptionPane.ERROR_MESSAGE); - + logger.error( - "Error when created a new Jabber account : user already exist"); + "Error when created a new Jabber account :" + + " user already exist"); } else { - JOptionPane.showMessageDialog(null, Resources - .getString("unknownXmppError"), Resources - .getString("xmppError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog( + null, + Resources.getString( + "plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR"), + Resources.getString( + "plugin.jabberaccregwizz.XMPP_ERROR"), + JOptionPane.ERROR_MESSAGE); } return false; } @@ -195,8 +211,10 @@ public class JabberNewAccountDialog userIDPassPanel.add(labelsPanel, BorderLayout.WEST); userIDPassPanel.add(valuesPanel, BorderLayout.CENTER); - chooseButton.setText(Resources.getString("chooseLabel")); - chooseButton.setMnemonic(Resources.getMnemonic("chooseLabel")); + chooseButton.setText( + Resources.getString("plugin.jabberaccregwizz.CHOOSE")); + chooseButton.setMnemonic( + Resources.getMnemonic("plugin.jabberaccregwizz.CHOOSE")); westIconLabel.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(20, 20, 20, 20), BorderFactory @@ -264,9 +282,13 @@ public class JabberNewAccountDialog } else { - JOptionPane.showMessageDialog(null, Resources - .getString("notSamePassword"), Resources - .getString("xmppError"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog( + null, + Resources.getString( + "plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION"), + Resources.getString( + "plugin.jabberaccregwizz.XMPP_ERROR"), + JOptionPane.ERROR_MESSAGE); } } }); @@ -280,12 +302,12 @@ public class JabberNewAccountDialog } }); - okButton.setText(Resources.getString("okLabel")); - okButton.setMnemonic(Resources.getMnemonic("okLabel")); + okButton.setText(Resources.getString("service.gui.OK")); + okButton.setMnemonic(Resources.getMnemonic("service.gui.OK")); okButton.setEnabled(false); - cancelButton.setText(Resources.getString("cancelLabel")); - cancelButton.setMnemonic(Resources.getMnemonic("cancelLabel")); + cancelButton.setText(Resources.getString("service.gui.CANCEL")); + cancelButton.setMnemonic(Resources.getMnemonic("service.gui.CANCEL")); buttonBox.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10))); buttonBox.add(okButton); diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java index 155bbef..e67e7ad 100644 --- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java +++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java @@ -33,7 +33,7 @@ public class KeybindingsConfigForm public String getTitle() { return KeybindingChooserActivator.getResources() - .getI18NString("keybindings"); + .getI18NString("plugin.keybindings.PLUGIN_NAME"); } /** diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java index 6ecd153..5a8e35e 100644 --- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java +++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java @@ -12,9 +12,9 @@ import java.util.*; import javax.swing.*; +import net.java.sip.communicator.service.keybindings.*; import chooser.*; -import net.java.sip.communicator.service.keybindings.*; import net.java.sip.communicator.util.swing.*; /** @@ -74,7 +74,10 @@ public class KeybindingsConfigPanel add(chooserPanes); - JButton apply = new JButton("Apply"); + JButton apply = new JButton( + KeybindingChooserActivator.getResources() + .getI18NString("service.gui.APPLY")); + apply.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent event) diff --git a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java index cac2b95..bfdd83c 100644 --- a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java +++ b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java @@ -12,8 +12,9 @@ import java.io.*; import javax.swing.*; -import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.configuration.*; +import net.java.sip.communicator.service.gui.*; + import net.java.sip.communicator.util.swing.*; /** @@ -26,23 +27,35 @@ public class MailboxConfigurationForm extends TransparentPanel implements ConfigurationForm, ActionListener { - private JLabel jlblOutgoingMessage = new JLabel( - Resources.getString("outgoing")); + private JLabel jlblOutgoingMessage + = new JLabel(Resources.getString("plugin.mailbox.OUTGOING")); + private JFileChooser jfcOutgoingMessage = new JFileChooser(); - private JButton jbtnOutgoingMessage = new JButton( - Resources.getString("browse")); + + private JButton jbtnOutgoingMessage + = new JButton(Resources.getString("plugin.mailbox.BROWSE")); + private JTextField jtfOutgoingMessage = new JTextField(); - private JPanel jpOutgoingMessage = new TransparentPanel - (new FlowLayout(FlowLayout.LEFT)); - private JLabel jlblIncomingMessage = new JLabel( - Resources.getString("incoming")); + + private JPanel jpOutgoingMessage + = new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); + + private JLabel jlblIncomingMessage + = new JLabel(Resources.getString("plugin.mailbox.INCOMING")); + private JFileChooser jfcIncomingMessage = new JFileChooser(); - private JButton jbtnIncomingMessage = new JButton( - Resources.getString("browse")); + + private JButton jbtnIncomingMessage + = new JButton(Resources.getString("plugin.mailbox.BROWSE")); + private JTextField jtfIncomingMessage = new JTextField(); - private JPanel jpIncomingMessage = new TransparentPanel( - new FlowLayout(FlowLayout.LEFT)); - private JLabel jlblWaitTime = new JLabel(Resources.getString("waitTime")); + + private JPanel jpIncomingMessage + = new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); + + private JLabel jlblWaitTime + = new JLabel(Resources.getString("plugin.mailbox.WAIT_TIME")); + private JSpinner jsWaitTime = new JSpinner(new SpinnerNumberModel( new Integer(10000), new Integer(0), @@ -52,20 +65,26 @@ public class MailboxConfigurationForm private JPanel jpWaitTime = new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); - private JLabel jlblMaxMessageTime = new JLabel( - Resources.getString("maxMessageTime")); + private JLabel jlblMaxMessageTime + = new JLabel(Resources.getString("plugin.mailbox.MAX_MESSAGE_TIME")); + private JSpinner jsMaxMessageTime = new JSpinner(new SpinnerNumberModel( new Integer(10000), new Integer(0), null, new Integer(1000))); + private JPanel jpMaxMessageTime = new TransparentPanel( new FlowLayout(FlowLayout.LEFT)); - private JButton jbtnConfirm = new JButton(Resources.getString("confirm")); - private JButton jbtnDefault = new JButton(Resources.getString("default")); + private JButton jbtnConfirm + = new JButton(Resources.getString("plugin.mailbox.CONFIRM")); + private JButton jbtnDefault + = new JButton(Resources.getString("plugin.mailbox.DEFAULTS")); + private JPanel jpConfirmDefault = new TransparentPanel(); ConfigurationService config; + public MailboxConfigurationForm() { @@ -208,7 +227,7 @@ public class MailboxConfigurationForm */ public String getTitle() { - return Resources.getString("mailbox"); + return Resources.getString("plugin.mailbox.MAILBOX"); } /** diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java index 7b33402..b53e50c 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java @@ -37,12 +37,14 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel uinLabel = new JLabel(Resources.getString("id")); + private JLabel uinLabel + = new JLabel(Resources.getString("plugin.msnaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel = new TransparentPanel(); @@ -53,7 +55,8 @@ public class FirstWizardPage private JPasswordField passField = new JPasswordField(); private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + new SIPCommCheckBox( + Resources.getString("service.gui.REMEMBER_PASSWORD")); private JPanel mainPanel = new TransparentPanel(); @@ -123,7 +126,7 @@ public class FirstWizardPage uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH); uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("msnUinAndPassword"))); + .getString("plugin.msnaccregwizz.USERNAME_AND_PASSWORD"))); mainPanel.add(uinPassPanel); this.add(mainPanel, BorderLayout.NORTH); @@ -259,7 +262,7 @@ public class FirstWizardPage } /** - * Fills the UIN and Password fields in this panel with the data comming + * Fills the UIN and Password fields in this panel with the data coming * from the given protocolProvider. * * @param protocolProvider The <tt>ProtocolProviderService</tt> to load diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java index 27f977d..8009f14 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java @@ -46,7 +46,8 @@ public class MsnAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer + .setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -79,7 +80,7 @@ public class MsnAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameMsn"); + return Resources.getString("plugin.msnaccregwizz.PROTOCOL_NAME"); } /** @@ -91,7 +92,7 @@ public class MsnAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionMsn"); + return Resources.getString("plugin.msnaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -118,9 +119,10 @@ public class MsnAccountRegistrationWizard { Hashtable summaryTable = new Hashtable(); - summaryTable.put(Resources.getString("id"), registration.getId()); - summaryTable.put(Resources.getString("rememberPassword"), - new Boolean(registration.isRememberPassword())); + summaryTable.put( Resources.getString("plugin.msnaccregwizz.USERNAME"), + registration.getId()); + summaryTable.put( Resources.getString("service.gui.REMEMBER_PASSWORD"), + new Boolean(registration.isRememberPassword())); return summaryTable.entrySet().iterator(); } @@ -203,14 +205,14 @@ public class MsnAccountRegistrationWizard { MsnAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { MsnAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java index a8732de..fae6a07 100644 --- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java +++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java @@ -52,6 +52,6 @@ public class NotificationConfigurationForm */ public String getTitle() { - return Resources.getString("notifications"); + return Resources.getString("service.gui.NOTIFICATIONS"); } }
\ No newline at end of file diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java index 2dc6194..72d93a4 100644 --- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java +++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java @@ -125,7 +125,7 @@ public class NotificationConfigurationPanel // Initializing variable part of the "actions" TitledBorder title1 = BorderFactory.createTitledBorder( - Resources.getString("actions")); + Resources.getString("plugin.notificationconfig.ACTIONS")); actions.setBorder(title1); JPanel activateDescactivatePanel = new TransparentPanel(); @@ -133,16 +133,19 @@ public class NotificationConfigurationPanel layoutADP.setHgap(75); activateDescactivatePanel.setLayout(layoutADP); - activate = new JButton(Resources.getString("activate")); + activate = new JButton(Resources.getString("service.gui.ACTIVATE")); activate.setMinimumSize(new Dimension(150,30)); activate.setPreferredSize(new Dimension(150,30)); activate.addActionListener(this); - desactivate = new JButton(Resources.getString("deactivate")); + desactivate = new JButton( + Resources.getString("service.gui.DEACTIVATE")); desactivate.setMinimumSize(new Dimension(150,30)); desactivate.setPreferredSize(new Dimension(150,30)); desactivate.addActionListener(this); - playSoundCheckBox = - new SIPCommCheckBox(Resources.getString("playsound")); + + playSoundCheckBox = new SIPCommCheckBox( + Resources.getString("plugin.notificationconfig.PLAY_SOUND")); + playSoundCheckBox.addItemListener(this); playSoundButton = new JButton( new ImageIcon(Resources.getImageInBytes( @@ -160,7 +163,10 @@ public class NotificationConfigurationPanel soundFileChooser.setMinimumSize(new Dimension(30,30)); soundFileChooser.setPreferredSize(new Dimension(30,30)); soundFileChooser.addActionListener(this); - programCheckBox = new SIPCommCheckBox(Resources.getString("execprog")); + + programCheckBox = new SIPCommCheckBox( + Resources.getString("plugin.notificationconfig.EXEC_PROG")); + programCheckBox.addItemListener(this); programFileTextField = new JTextField(); programFileTextField.setMinimumSize(new Dimension(250,30)); @@ -172,8 +178,10 @@ public class NotificationConfigurationPanel programFileChooser.setMinimumSize(new Dimension(30,30)); programFileChooser.setPreferredSize(new Dimension(30,30)); programFileChooser.addActionListener(this); - popupCheckBox = - new SIPCommCheckBox(Resources.getString("displaypopup")); + + popupCheckBox = new SIPCommCheckBox( + Resources.getString("plugin.notificationconfig.DISPLAY_POPUP")); + popupCheckBox.addItemListener(this); @@ -293,14 +301,16 @@ public class NotificationConfigurationPanel comboBoxTurnOn.addActionListener(this); comboBoxTurnOff = new JComboBox(textComboBox); comboBoxTurnOff.addActionListener(this); - turnOnAll = new JButton(Resources.getString("turnonall")); + turnOnAll = new JButton( + Resources.getString("plugin.notificationconfig.TURN_ON_ALL")); turnOnAll.addActionListener(this); - turnOffAll = new JButton(Resources.getString("turnoffall")); + turnOffAll = new JButton( + Resources.getString("plugin.notificationconfig.TURN_OFF_ALL")); turnOffAll.addActionListener(this); TitledBorder title2 = BorderFactory.createTitledBorder( - Resources.getString("quickcontrols")); + Resources.getString("plugin.notificationconfig.QUICK_CONTROLS")); quickControl.setLayout(new FlowLayout(FlowLayout.CENTER,2,2)); quickControl.setBorder(title2); quickControl.add(turnOnAll); @@ -330,9 +340,11 @@ public class NotificationConfigurationPanel constraints.weightx = 1.0; constraints.fill = GridBagConstraints.BOTH; - restore = new JButton(Resources.getString("restore")); + restore = new JButton( + Resources.getString("plugin.notificationconfig.RESTORE")); restore.addActionListener(this); - apply = new JButton(Resources.getString("apply")); + apply = new JButton( + Resources.getString("service.gui.APPLY")); apply.addActionListener(this); applyPanel.setLayout(new BorderLayout(5,2)); applyPanel.add(apply, BorderLayout.EAST); @@ -340,7 +352,6 @@ public class NotificationConfigurationPanel gridLayoutGlobal.setConstraints(applyPanel, constraints); this.add(applyPanel); - notificationService = NotificationConfigurationActivator.getNotificationService(); notificationService.addNotificationChangeListener(this); @@ -407,16 +418,19 @@ public class NotificationConfigurationPanel { try { - NotificationsTableEntry tmpNTE = (NotificationsTableEntry) dataVector.elementAt(index); + NotificationsTableEntry tmpNTE + = (NotificationsTableEntry) dataVector.elementAt(index); File file = fileChooserSound.getSelectedFile(); //This is where a real application would open the file. - logger.debug("Opening: " + file.toURI().toURL().toExternalForm()); + logger.debug("Opening: " + + file.toURI().toURL().toExternalForm()); tmpNTE.setSoundFile(file.toURI().toURL().toExternalForm()); tmpNTE.setSound(true); tmpNTE.setModify(true); this.updateTableRow(tmpNTE, index); notificationList.setLine(tmpNTE, index); - soundFileTextField.setText(file.toURI().toURL().toExternalForm()); + soundFileTextField.setText( + file.toURI().toURL().toExternalForm()); } catch (MalformedURLException ex) { diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java index 30ecb87..20af79a 100644 --- a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java +++ b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java @@ -30,21 +30,22 @@ public class ManageButtonsPanel private Logger logger = Logger.getLogger(ManageButtonsPanel.class); private JButton deactivateButton = new JButton( - Resources.getString("deactivate")); + Resources.getString("service.gui.DEACTIVATE")); private JButton activateButton = new JButton( - Resources.getString("activate")); + Resources.getString("service.gui.ACTIVATE")); private JButton uninstallButton = new JButton( - Resources.getString("uninstall")); + Resources.getString("plugin.pluginmanager.UNINSTALL")); private JButton updateButton = new JButton( - Resources.getString("update")); + Resources.getString("plugin.pluginmanager.UPDATE")); - private JButton newButton = new JButton(Resources.getString("new")); + private JButton newButton + = new JButton(Resources.getString("plugin.pluginmanager.NEW")); - private JCheckBox showSysBundlesCheckBox = - new SIPCommCheckBox(Resources.getString("showSystemBundles")); + private JCheckBox showSysBundlesCheckBox = new SIPCommCheckBox( + Resources.getString("plugin.pluginmanager.SHOW_SYSTEM_BUNDLES")); private JPanel buttonsPanel = new TransparentPanel(new GridLayout(0, 1, 8, 8)); diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java index 0b30e6d..d79823c 100644 --- a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java +++ b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java @@ -22,23 +22,27 @@ public class NewBundleDialog extends SIPCommDialog implements ActionListener { - private JButton installButton = new JButton(Resources.getString("install")); + private JButton installButton + = new JButton(Resources.getString("plugin.pluginmanager.INSTALL")); - private JButton cancelButton = new JButton(Resources.getString("cancel")); + private JButton cancelButton + = new JButton(Resources.getString("service.gui.CANCEL")); private JTextField bundlePathField = new JTextField(); - private JLabel bundlePathLabel = new JLabel(Resources.getString("url") + ": "); + private JLabel bundlePathLabel + = new JLabel(Resources.getString("plugin.pluginmanager.URL") + ": "); - private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); + private JPanel buttonsPanel + = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5)); private JPanel mainPanel = new TransparentPanel(new BorderLayout()); - - private JButton fileChooserButton = - new JButton(Resources.getString("chooseFile")); - + + private JButton fileChooserButton = new JButton( + Resources.getString("plugin.pluginmanager.CHOOSE_FILE")); + public NewBundleDialog () { this.mainPanel.setPreferredSize(new Dimension(450, 150)); diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java index 19b4544..33360cb 100644 --- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java +++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java @@ -52,7 +52,7 @@ public class PluginListCellRenderer extends JPanel private JLabel iconLabel = new JLabel(); private JLabel systemLabel - = new JLabel("( " + Resources.getString("system") + " )"); + = new JLabel("( " + Resources.getString("plugin.pluginmanager.SYSTEM") + " )"); private boolean isSelected = false; diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java index 7265400..e13880e 100644 --- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java +++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java @@ -26,7 +26,7 @@ public class PluginManagerConfigForm */ public String getTitle() { - return Resources.getString("plugins"); + return Resources.getString("plugin.pluginmanager.PLUGINS"); } /** diff --git a/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java b/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java index f02b6ac..2895297 100644 --- a/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java +++ b/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java @@ -19,7 +19,7 @@ import net.sf.profiler4j.console.*; public class SettingsWindowMenuEntry implements PluginComponent
{
- private static final String PROFILER_NAME = "profiler";
+ private static final String PROFILER_NAME = "plugin.profiler.PLUGIN_NAME";
private JMenuItem settingsMenuEntry;
private Container container;
@@ -33,7 +33,7 @@ public class SettingsWindowMenuEntry implements PluginComponent Prefs prefs = new Prefs();
System.setProperty("swing.aatext",
- String.valueOf(prefs.isAntialiasing()));
+ String.valueOf(prefs.isAntialiasing()));
final Console app = new Console(prefs);
app.connect();
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java index b5a6288..6814fc5 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java @@ -33,22 +33,22 @@ public class FirstWizardPage private JPanel labelsPanel = new TransparentPanel(); private JLabel infoTitle= new JLabel( - Resources.getString("rssAccountInfoTitle")); + Resources.getString("plugin.rssaccregwizz.ACCOUNT_INFO_TITLE")); private JPanel infoTitlePanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER)); - private JLabel existingAccountLabel = - new JLabel(Resources.getString("rssAccountExist")); + private JLabel existingAccountLabel = new JLabel( + Resources.getString("plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS")); private JPanel existingAccountPanel = new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); private JTextArea accountInfoArea = new JTextArea( - Resources.getString("rssAccountInfo")); + Resources.getString("plugin.rssaccregwizz.ACCOUNT_INFO")); - private JLabel accountInfoAttentionArea - = new JLabel(Resources.getString("rssAccountAttention")); + private JLabel accountInfoAttentionArea = new JLabel( + Resources.getString("plugin.rssaccregwizz.ACCOUNT_ATTENTION")); private JPanel accountInfoAttentionPanel = new TransparentPanel(new FlowLayout(FlowLayout.LEFT)); diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java index 36511eb..7861842 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java @@ -55,7 +55,7 @@ public class RssAccountRegistrationWizard this.wizardContainer = wizardContainer; this.wizardContainer - .setFinishButtonText(Resources.getString("activate")); + .setFinishButtonText(Resources.getString("service.gui.ACTIVATE")); } /** @@ -86,7 +86,7 @@ public class RssAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameRss"); + return Resources.getString("plugin.rssaccregwizz.PROTOCOL_NAME"); } /** @@ -96,7 +96,7 @@ public class RssAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionRss"); + return Resources.getString("plugin.rssaccregwizz.PROTICOL_DESCRIPTION"); } /** @@ -186,14 +186,14 @@ public class RssAccountRegistrationWizard { RssAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { RssAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java index 3084289..921a0c5 100644 --- a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java +++ b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java @@ -42,7 +42,7 @@ public class InitialAccountRegistrationFrame private JPanel accountsPanel = new JPanel(new GridLayout(0, 2, 10, 10)); - private JButton signinButton = new JButton(Resources.getString("signin")); + private JButton signinButton = new JButton(Resources.getString("service.gui.SIGN_IN")); private Collection registrationForms = new Vector(); @@ -56,11 +56,12 @@ public class InitialAccountRegistrationFrame MainPanel mainPanel = new MainPanel(new BorderLayout(5, 5)); JPanel messageAreaPanel = new JPanel(new FlowLayout(FlowLayout.CENTER)); JTextArea messageArea = - new JTextArea(Resources.getString("initialAccountRegistration")); + new JTextArea(Resources.getString("plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION")); JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - JButton cancelButton = new JButton(Resources.getString("cancel")); + JButton cancelButton + = new JButton(Resources.getString("service.gui.CANCEL")); - this.setTitle(Resources.getString("signin")); + this.setTitle(Resources.getString("service.gui.SIGN_IN")); mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20)); @@ -172,7 +173,8 @@ public class InitialAccountRegistrationFrame { private JLabel protocolLabel = new JLabel(); - private JLabel usernameLabel = new JLabel("Login"); + private JLabel usernameLabel + = new JLabel(Resources.getString("service.gui.LOGIN")); private JLabel passwordLabel = new JLabel("Password"); @@ -198,12 +200,12 @@ public class InitialAccountRegistrationFrame private JLabel signupLabel = new JLabel("<html><a href=''>" - + Resources.getString("signup") + + Resources.getString("plugin.simpleaccregwizz.SIGNUP") + "</a></html>", JLabel.RIGHT); private JLabel specialSignupLabel = new JLabel("<html><a href=''>" - + Resources.getString("specialSignup") + + Resources.getString("plugin.simpleaccregwizz.SPECIAL_SIGNUP") + "</a></html>", JLabel.RIGHT); private AccountRegistrationWizard wizard; @@ -362,7 +364,7 @@ public class InitialAccountRegistrationFrame super.paintComponent(g2d); g2d.setColor(new Color( - Resources.getColor("desktopBackgroundColor"))); + Resources.getColor("service.gui.DESKTOP_BACKGROUND"))); // paint the background with the chosen color g2d.fillRoundRect(0, 0, getWidth(), getHeight(), 15, 15); @@ -449,7 +451,7 @@ public class InitialAccountRegistrationFrame } /** - * Handles the event triggered by the "Signin" button. + * Handles the event triggered by the "service.gui.SIGN_IN" button. */ private class SigninActionListener implements ActionListener { @@ -501,7 +503,7 @@ public class InitialAccountRegistrationFrame super.paintComponent(g2d); g2d.setColor(new Color( - Resources.getColor("accountRegistrationBackground"))); + Resources.getColor("plugin.simpleaccreg.ACCOUNT_REGISTRATION_BACKGROUND"))); // paint the background with the chosen color g2d.fillRoundRect(10, 10, getWidth() - 20, getHeight() - 20, 15, 15); diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java index 8e24b5f..679d1da 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java @@ -29,7 +29,8 @@ public class FirstWizardPage { public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier"; - public static final String USER_NAME_EXAMPLE = "Ex: john@voiphone.net or simply \"john\" for no server"; + public static final String USER_NAME_EXAMPLE + = "Ex: john@voiphone.net or simply \"john\" for no server"; private JPanel firstTabPanel = new TransparentPanel(new BorderLayout()); @@ -39,48 +40,58 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel uinLabel = new JLabel(Resources.getString("id")); + private JLabel uinLabel + = new JLabel(Resources.getString("plugin.sipaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); private JPanel emptyPanel = new TransparentPanel(); private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JTextField uinField = new JTextField(); private JPasswordField passField = new JPasswordField(); private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + new SIPCommCheckBox( + Resources.getString("service.gui.REMEMBER_PASSWORD")); - private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10)); + private JPanel advancedOpPanel + = new TransparentPanel(new BorderLayout(10, 10)); - private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); + private JPanel labelsAdvOpPanel + = new TransparentPanel(new GridLayout(0, 1, 10, 10)); - private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); + private JPanel valuesAdvOpPanel + = new TransparentPanel(new GridLayout(0, 1, 10, 10)); private JCheckBox enableAdvOpButton = - new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false); + new SIPCommCheckBox(Resources.getString( + "plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), false); - private JCheckBox enableDefaultEncryption = - new JCheckBox(Resources.getString("enableDefaultEncryption"), false); + private JLabel serverLabel + = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR")); - private JLabel serverLabel = new JLabel(Resources.getString("registrar")); + private JCheckBox enableDefaultEncryption = + new JCheckBox(Resources.getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), false); - private JLabel proxyLabel = new JLabel(Resources.getString("proxy")); + private JLabel proxyLabel + = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY")); private JLabel serverPortLabel = - new JLabel(Resources.getString("serverPort")); + new JLabel(Resources.getString("plugin.sipaccregwizz.SERVER_PORT")); private JLabel proxyPortLabel = - new JLabel(Resources.getString("proxyPort")); + new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY_PORT")); private JLabel transportLabel = - new JLabel(Resources.getString("preferredTransport")); + new JLabel(Resources.getString( + "plugin.sipaccregwizz.PREFERRED_TRANSPORT")); private JTextField serverField = new JTextField(); @@ -104,17 +115,18 @@ public class FirstWizardPage private JPanel valuesPresOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10)); - private JCheckBox enablePresOpButton = - new SIPCommCheckBox(Resources.getString("enablePresence"), true); + private JCheckBox enablePresOpButton = new JCheckBox( + Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), + true); - private JCheckBox forceP2PPresOpButton = - new SIPCommCheckBox(Resources.getString("forceP2PPresence"), true); + private JCheckBox forceP2PPresOpButton = new JCheckBox( + Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), true); - private JLabel pollPeriodLabel = - new JLabel(Resources.getString("offlineContactPollingPeriod")); + private JLabel pollPeriodLabel = new JLabel( + Resources.getString("plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD")); - private JLabel subscribeExpiresLabel = - new JLabel(Resources.getString("subscriptionExpiration")); + private JLabel subscribeExpiresLabel = new JLabel( + Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION")); private JTextField pollPeriodField = new JTextField(SIPAccountRegistration.DEFAULT_POLL_PERIOD); @@ -128,14 +140,14 @@ public class FirstWizardPage private JPanel keepAliveValues = new TransparentPanel(new GridLayout(0, 1, 5, 5)); - private JLabel keepAliveMethodLabel - = new JLabel(Resources.getString("keepAliveMethod")); + private JLabel keepAliveMethodLabel = new JLabel( + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD")); - private JLabel keepAliveIntervalLabel - = new JLabel(Resources.getString("keepAliveInterval")); + private JLabel keepAliveIntervalLabel = new JLabel( + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL")); - private JLabel keepAliveIntervalExampleLabel - = new JLabel(Resources.getString("keepAliveIntervalEx")); + private JLabel keepAliveIntervalExampleLabel = new JLabel( + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO")); private JComboBox keepAliveMethodBox = new JComboBox(new Object [] @@ -215,11 +227,11 @@ public class FirstWizardPage uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH); uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("sipUinAndPassword"))); + .getString("plugin.sipaccregwizz.USERNAME_AND_PASSWORD"))); firstTabPanel.add(uinPassPanel, BorderLayout.NORTH); - tabbedPane.addTab( Resources.getString("summary"), + tabbedPane.addTab( Resources.getString("service.gui.SUMMARY"), firstTabPanel); serverField.setEnabled(false); @@ -278,7 +290,7 @@ public class FirstWizardPage advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER); advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("advancedOptions"))); + .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS"))); advancedPanel.add(advancedOpPanel); @@ -310,7 +322,7 @@ public class FirstWizardPage presenceOpPanel.add(valuesPresOpPanel, BorderLayout.CENTER); presenceOpPanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("presenceOptions"))); + Resources.getString("plugin.sipaccregwizz.PRESENCE_OPTIONS"))); advancedPanel.add(presenceOpPanel); @@ -343,11 +355,13 @@ public class FirstWizardPage keepAlivePanel.add(keepAliveValues, BorderLayout.CENTER); keepAlivePanel.setBorder(BorderFactory.createTitledBorder( - Resources.getString("keepAlive"))); + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE"))); advancedPanel.add(keepAlivePanel); - tabbedPane.addTab("Advanced", advancedPanel); + tabbedPane.addTab( + Resources.getString("service.gui.ADVANCED"), + advancedPanel); this.add(tabbedPane, BorderLayout.NORTH); } diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java index e306350..53ec4cc 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java @@ -51,7 +51,8 @@ public class SIPAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText( + Resources.getString("service.gui.SIGN_IN")); } /** @@ -81,7 +82,7 @@ public class SIPAccountRegistrationWizard * @return String */ public String getProtocolName() { - return Resources.getString("protocolNameSip"); + return Resources.getString("plugin.sipaccregwizz.PROTOCOL_NAME"); } /** @@ -90,7 +91,7 @@ public class SIPAccountRegistrationWizard * @return String */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionSip"); + return Resources.getString("plugin.sipaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -118,55 +119,84 @@ public class SIPAccountRegistrationWizard String rememberPswdString; if(rememberPswd) - rememberPswdString = Resources.getString("yes"); + rememberPswdString = Resources.getString("service.gui.YES"); else - rememberPswdString = Resources.getString("no"); - - summaryTable.put(Resources.getString("id"), - registration.getId()); - summaryTable.put(Resources.getString("rememberPassword"), - rememberPswdString); - summaryTable.put(Resources.getString("registrar"), - registration.getServerAddress()); - summaryTable.put(Resources.getString("serverPort"), - registration.getServerPort()); - summaryTable.put(Resources.getString("proxy"), - registration.getProxy()); - summaryTable.put(Resources.getString("proxyPort"), - registration.getProxyPort()); - summaryTable.put(Resources.getString("preferredTransport"), - registration.getPreferredTransport()); - - if (registration.isEnablePresence()) { - summaryTable.put(Resources.getString("enablePresence"), - Resources.getString("yes")); - } else { - summaryTable.put(Resources.getString("enablePresence"), - Resources.getString("no")); + rememberPswdString = Resources.getString("service.gui.NO"); + + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.USERNAME"), + registration.getId()); + summaryTable.put( + Resources.getString("service.gui.REMEMBER_PASSWORD"), + rememberPswdString); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.REGISTRAR"), + registration.getServerAddress()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.SERVER_PORT"), + registration.getServerPort()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.PROXY"), + registration.getProxy()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.PROXY_PORT"), + registration.getProxyPort()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.PREFERRED_TRANSPORT"), + registration.getPreferredTransport()); + + if (registration.isEnablePresence()) + { + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), + Resources.getString("service.gui.YES")); + } + else + { + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"), + Resources.getString("service.gui.NO")); } - if (registration.isForceP2PMode()) { - summaryTable.put(Resources.getString("forceP2PPresence"), - Resources.getString("yes")); - } else { - summaryTable.put(Resources.getString("forceP2PPresence"), - Resources.getString("no")); + + if (registration.isForceP2PMode()) + { + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), + Resources.getString("service.gui.YES")); } - if (registration.isDefaultEncryption()) { - summaryTable.put(Resources.getString("enableDefaultEncryption"), - Resources.getString("yes")); - } else { - summaryTable.put(Resources.getString("enableDefaultEncryption"), - Resources.getString("no")); + else + { + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), + Resources.getString("service.gui.NO")); + } + + if (registration.isDefaultEncryption()) + { + summaryTable.put(Resources.getString( + "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), + Resources.getString("yes")); + } + else + { + summaryTable.put(Resources.getString( + "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), + Resources.getString("no")); } - summaryTable.put(Resources.getString("offlineContactPollingPeriod"), + + summaryTable.put(Resources.getString( + "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"), registration.getPollingPeriod()); - summaryTable.put(Resources.getString("subscriptionExpiration"), + summaryTable.put(Resources.getString( + "plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"), registration.getSubscriptionExpiration()); - summaryTable.put(Resources.getString("keepAliveMethod"), - registration.getKeepAliveMethod()); - summaryTable.put(Resources.getString("keepAliveInterval"), - registration.getKeepAliveInterval()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"), + registration.getKeepAliveMethod()); + summaryTable.put( + Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"), + registration.getKeepAliveInterval()); return summaryTable.entrySet().iterator(); } @@ -254,9 +284,9 @@ public class SIPAccountRegistrationWizard accountProperties.put(ProtocolProviderFactory.FORCE_P2P_MODE, Boolean.toString(registration.isForceP2PMode())); - + accountProperties.put(ProtocolProviderFactory.DEFAULT_ENCRYPTION, - Boolean.toString(registration.isDefaultEncryption())); + Boolean.toString(registration.isDefaultEncryption())); accountProperties.put(ProtocolProviderFactory.POLLING_PERIOD, registration.getPollingPeriod()); @@ -296,14 +326,14 @@ public class SIPAccountRegistrationWizard { SIPAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) { SIPAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java index b934f32..82cc6ba 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java @@ -41,16 +41,17 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel accountID = new JLabel(Resources.getString("accountID")); + private JLabel accountID + = new JLabel(Resources.getString("plugin.sshaccregwizz.USERNAME")); - private JLabel identityFile = new JLabel(Resources.getString( - "identityFile")); + private JLabel identityFile + = new JLabel(Resources.getString("plugin.sshaccregwizz.IDENTITY_FILE")); - private JLabel knownHostsFile = new JLabel(Resources.getString( - "knownHosts")); + private JLabel knownHostsFile + = new JLabel(Resources.getString("plugin.sshaccregwizz.KNOWN_HOSTS")); private JLabel existingAccountLabel - = new JLabel(Resources.getString("existingAccount")); + = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel1 = new TransparentPanel(); @@ -72,17 +73,21 @@ public class FirstWizardPage private JTextField accountIDField = new JTextField(); - private JTextField identityFileField = new JTextField("Optional"); + private JTextField identityFileField = new JTextField( + Resources.getString("plugin.sshaccregwizz.OPTIONAL")); - private JButton identityFileButton = new JButton("Browse"); + private JButton identityFileButton = new JButton( + Resources.getString("service.gui.BROWSE")); private JFileChooser identityFileChooser = new JFileChooser(); private JPanel identityFilePanel = new TransparentPanel(); - private JTextField knownHostsFileField = new JTextField("Optional"); + private JTextField knownHostsFileField = new JTextField( + Resources.getString("plugin.sshaccregwizz.KNOWN_HOSTS")); - private JButton knownHostsFileButton = new JButton("Browse"); + private JButton knownHostsFileButton = new JButton( + Resources.getString("service.gui.BROWSE")); private JFileChooser knownHostsFileChooser = new JFileChooser(); @@ -236,7 +241,7 @@ public class FirstWizardPage accountPanel.setBorder(BorderFactory .createTitledBorder(Resources.getString( - "accountDetails"))); + "plugin.sshaccregwizz.ACCOUNT_DETAILS"))); this.add(accountPanel, BorderLayout.NORTH); } diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java index b12ccc4..b2519bd 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java @@ -63,7 +63,8 @@ public class SSHAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer.setFinishButtonText( + Resources.getString("service.gui.SIGN_IN")); } /** @@ -92,7 +93,7 @@ public class SSHAccountRegistrationWizard * @return String */ public String getProtocolName() { - return Resources.getString("protocolNameSsh"); + return Resources.getString("plugin.sshaccregwizz.PROTOCOL_NAME"); } /** @@ -101,7 +102,7 @@ public class SSHAccountRegistrationWizard * @return String */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionSsh"); + return Resources.getString("plugin.sshaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -208,14 +209,14 @@ public class SSHAccountRegistrationWizard { SSHAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) { SSHAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java index cb9b86e..d3ff1a2 100644 --- a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java +++ b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java @@ -81,7 +81,7 @@ public class UpdateCheckActivator } }; dialog.setTitle( - getResources().getI18NString("dialogTitle")); + getResources().getI18NString("plugin.updatechecker.DIALOG_TITLE")); JEditorPane contentMessage = new JEditorPane(); contentMessage.setContentType("text/html"); @@ -89,15 +89,17 @@ public class UpdateCheckActivator contentMessage.setEditable(false); String dialogMsg = - getResources().getI18NString("dialogMessage1", - new String[]{getResources().getSettingsString("applicationName")}); + getResources().getI18NString("plugin.updatechecker.DIALOG_MESSAGE", + new String[]{getResources() + .getSettingsString("service.gui.APPLICATION_NAME")}); if(lastVersion != null) dialogMsg += getResources().getI18NString( - "dialogMessage2", + "plugin.updatechecker.DIALOG_MESSAGE_2", new String[]{ - getResources().getSettingsString("applicationName"), + getResources().getSettingsString( + "service.gui.APPLICATION_NAME"), lastVersion}); contentMessage.setText(dialogMsg); @@ -108,8 +110,8 @@ public class UpdateCheckActivator JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 10, 10)); - JButton closeButton - = new JButton( getResources().getI18NString("buttonClose")); + JButton closeButton = new JButton( + getResources().getI18NString("plugin.updatechecker.BUTTON_CLOSE")); closeButton.addActionListener(new ActionListener() { @@ -121,8 +123,8 @@ public class UpdateCheckActivator if(downloadLink != null) { - JButton downloadButton = - new JButton(getResources().getI18NString("buttonDownload")); + JButton downloadButton = new JButton(getResources().getI18NString( + "plugin.updatechecker.BUTTON_DOWNLOAD")); downloadButton.addActionListener(new ActionListener() { diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java index fd051bc..55a0ca5 100644 --- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java +++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java @@ -25,7 +25,7 @@ public class WhiteboardMenuItem ActionListener { private JMenu whiteboardMenu - = new JMenu(Resources.getString("whiteboardMenuItemText")); + = new JMenu(Resources.getString("plugin.whiteboard.MENU_ITEM")); /** * The current meta contact @@ -45,7 +45,8 @@ public class WhiteboardMenuItem public WhiteboardMenuItem (WhiteboardSessionManager session) { this.session = session; - this.whiteboardMenu.setIcon (Resources.getImage ("mpenIcon")); + this.whiteboardMenu.setIcon ( + Resources.getImage ("plugin.whiteboard.MPEN_ICON")); } /** @@ -81,7 +82,7 @@ public class WhiteboardMenuItem { contactItem.setEnabled(false); contactItem.setToolTipText( - Resources.getString("whiteboardMenuItemNotSupportedTooltip")); + Resources.getString("plugin.whiteboard.NOT_SUPPORTED")); } this.whiteboardMenu.add(contactItem); diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java index 43c1f19..51cbebb 100644 --- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java +++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java @@ -566,7 +566,7 @@ public class WhiteboardSessionManager .showMessagePopupDialog( Resources.getString("failedToJoinWhiteboard", new String[] {whiteboard.getWhiteboardID()}), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); logger.error("Failed to join whiteboard: " @@ -631,7 +631,7 @@ public class WhiteboardSessionManager Resources.getString("failedToJoinWhiteboard", new String[]{whiteboardSession.getWhiteboardID()}) + evt.getReason(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } else if (evt.getEventType().equals( diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java index 22f414d..471c197 100644 --- a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java +++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java @@ -31,7 +31,7 @@ public class InvitationReceivedDialog private JPanel reasonPanel = new TransparentPanel(new BorderLayout()); private JLabel reasonLabel = new JLabel( - Resources.getString("reason") + ": "); + Resources.getString("service.gui.REASON") + ": "); private JTextField reasonField = new JTextField(); @@ -39,11 +39,12 @@ public class InvitationReceivedDialog private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT)); - private JButton acceptButton = new JButton(Resources.getString("accept")); + private JButton acceptButton + = new JButton(Resources.getString("service.gui.ACCEPT")); - private JButton rejectButton = new JButton(Resources.getString("reject")); + private JButton rejectButton = new JButton(Resources.getString("service.gui.REJECT")); - private JButton ignoreButton = new JButton(Resources.getString("ignore")); + private JButton ignoreButton = new JButton(Resources.getString("service.gui.IGNORE")); private JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10)); @@ -52,7 +53,7 @@ public class InvitationReceivedDialog private JLabel iconLabel = new JLabel(Resources.getImage("inviteIcon")); private String title - = Resources.getString("invitationReceived"); + = Resources.getString("service.gui.INVITATION_RECEIVED"); /** * The <tt>ChatRoomInvitation</tt> for which this dialog is. @@ -97,7 +98,7 @@ public class InvitationReceivedDialog this.mainPanel.setPreferredSize(new Dimension(400, 230)); infoTextArea.setText( - Resources.getString("invitationReceivedFormInfo", + Resources.getString("service.gui.INVITATION_RECEIVED_MSG", new String[] { invitation.getInviter(), invitation.getTargetWhiteboard() .getWhiteboardID()})); @@ -107,7 +108,7 @@ public class InvitationReceivedDialog invitationReasonTextArea.setText(invitation.getReason()); invitationReasonTextArea.setBorder( BorderFactory.createTitledBorder( - Resources.getString("invitation"))); + Resources.getString("service.gui.INVITATION"))); this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER); } @@ -137,8 +138,8 @@ public class InvitationReceivedDialog this.getRootPane().setDefaultButton(acceptButton); this.acceptButton.setMnemonic(Resources.getMnemonic("accept")); - this.rejectButton.setMnemonic(Resources.getMnemonic("reject")); - this.ignoreButton.setMnemonic(Resources.getMnemonic("ignore")); + this.rejectButton.setMnemonic(Resources.getMnemonic("service.gui.REJECT")); + this.ignoreButton.setMnemonic(Resources.getMnemonic("service.gui.IGNORE")); this.mainPanel.setBorder( BorderFactory.createEmptyBorder(15, 15, 15, 15)); diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java index 88fe32e..c08c583 100644 --- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java +++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java @@ -325,7 +325,8 @@ public class WhiteboardFrame */ private void initIcons() { - setIconImage(Resources.getImage("sc_logo16x16").getImage()); + setIconImage( + Resources.getImage("service.gui.SIP_COMMUNICATOR_LOGO").getImage()); selectionButton .setIcon(Resources.getImage("plugin.whiteboard.SELECT_ICON")); @@ -829,7 +830,7 @@ public class WhiteboardFrame leftPanel = new TransparentPanel(new BorderLayout()); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - setTitle(Resources.getString("whiteboardTitle")); + setTitle(Resources.getString("plugin.whiteboard.TITLE")); if (session != null) { @@ -841,16 +842,16 @@ public class WhiteboardFrame } } - jLabelStatus.setText(Resources.getString("draw")); + jLabelStatus.setText(Resources.getString("plugin.whiteboard.DRAW")); jLabelStatus.setBorder(javax.swing.BorderFactory .createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); getContentPane().add(jLabelStatus, java.awt.BorderLayout.SOUTH); - jButtonNew.setToolTipText(Resources.getString("new")); + jButtonNew.setToolTipText(Resources.getString("service.gui.NEW")); jButtonNew.setEnabled(false); jToolBar1.add(jButtonNew); - jButtonSave.setToolTipText(Resources.getString("save")); + jButtonSave.setToolTipText(Resources.getString("service.gui.SAVE")); jButtonSave.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -861,15 +862,15 @@ public class WhiteboardFrame jToolBar1.add(jButtonSave); - jButtonOpen.setToolTipText(Resources.getString("open")); + jButtonOpen.setToolTipText(Resources.getString("plugin.whiteboard.OPEN")); jButtonOpen.setEnabled(false); jToolBar1.add(jButtonOpen); - jButtonCopy.setToolTipText(Resources.getString("copy")); + jButtonCopy.setToolTipText(Resources.getString("service.gui.COPY")); jButtonCopy.setEnabled(false); jToolBar1.add(jButtonCopy); - jButtonPaste.setToolTipText(Resources.getString("paste")); + jButtonPaste.setToolTipText(Resources.getString("service.gui.PASTE")); jButtonPaste.setEnabled(false); jToolBar1.add(jButtonPaste); @@ -882,7 +883,7 @@ public class WhiteboardFrame toolBar.setBorder(BorderFactory.createEmptyBorder(5, 8, 5, 8)); buttonGroup.add(selectionButton); - selectionButton.setToolTipText(Resources.getString("select")); + selectionButton.setToolTipText(Resources.getString("plugin.whiteboard.SELECT")); selectionButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -894,7 +895,7 @@ public class WhiteboardFrame toolBar.add(selectionButton); buttonGroup.add(modifButton); - modifButton.setToolTipText(Resources.getString("modification")); + modifButton.setToolTipText(Resources.getString("plugin.whiteboard.MODIFICATION")); modifButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -906,7 +907,7 @@ public class WhiteboardFrame toolBar.add(modifButton); buttonGroup.add(penButton); - penButton.setToolTipText(Resources.getString("pen")); + penButton.setToolTipText(Resources.getString("plugin.whiteboard.PEN")); penButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -918,7 +919,7 @@ public class WhiteboardFrame toolBar.add(penButton); buttonGroup.add(textButton); - textButton.setToolTipText(Resources.getString("text")); + textButton.setToolTipText(Resources.getString("plugin.whiteboard.TEXT")); textButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -930,7 +931,7 @@ public class WhiteboardFrame toolBar.add(textButton); buttonGroup.add(lineButton); - lineButton.setToolTipText(Resources.getString("line")); + lineButton.setToolTipText(Resources.getString("plugin.whiteboard.LINE")); lineButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -942,7 +943,7 @@ public class WhiteboardFrame toolBar.add(lineButton); buttonGroup.add(polylineButton); - polylineButton.setToolTipText(Resources.getString("polyline")); + polylineButton.setToolTipText(Resources.getString("plugin.whiteboard.POLYLINE")); polylineButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -954,7 +955,7 @@ public class WhiteboardFrame toolBar.add(polylineButton); buttonGroup.add(rectangleButton); - rectangleButton.setToolTipText(Resources.getString("rectangle")); + rectangleButton.setToolTipText(Resources.getString("plugin.whiteboard.RECTANGLE")); rectangleButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -966,7 +967,7 @@ public class WhiteboardFrame toolBar.add(rectangleButton); buttonGroup.add(fillRectangleButton); - fillRectangleButton.setToolTipText(Resources.getString("fillRectangle")); + fillRectangleButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLED_RECTANGLE")); fillRectangleButton .addActionListener(new java.awt.event.ActionListener() { @@ -979,7 +980,7 @@ public class WhiteboardFrame toolBar.add(fillRectangleButton); buttonGroup.add(imageButton); - imageButton.setToolTipText(Resources.getString("image")); + imageButton.setToolTipText(Resources.getString("plugin.whiteboard.IMAGE")); imageButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -991,7 +992,7 @@ public class WhiteboardFrame toolBar.add(imageButton); buttonGroup.add(polygonButton); - polygonButton.setToolTipText(Resources.getString("polygon")); + polygonButton.setToolTipText(Resources.getString("plugin.whiteboard.POLYGON")); polygonButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1003,7 +1004,7 @@ public class WhiteboardFrame toolBar.add(polygonButton); buttonGroup.add(fillPolygonButton); - fillPolygonButton.setToolTipText(Resources.getString("fillPolygon")); + fillPolygonButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLEDPOLYGON")); fillPolygonButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1015,7 +1016,7 @@ public class WhiteboardFrame toolBar.add(fillPolygonButton); buttonGroup.add(circleButton); - circleButton.setToolTipText(Resources.getString("circle")); + circleButton.setToolTipText(Resources.getString("plugin.whiteboard.CIRCLE")); circleButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1027,7 +1028,7 @@ public class WhiteboardFrame toolBar.add(circleButton); buttonGroup.add(fillCircleButton); - fillCircleButton.setToolTipText(Resources.getString("fillCircle")); + fillCircleButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLED_CIRCLE")); fillCircleButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1038,7 +1039,7 @@ public class WhiteboardFrame toolBar.add(fillCircleButton); - colorChooserButton.setToolTipText(Resources.getString("color")); + colorChooserButton.setToolTipText(Resources.getString("plugin.whiteboard.COLOR")); colorChooserButton .addActionListener(new java.awt.event.ActionListener() { @@ -1059,7 +1060,7 @@ public class WhiteboardFrame jPanel2.setLayout(new GridBagLayout()); - jLabelThickness.setText(Resources.getString("thickness")); + jLabelThickness.setText(Resources.getString("plugin.whiteboard.THICKNESS")); jPanel2.add(jLabelThickness); @@ -1080,9 +1081,9 @@ public class WhiteboardFrame getContentPane().add(leftPanel, BorderLayout.WEST); - fileMenu.setText(Resources.getString("file")); + fileMenu.setText(Resources.getString("service.gui.FILE")); - newMenuItem.setText(Resources.getString("new")); + newMenuItem.setText(Resources.getString("service.gui.NEW")); newMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1102,19 +1103,19 @@ public class WhiteboardFrame }); fileMenu.add(newMenuItem); - openMenuItem.setText(Resources.getString("open")); + openMenuItem.setText(Resources.getString("plugin.whiteboard.OPEN")); openMenuItem.setEnabled(false); fileMenu.add(openMenuItem); - saveMenuItem.setText(Resources.getString("save")); + saveMenuItem.setText(Resources.getString("service.gui.SAVE")); saveMenuItem.setEnabled(false); fileMenu.add(saveMenuItem); - printMenuItem.setText(Resources.getString("print")); + printMenuItem.setText(Resources.getString("service.gui.PRINT")); printMenuItem.setEnabled(false); fileMenu.add(printMenuItem); - exitMenuItem.setText(Resources.getString("exit")); + exitMenuItem.setText(Resources.getString("service.gui.EXIT")); exitMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1126,8 +1127,8 @@ public class WhiteboardFrame menuBar.add(fileMenu); - editMenu.setText(Resources.getString("edit")); - gridMenuItem.setText(Resources.getString("grid")); + editMenu.setText(Resources.getString("service.gui.EDIT")); + gridMenuItem.setText(Resources.getString("plugin.whiteboard.GRID")); gridMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1138,7 +1139,7 @@ public class WhiteboardFrame editMenu.add(gridMenuItem); - deselectMenuItem.setText(Resources.getString("deselect")); + deselectMenuItem.setText(Resources.getString("plugin.whiteboard.DESELECT")); deselectMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1149,17 +1150,17 @@ public class WhiteboardFrame editMenu.add(deselectMenuItem); - copyMenuItem.setText(Resources.getString("copy")); + copyMenuItem.setText(Resources.getString("service.gui.COPY")); copyMenuItem.setEnabled(false); editMenu.add(copyMenuItem); - pasteMenuItem.setText(Resources.getString("paste")); + pasteMenuItem.setText(Resources.getString("service.gui.PASTE")); pasteMenuItem.setEnabled(false); editMenu.add(pasteMenuItem); deleteMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_DELETE, 0)); - deleteMenuItem.setText(Resources.getString("delete")); + deleteMenuItem.setText(Resources.getString("plugin.whiteboard.DELETE")); deleteMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) @@ -1170,18 +1171,18 @@ public class WhiteboardFrame editMenu.add(deleteMenuItem); - propertiesMenuItem.setText(Resources.getString("properties")); + propertiesMenuItem.setText(Resources.getString("plugin.whiteboard.PROPERTIES")); propertiesMenuItem.setEnabled(false); editMenu.add(propertiesMenuItem); menuBar.add(editMenu); - helpMenu.setText(Resources.getString("help")); + helpMenu.setText(Resources.getString("service.gui.HELP")); helpMenu.setEnabled(false); - helpMenuItem.setText(Resources.getString("help")); + helpMenuItem.setText(Resources.getString("service.gui.HELP")); helpMenu.add(helpMenuItem); - aboutMenuItem.setText(Resources.getString("about")); + aboutMenuItem.setText(Resources.getString("service.gui.ABOUT")); helpMenu.add(aboutMenuItem); menuBar.add(helpMenu); @@ -2130,8 +2131,8 @@ public class WhiteboardFrame String t = (String) JOptionPane.showInputDialog(this, - "Please enter your text", "Text", JOptionPane.QUESTION_MESSAGE, - null, null, "text"); + "Please enter your text", "plugin.whiteboard.TEXT", JOptionPane.QUESTION_MESSAGE, + null, null, "plugin.whiteboard.TEXT"); if (t != null && t.length() > 0) { diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java index 6361527..a973db8 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java @@ -39,12 +39,14 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel uinLabel = new JLabel(Resources.getString("id")); + private JLabel uinLabel = new JLabel( + Resources.getString("plugin.yahooaccregwizz.USERNAME")); - private JLabel passLabel = new JLabel(Resources.getString("password")); + private JLabel passLabel + = new JLabel(Resources.getString("service.gui.PASSWORD")); private JLabel existingAccountLabel = - new JLabel(Resources.getString("existingAccount")); + new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel = new TransparentPanel(); @@ -55,7 +57,8 @@ public class FirstWizardPage private JPasswordField passField = new JPasswordField(); private JCheckBox rememberPassBox = - new SIPCommCheckBox(Resources.getString("rememberPassword")); + new SIPCommCheckBox( + Resources.getString("service.gui.REMEMBER_PASSWORD")); private JPanel mainPanel = new TransparentPanel(); @@ -125,7 +128,7 @@ public class FirstWizardPage uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH); uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources - .getString("yahooUinAndPassword"))); + .getString("plugin.yahooaccregwizz.USERID_AND_PASSWORD"))); mainPanel.add(uinPassPanel); this.add(mainPanel, BorderLayout.NORTH); diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java index 1a9937a..8873294 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java @@ -47,7 +47,8 @@ public class YahooAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer + .setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -80,7 +81,7 @@ public class YahooAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameYahoo"); + return Resources.getString("plugin.yahooaccregwizz.PROTOCOL_NAME"); } /** @@ -92,7 +93,8 @@ public class YahooAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionYahoo"); + return Resources + .getString("plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -119,9 +121,12 @@ public class YahooAccountRegistrationWizard { Hashtable summaryTable = new Hashtable(); - summaryTable.put(Resources.getString("id"), registration.getUin()); - summaryTable.put( Resources.getString("rememberPassword"), - new Boolean(registration.isRememberPassword())); + summaryTable.put( + Resources.getString("plugin.yahooaccregwizz.USERNAME"), + registration.getUin()); + summaryTable.put( + Resources.getString("service.gui.REMEMBER_PASSWORD"), + new Boolean(registration.isRememberPassword())); return summaryTable.entrySet().iterator(); } @@ -201,14 +206,14 @@ public class YahooAccountRegistrationWizard { YahooAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException e) { YahooAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(e.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java index 0a86fc4..a68c329 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java @@ -36,15 +36,19 @@ public class FirstWizardPage private JPanel valuesPanel = new TransparentPanel(); - private JLabel userID = new JLabel(Resources.getString("userID")); + private JLabel userID = new JLabel( + Resources.getString("plugin.zeroaccregwizz.USERID")); /* TEMPORARY : HARD CODED !! Should be added to Resource */ - private JLabel firstLabel = new JLabel("Firstname:"); - private JLabel lastLabel = new JLabel("Lastname:"); - private JLabel mailLabel = new JLabel("Mail address:"); + private JLabel firstLabel + = new JLabel(Resources.getString("plugin.zeroaccregwizz.FIRST_NAME")); + private JLabel lastLabel + = new JLabel(Resources.getString("plugin.zeroaccregwizz.LAST_NAME")); + private JLabel mailLabel + = new JLabel(Resources.getString("plugin.zeroaccregwizz.EMAIL")); private JLabel existingAccountLabel - = new JLabel(Resources.getString("existingAccount")); + = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR")); private JPanel emptyPanel = new TransparentPanel(); private JPanel emptyPanel2 = new TransparentPanel(); @@ -61,8 +65,9 @@ public class FirstWizardPage private JTextField lastField = new JTextField(); private JTextField mailField = new JTextField(); - private JCheckBox rememberContacts = - new SIPCommCheckBox("Remember Bonjour contacts?"); + private JCheckBox rememberContacts = + new SIPCommCheckBox(Resources.getString( + "plugin.zeroaccregwizz.REMEMBER_CONTACTS")); private JPanel mainPanel = new TransparentPanel(); @@ -160,9 +165,8 @@ public class FirstWizardPage userPassPanel.add(valuesPanel, BorderLayout.CENTER); userPassPanel.add(rememberContacts, BorderLayout.SOUTH); - userPassPanel.setBorder(BorderFactory - .createTitledBorder(Resources.getString( - "userAndPassword"))); + userPassPanel.setBorder(BorderFactory.createTitledBorder( + Resources.getString("plugin.zeroaccregwizz.USERID_AND_PASSWORD"))); this.add(userPassPanel, BorderLayout.NORTH); } diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java index 56565a0..c81afa7 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java @@ -56,7 +56,8 @@ public class ZeroconfAccountRegistrationWizard { this.wizardContainer = wizardContainer; - this.wizardContainer.setFinishButtonText(Resources.getString("signin")); + this.wizardContainer + .setFinishButtonText(Resources.getString("service.gui.SIGN_IN")); } /** @@ -87,7 +88,7 @@ public class ZeroconfAccountRegistrationWizard */ public String getProtocolName() { - return Resources.getString("protocolNameZeroconf"); + return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_NAME"); } /** @@ -97,7 +98,7 @@ public class ZeroconfAccountRegistrationWizard */ public String getProtocolDescription() { - return Resources.getString("protocolDescriptionZeroconf"); + return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION"); } /** @@ -208,14 +209,14 @@ public class ZeroconfAccountRegistrationWizard { ZeroconfAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } catch (IllegalStateException exc) { ZeroconfAccRegWizzActivator.getUIService().getPopupDialog() .showMessagePopupDialog(exc.getMessage(), - Resources.getString("error"), + Resources.getString("service.gui.ERROR"), PopupDialog.ERROR_MESSAGE); } @@ -318,7 +319,7 @@ public class ZeroconfAccountRegistrationWizard */ public String getPasswordLabel() { - return Resources.getString("password"); + return Resources.getString("service.gui.PASSWORD"); } /** diff --git a/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java b/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java index 4744c9e..5afb688 100644 --- a/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java +++ b/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java @@ -32,7 +32,7 @@ public class AuthorizationResponse * the user to their contact list. */ public static final AuthorizationResponseCode ACCEPT - = new AuthorizationResponseCode("Accept"); + = new AuthorizationResponseCode("service.gui.ACCEPT"); /** * Indicates that source authorization request which this response is about diff --git a/src/net/java/sip/communicator/util/GuiUtils.java b/src/net/java/sip/communicator/util/GuiUtils.java index b10f535..4c733c2 100644 --- a/src/net/java/sip/communicator/util/GuiUtils.java +++ b/src/net/java/sip/communicator/util/GuiUtils.java @@ -181,41 +181,41 @@ public class GuiUtils { { String monthString = ""; if(month == 1) - monthString - = UtilActivator.getResources().getI18NString("january"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.JANUARY"); else if(month == 2) - monthString - = UtilActivator.getResources().getI18NString("february"); + monthString = UtilActivator.getResources() + .getI18NString("shervice.gui.FEBRUARY"); else if(month == 3) - monthString - = UtilActivator.getResources().getI18NString("march"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.MARCH"); else if(month == 4) - monthString - = UtilActivator.getResources().getI18NString("april"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.APRIL"); else if(month == 5) - monthString - = UtilActivator.getResources().getI18NString("may"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.MAY"); else if(month == 6) - monthString - = UtilActivator.getResources().getI18NString("june"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.JUNE"); else if(month == 7) - monthString - = UtilActivator.getResources().getI18NString("july"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.JULY"); else if(month == 8) - monthString - = UtilActivator.getResources().getI18NString("august"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.AUGUST"); else if(month == 9) - monthString - = UtilActivator.getResources().getI18NString("september"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.SEPTEMBER"); else if(month == 10) - monthString - = UtilActivator.getResources().getI18NString("october"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.OCTOBER"); else if(month == 11) - monthString - = UtilActivator.getResources().getI18NString("november"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.NOVEMBER"); else if(month == 12) - monthString - = UtilActivator.getResources().getI18NString("december"); + monthString = UtilActivator.getResources() + .getI18NString("service.gui.DECEMBER"); return monthString; } |