"UIN" replaced by identifier or user identifier

src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java

@@ -29,13 +29,13 @@ public class ChatRoomAuthenticationWindow
 {
     private JTextArea infoTextArea = new JTextArea();
 
-    private JLabel uinLabel = new JLabel(
-        Messages.getI18NString("uin").getText());
+    private JLabel idLabel = new JLabel(
+        Messages.getI18NString("id").getText());
 
     private JLabel passwdLabel = new JLabel(
         Messages.getI18NString("passwd").getText());
 
-    private JTextField uinValue;
+    private JTextField idValue;
 
     private JPasswordField passwdField = new JPasswordField(15);
 
@@ -117,7 +117,7 @@ else if(protocolIcon.isSizeSupported(ProtocolIcon.ICON_SIZE_48x48))
      */
     private void init()
     {
-        this.uinValue = new JTextField(
+        this.idValue = new JTextField(
             chatRoom.getParentProvider().getAccountID().getUserID());
         
         this.infoTextArea.setOpaque(false);
@@ -129,13 +129,13 @@ private void init()
             Messages.getI18NString("chatRoomRequiresPassword",
                 new String[]{chatRoom.getName()}).getText());
 
-        this.uinLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
+        this.idLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
         this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
 
-        this.labelsPanel.add(uinLabel);
+        this.labelsPanel.add(idLabel);
         this.labelsPanel.add(passwdLabel);
 
-        this.textFieldsPanel.add(uinValue);
+        this.textFieldsPanel.add(idValue);
         this.textFieldsPanel.add(passwdField);
 
         this.buttonsPanel.add(loginButton);
@@ -194,7 +194,7 @@ public void actionPerformed(ActionEvent evt)
                 public void run()
                 {
                     mainFrame.getMultiUserChatManager()
-                        .joinChatRoom(chatRoom, uinValue.getText(),
+                        .joinChatRoom(chatRoom, idValue.getText(),
                             new String(passwdField.getPassword()).getBytes());
                 }
             }.start();

src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java

@@ -32,7 +32,7 @@ public class AuthenticationWindow
     private JTextArea realmTextArea = new JTextArea();
 
     private JLabel uinLabel = new JLabel(
-        Messages.getI18NString("uin").getText());
+        Messages.getI18NString("id").getText());
 
     private JLabel passwdLabel = new JLabel(
         Messages.getI18NString("passwd").getText());

src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java

@@ -102,29 +102,29 @@ public Iterator getSummary()
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put("UIN", registration.getUin());
-        summaryTable.put("Remember password", new Boolean(registration
-            .isRememberPassword()));
+        summaryTable.put(Resources.getString("id"), registration.getUin());
+        summaryTable.put(Resources.getString("rememberPassword"),
+                new Boolean(registration.isRememberPassword()));
 
         if (registration.getProxy() != null)
-            summaryTable.put(Resources.getString("proxy"), registration
-                .getProxy());
+            summaryTable.put(Resources.getString("proxy"),
+                registration.getProxy());
 
         if (registration.getProxyPort() != null)
-            summaryTable.put(Resources.getString("proxyPort"), registration
-                .getProxyPort());
+            summaryTable.put(Resources.getString("proxyPort"),
+                registration.getProxyPort());
 
         if (registration.getProxyType() != null)
-            summaryTable.put(Resources.getString("proxyType"), registration
-                .getProxyType());
+            summaryTable.put(Resources.getString("proxyType"),
+                registration.getProxyType());
 
         if (registration.getProxyPort() != null)
-            summaryTable.put(Resources.getString("proxyUsername"), registration
-                .getProxyPort());
+            summaryTable.put(Resources.getString("proxyUsername"),
+                registration.getProxyPort());
 
         if (registration.getProxyType() != null)
-            summaryTable.put(Resources.getString("proxyPassword"), registration
-                .getProxyType());
+            summaryTable.put(Resources.getString("proxyPassword"),
+                registration.getProxyType());
 
         return summaryTable.entrySet().iterator();
     }

src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java

@@ -44,7 +44,7 @@ public class FirstWizardPage
     private JCheckBox enableAdvOpButton =
         new JCheckBox(Resources.getString("ovverideServerOps"), false);
 
-    private JLabel uinLabel = new JLabel(Resources.getString("uin"));
+    private JLabel uinLabel = new JLabel(Resources.getString("id"));
 
     private JPanel emptyPanel = new JPanel();
 

src/net/java/sip/communicator/plugin/exampleplugin/ExamplePluginActivator.java

@@ -18,22 +18,21 @@ public void start(BundleContext bc) throws Exception
             = bc.getServiceReference(UIService.class.getName());
         
         UIService uiService
-            = (UIService) bc.getService(uiServiceRef);        
+            = (UIService) bc.getService(uiServiceRef);
         
         if(uiService.isContainerSupported(
             UIService.CONTAINER_CONTACT_RIGHT_BUTTON_MENU))
-        {   
+        {
             ExamplePluginMenuItem examplePlugin = new ExamplePluginMenuItem();
             
             uiService.addComponent(
                 UIService.CONTAINER_CONTACT_RIGHT_BUTTON_MENU,
                 examplePlugin);
-                
         }
         
     }
 
     public void stop(BundleContext bc) throws Exception
-    {   
-    }    
+    {
+    }
 }

src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java

