From d1189fb0b6c16be03f989ef12228382261cf0dc2 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Tue, 31 Oct 2006 13:55:49 +0000
Subject: [PATCH] summary updated

---
 .../plugin/sipaccregwizz/FirstWizardPage.java |  1 -
 .../sipaccregwizz/SIPAccRegWizzActivator.java |  2 +-
 .../SIPAccountRegistrationWizard.java         | 34 ++++++++++++++++---
 .../plugin/sipaccregwizz/resources.properties |  2 ++
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
index 8273843a8..15df6accf 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
@@ -230,7 +230,6 @@ public void pageNext() {
         registration.setServerPort(serverPortField.getText());
         registration.setProxy(proxyField.getText());
         registration.setProxyPort(proxyPortField.getText());
-        System.out.println("TRANSPORT=================" + transportCombo.getSelectedItem().toString());
         registration.setPreferredTransport(
                 transportCombo.getSelectedItem().toString());
     }
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
index fc1cfbc1c..1b0308220 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccRegWizzActivator.java
@@ -73,6 +73,6 @@ public static ProtocolProviderFactory getSIPProtocolProviderFactory() {
             logger.error("SIPAccRegWizzActivator : " + ex);
         }
 
-        return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
+        return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);  
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index f7546201d..8de75a7c4 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -89,10 +89,30 @@ public Iterator getPages() {
      */
     public Iterator getSummary() {
         Hashtable summaryTable = new Hashtable();
-
-        summaryTable.put("UIN", registration.getUin());
-        summaryTable.put("Remember password",
-                new Boolean(registration.isRememberPassword()));
+        
+        boolean rememberPswd = new Boolean(registration.isRememberPassword())
+            .booleanValue();
+        
+        String rememberPswdString;
+        if(rememberPswd)
+            rememberPswdString = Resources.getString("yes");
+        else
+            rememberPswdString = Resources.getString("no");
+
+        summaryTable.put(Resources.getString("uin"),
+                registration.getUin());
+        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());
 
         return summaryTable.entrySet().iterator();
     }
@@ -106,8 +126,12 @@ public ProtocolProviderService finish() {
         ProtocolProviderFactory factory
             = SIPAccRegWizzActivator.getSIPProtocolProviderFactory();
 
-        return this.installAccount(factory,
+        ProtocolProviderService pps = null;
+        if (factory != null)
+            pps = this.installAccount(factory,
                 registration.getUin(), registration.getPassword());
+        
+        return pps;
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
index ddbb71342..30fe5c429 100755
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/resources.properties
@@ -11,5 +11,7 @@ serverPort=Server port
 proxy=Proxy
 proxyPort=Proxy port
 preferredTransport=Preferred transport
+yes=Yes
+no=No
 
 protocolIcon=net/java/sip/communicator/plugin/sipaccregwizz/resources/sip.png