- Reduces garbage created when working with AccoutID.getAccountProperties() which creates a copy of the internal Hashtable by introducing getAccountProperty(), getAccountPropertyString(), getAccountPropertyBoolean() and getAccountPropertyInt(). The last two also carry out the conversions between Object and boolean/int without additional allocations in contrast to most of the previous uses which would perform allocations.

- Modifies SimpleStatusMenu to load its necessary image once instead of three times and to spare a ImageIcon instance.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
index 9cb54de..8492540 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
@@ -393,8 +393,8 @@ public class FirstWizardPage
     {
         AccountID accountID = protocolProvider.getAccountID();
         String password =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PASSWORD);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PASSWORD);
 
         this.uinField.setText(accountID.getUserID());
 
@@ -408,24 +408,24 @@ public class FirstWizardPage
         }
 
         String proxyAddress =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PROXY_ADDRESS);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PROXY_ADDRESS);
 
         String proxyPort =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PROXY_PORT);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PROXY_PORT);
 
         String proxyType =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PROXY_TYPE);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PROXY_TYPE);
 
         String proxyUsername =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PROXY_USERNAME);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PROXY_USERNAME);
 
         String proxyPassword =
-            (String) accountID.getAccountProperties().get(
-                ProtocolProviderFactory.PROXY_PASSWORD);
+            accountID
+                .getAccountPropertyString(ProtocolProviderFactory.PROXY_PASSWORD);
 
         if (proxyAddress != null || proxyPort != null
             || proxyType != null || proxyUsername != null