@@ -102,8 +102,8 @@ public Iterator getSummary()
     {
         LinkedHashMap summaryTable = new LinkedHashMap();
 
-        summaryTable.put("UIN", registration.getUin());
-        summaryTable.put("Remember password", new Boolean(registration
+        summaryTable.put(Resources.getString("uin"), registration.getUin());
+        summaryTable.put(Resources.getString("rememberPassword"), new Boolean(registration
             .isRememberPassword()));
 
         if(registration.isAdvancedSettingsEnabled())

src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java

@@ -106,7 +106,7 @@ public boolean isSendKeepAlive()
 
     /**
      * Sets the User ID of the jabber registration account.
-     * @param userID the UIN of the jabber registration account.
+     * @param userID the identifier of the jabber registration account.
      */
     public void setUserID(String userID)
     {

src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java

@@ -34,7 +34,7 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new JPanel();
 
-    private JLabel uinLabel = new JLabel(Resources.getString("uin"));
+    private JLabel uinLabel = new JLabel(Resources.getString("id"));
 
     private JLabel passLabel = new JLabel(Resources.getString("password"));
 
@@ -184,7 +184,7 @@ public void pageNext()
             MsnAccountRegistration registration
                 = wizard.getRegistration();
 
-            registration.setUin(uinField.getText());
+            registration.setId(uinField.getText());
 
             if (passField.getPassword() != null)
                 registration.setPassword(new String(passField.getPassword()));

src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistration.java

@@ -1,20 +1,19 @@
 /*
  * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
+ * 
+ * Distributable under LGPL license. See terms of license at gnu.org.
  */
 package net.java.sip.communicator.plugin.msnaccregwizz;
 
 /**
  * The <tt>MsnAccountRegistration</tt> is used to store all user input data
  * through the <tt>MsnAccountRegistrationWizard</tt>.
- *
+ * 
  * @author Yana Stamcheva
  */
-public class MsnAccountRegistration {
-
-    private String uin;
+public class MsnAccountRegistration
+{
+    private String id;
 
     private String password;
 
@@ -22,51 +21,63 @@ public class MsnAccountRegistration {
 
     /**
      * Returns the password of the msn registration account.
+     * 
      * @return the password of the msn registration account.
      */
-    public String getPassword() {
+    public String getPassword()
+    {
         return password;
     }
 
     /**
      * Sets the password of the msn registration account.
+     * 
      * @param password the password of the msn registration account.
      */
-    public void setPassword(String password) {
+    public void setPassword(String password)
+    {
         this.password = password;
     }
 
     /**
      * Returns TRUE if password has to remembered, FALSE otherwise.
+     * 
      * @return TRUE if password has to remembered, FALSE otherwise
      */
-    public boolean isRememberPassword() {
+    public boolean isRememberPassword()
+    {
         return rememberPassword;
     }
 
     /**
      * Sets the rememberPassword value of this msn account registration.
+     * 
      * @param rememberPassword TRUE if password has to remembered, FALSE
-     * otherwise
+     *            otherwise
      */
-    public void setRememberPassword(boolean rememberPassword) {
+    public void setRememberPassword(boolean rememberPassword)
+    {
         this.rememberPassword = rememberPassword;
     }
 
     /**
-     * Returns the UIN of the msn registration account.
-     * @return the UIN of the msn registration account.
+     * Returns the identifier of the MSN registration account.
+     * 
+     * @return the identifier of the MSN registration account.
      */
-    public String getUin() {
-        return uin;
+    public String getId()
+    {
+        return id;
     }
 
     /**
-     * Sets the UIN of the msn registration account.
-     * @param uin the UIN of the msn registration account.
+     * Sets the identifier of the MSN registration account.
+     * 
+     * @param id the identifier of the MSN registration account.
      */
-    public void setUin(String uin) {
-        this.uin = uin;
+    public void setId(String id)
+    {
+        this.id = id;
     }
 
 }

src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java

@@ -116,9 +116,9 @@ public Iterator getSummary()
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put("UIN", registration.getUin());
-        summaryTable.put("Remember password", new Boolean(registration
-            .isRememberPassword()));
+        summaryTable.put(Resources.getString("id"), registration.getId());
+        summaryTable.put(Resources.getString("rememberPassword"),
+            new Boolean(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -135,7 +135,7 @@ public ProtocolProviderService finish()
             MsnAccRegWizzActivator.getMsnProtocolProviderFactory();
 
         return this.installAccount( factory,
-                                    registration.getUin(),
+                                    registration.getId(),
                                     registration.getPassword());
     }
 

src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java

@@ -269,7 +269,7 @@ public ProtocolProviderService installAccount(
     }
 
     /**
-     * Fills the UIN and Password fields in this panel with the data coming
+     * Fills the id and Password fields in this panel with the data coming
      * from the given protocolProvider.
      * @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
      * data from.

src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java

@@ -35,7 +35,7 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new JPanel();
 
-    private JLabel uinLabel = new JLabel(Resources.getString("uin"));
+    private JLabel uinLabel = new JLabel(Resources.getString("id"));
 
     private JLabel passLabel = new JLabel(Resources.getString("password"));
 

src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java

@@ -117,8 +117,8 @@ public Iterator getSummary()
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put("UIN", registration.getUin());
-        summaryTable.put(   "Remember password",
+        summaryTable.put(Resources.getString("id"), registration.getUin());
+        summaryTable.put(   Resources.getString("rememberPassword"),
                             new Boolean(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();