--- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/UsernamePasswordView.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/UsernamePasswordView.java	Wed Oct 13 14:23:59 2010 +0300
@@ -108,33 +108,28 @@
 
         int labelStyle = SWT.WRAP;
 
-        Label titleLabel = createLabel(
-            InstallerUiTexts.get(InstallerUiTexts.CONNECT_TO), labelStyle);
-        setCssId(titleLabel, "heading");
+        Label titleLabel = createLabel
+                           (InstallerUiTexts.get(InstallerUiTexts.CONNECT_TO), labelStyle);
+        titleLabel.setFont(iInstallerUi.getBoldFont());
 
-        Label urlLabel = createLabel(getServer(iUrl), labelStyle);
-        setCssId(urlLabel, "urlLabel");
+        Label urlLabel = createLabel(iUrl, labelStyle);
 
-        Label authLabel = createLabel(
-            InstallerUiTexts.get(InstallerUiTexts.DOWNLOAD_APPLICATION,
-                                 new String[] { iAppName }), labelStyle);
-        setCssId(authLabel, "authLabel");
+        Label authLabel = createLabel
+                          (InstallerUiTexts.get
+                           (InstallerUiTexts.DOWNLOAD_APPLICATION, new String[] { iAppName }),
+                           labelStyle);
 
-        Label usernameLabel = createLabel(
-            InstallerUiTexts.get(InstallerUiTexts.USERNAME), labelStyle);
-        setCssId(usernameLabel, "usernamePasswordLabel");
+        Label usernameLabel = createLabel
+                              (InstallerUiTexts.get(InstallerUiTexts.USERNAME), labelStyle);
 
         iUsernameText = new Text(getComposite(), SWT.BORDER);
-        setCssId(iUsernameText, "usernamePasswordInputField");
         iUsernameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         addSoftKeyListenerFor(iUsernameText);
 
-        Label passwordLabel = createLabel(
-            InstallerUiTexts.get(InstallerUiTexts.PASSWORD), labelStyle);
-        setCssId(passwordLabel, "usernamePasswordLabel");
+        Label passwordLabel = createLabel
+                              (InstallerUiTexts.get(InstallerUiTexts.PASSWORD), labelStyle);
 
         iPasswordText = new Text(getComposite(), SWT.PASSWORD | SWT.BORDER);
-        setCssId(iPasswordText, "usernamePasswordInputField");
         iPasswordText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         addSoftKeyListenerFor(iPasswordText);
     }
@@ -156,31 +151,4 @@
     {
         return SWT.V_SCROLL;
     }
-
-    /**
-     * Returns server part from HTTP URL.
-     */
-    private String getServer(String aUrl)
-    {
-        String server = aUrl;
-        int i = server.indexOf("://");
-        if (i != -1)
-        {
-            server = server.substring(i + 3);
-            i = server.indexOf(":");
-            if (i != -1)
-            {
-                server = server.substring(0, i);
-            }
-            else
-            {
-                i = server.indexOf("/");
-                if (i != -1)
-                {
-                    server = server.substring(0, i);
-                }
-            }
-        }
-        return server;
-    }
 }